diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
index 5b79c239d93928e2fc3633e6383d32dc5bab5192..ffd926a6df4b2171bba15e3a971075c36fb56ade 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore.h
@@ -26,7 +26,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class IKvStoreImpl : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreImpl")
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h
index ee6d91a4a2d63e519723f1f405d04a2622f9ee69..2d391111b63d5aae5b430645f1769e8b9b102642 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h
@@ -22,7 +22,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class IKvStoreClientDeathObserver : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreClientDeathObserver");
@@ -30,7 +29,6 @@ public:
 
 class KvStoreClientDeathObserverStub : public IRemoteStub<IKvStoreClientDeathObserver> {
 public:
-
 };
 
 class KvStoreClientDeathObserverProxy : public IRemoteProxy<IKvStoreClientDeathObserver> {
@@ -40,7 +38,6 @@ public:
 private:
     static inline BrokerDelegator<KvStoreClientDeathObserverProxy> delegator_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
index b04d53cede89f172394f473c19277e1ac68b584b..14b195f78bc0e120a4418dc0318fe415e7676633 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_observer.h
@@ -25,7 +25,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class IKvStoreObserver : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreObserver");
@@ -46,7 +45,6 @@ public:
 private:
     static inline BrokerDelegator<KvStoreObserverProxy> delegator_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
index 2d333cb63e4d03f551265c3e90c2191153824664..67e710e88fa0c0e5b88076b1745d5d50be21abf0 100755
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_single.h
@@ -206,7 +206,6 @@ public:
 private:
     static inline BrokerDelegator<SingleKvStoreProxy> delegator_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
index 843d163580fa724ee811b175a0da049a433b9a83..31268126d2bb985bbae3744e9804916bc9b612c8 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_snapshot.h
@@ -24,7 +24,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class IKvStoreSnapshotImpl : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreSnapshotImpl")
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
index 343760a8cfab008fb9d22ccedeaa962aa2604561..7761fdfc71521096335dcdf582392811f275b5c4 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_sync_callback.h
@@ -24,7 +24,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class IKvStoreSyncCallback : public IRemoteBroker {
 public:
     DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.DistributedKv.IKvStoreSyncCallback");
@@ -45,7 +44,6 @@ public:
 private:
     static inline BrokerDelegator<KvStoreSyncCallbackProxy> delegator_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h b/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h
index add36329c6d1c78e033b4786ac17f1f321355af6..192338f77fdb0d655f8de7d267977a3d5c00bfd1 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/include/inner_types.h
@@ -18,13 +18,11 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 enum class InnerStatus {
     SUCCESS = 0,
     DECREASE_REFCOUNT,
     ERROR,
 };
-
 }
 }
 #endif
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp
index 8b8c4aaa48731cb1b2f719864bc1bdc51e97e7f9..9b812440bf408b57b530ecee945e3f3231b273ea 100755
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp
@@ -64,7 +64,6 @@ void KvStoreSnapshotImplProxy::GetEntries(const Key &prefixKey, const Key &nextK
     // buffer:  | status | entryLength | rawdatasize | (sptr<Key>)nextkey |
     // rawData: ( | keyLen | key | valueLen | value | ){entryLength}
     int32_t error = Remote()->SendRequest(GETENTRIES, data, reply, mo);
-
     if (error != 0) {
         ZLOGW("Transact failed");
         callback(Status::IPC_ERROR, entries, Key());
@@ -409,7 +408,6 @@ int32_t KvStoreSnapshotImplStub::GetKeysRemote(MessageParcel &data, MessageParce
         nxtKey = key;
     });
     int bufferSize = GetTotalkeysSize(keyList);
-
     if (bufferSize < Constant::SWITCH_RAW_DATA_SIZE) {
         return WritekeysParcelable(reply, statusTmp, keyList, bufferSize, nxtKey);
     }
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h
index bc964eb2455f27877a5ea8ec6391a5c92ba49f0d..2c8a0abc1d4d70b7a53a670df58fa60fedcb4613 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.h
@@ -25,7 +25,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreClient final : public KvStore {
 public:
     explicit KvStoreClient(sptr<IKvStoreImpl> kvStoreProxy, const std::string &storeId);
@@ -65,7 +64,6 @@ private:
     std::mutex observerMapMutex_;
     std::string storeId_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h
index 5e334cde673716964cdc46c5ac3a5ad02c6f87f4..a8deafec2d70e600679fd667d818f24ea53c98ab 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_death_recipient_impl.h
@@ -21,7 +21,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreDeathRecipientImpl {
 public:
     explicit KvStoreDeathRecipientImpl(std::shared_ptr<KvStoreDeathRecipient> kvStoreDeathRecipient);
@@ -31,7 +30,6 @@ private:
     std::shared_ptr<KvStoreDeathRecipient> kvStoreDeathRecipient_;
 friend struct KvStoreDeathRecipientImplCompare;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h
index 6e242912a8cd2bc919886c8efde8843433bf7cc0..d7a3340b6b8c11220a83aebb1328aeb140400aa8 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_observer_client.h
@@ -25,7 +25,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreObserverClient : public KvStoreObserverStub {
 public:
     KvStoreObserverClient(const StoreId &storeId, SubscribeType subscribeType,
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h
index 52ac38e68695ba2b55957339089298c2b99e25af..c738b58bb4b1249d8a073551a91687e90d284f73 100644
--- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h
+++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_sync_callback_client.h
@@ -23,7 +23,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreSyncCallbackClient : public KvStoreSyncCallbackStub {
 public:
     KvStoreSyncCallbackClient() = default;
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp
index 5cb1421db11b3cf2c11756fc2a3e9ba59c42b7fd..338b5ae791d4bf90ebac63f19156051f35072a2a 100755
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp
@@ -419,13 +419,13 @@ HWTEST_F(AppDistributedKvStoreTest, AppKvstorePut007, TestSize.Level1)
     status = appKvStorePtr->Get(localRead, Key("teacher_name_wanger"), ret);
     EXPECT_EQ(status, Status::SUCCESS);
     ASSERT_EQ(ret.Size(), val.size());
-    for(unsigned long i = 0; i < ret.Size(); i++) {
+    for (unsigned long i = 0; i < ret.Size(); i++) {
         EXPECT_EQ(ret.Data()[i], val[i]);
     }
     status = appKvStorePtr->Get(syncRead, Key("teacher_name_wanger"), ret);
     EXPECT_EQ(status, Status::SUCCESS);
     ASSERT_EQ(ret.Size(), val.size());
-    for(unsigned long i = 0; i < ret.Size(); i++) {
+    for (unsigned long i = 0; i < ret.Size(); i++) {
         EXPECT_EQ(ret.Data()[i], val[i]);
     }
 
@@ -582,8 +582,9 @@ HWTEST_F(AppDistributedKvStoreTest, AppKvstorePut011, TestSize.Level1)
 std::string Generate1025KeyLen()
 {
     // Generate key and the length is more than 1024;
+    constexpr int KEY_MAX_LENGTH = 1024;
     std::string str("prefix");
-    for (int i = 0; i < 1024; i++) {
+    for (int i = 0; i < KEY_MAX_LENGTH; i++) {
         str += "a";
     }
     return str;
diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
index a7937ddf2b33460f603916772ae2c0efabc81776..bd6aa922c28ea4e53235719097f49be1a51a7c2f 100755
--- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
+++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/distributed_kv_data_manager_test.cpp
@@ -799,9 +799,6 @@ HWTEST_F(DistributedKvDataManagerTest, GetDevice001, TestSize.Level1)
 
     std::vector<DeviceInfo> infos;
     status = manager.GetDeviceList(infos, DeviceFilterStrategy::FILTER);
-    // EXPECT_EQ(Status::SUCCESS, status) << "expected GetDeviceList true";
-    // EXPECT_TRUE(infos.size() == 0) << "expected GetDeviceList exist";
-
     auto listener = std::make_shared<DeviceListenerImpl>();
     status = manager.StartWatchDeviceChange(listener);
     EXPECT_EQ(Status::SUCCESS, status) << "expected StartWatchDeviceChange true";
diff --git a/interfaces/innerkits/distributeddata/include/blob.h b/interfaces/innerkits/distributeddata/include/blob.h
index da9b9c2bf308f978ac5fcac77363731760727e40..d89c29d8c5cefa44a599b60af56d151d53879676 100644
--- a/interfaces/innerkits/distributeddata/include/blob.h
+++ b/interfaces/innerkits/distributeddata/include/blob.h
@@ -104,7 +104,6 @@ public:
 private:
     std::vector<uint8_t> blob_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/interfaces/innerkits/distributeddata/include/types.h b/interfaces/innerkits/distributeddata/include/types.h
index 4e2b0fe1f588131de98bd2659596f2455a36f8a7..66a70b9fce1a52a76f4bcc23a58648e7105390c9 100755
--- a/interfaces/innerkits/distributeddata/include/types.h
+++ b/interfaces/innerkits/distributeddata/include/types.h
@@ -25,7 +25,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 // key set by client, can be any non-empty bytes array, and less than 1024 size.
 using Key = OHOS::DistributedKv::Blob;
 
diff --git a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp
index b004c93763da4fd39a23dd70aa300a1158589af2..8ab77a5294846e00c7286a41f978aa23461ebd77 100755
--- a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp
+++ b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp
@@ -21,7 +21,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 ClientPermissionChangedCallback::ClientPermissionChangedCallback(std::int32_t pid, std::int32_t uid)
 {
     this->pid_ = pid;
@@ -33,10 +32,7 @@ std::int32_t ClientPermissionChangedCallback::GetPid()
     return this->pid_;
 }
 
-void ClientPermissionChangedCallback::OnChanged(const int32_t uid)
-{
-
-}
+void ClientPermissionChangedCallback::OnChanged(const int32_t uid) {}
 
 void ClientPermissionValidator::UpdatePermissionStatus(
     int32_t uid, const std::string &permissionType, bool permissionStatus)
@@ -58,21 +54,13 @@ bool ClientPermissionValidator::RegisterPermissionChanged(
     return false;
 }
 
-void ClientPermissionValidator::UnregisterPermissionChanged(const KvStoreTuple &kvStoreTuple)
-{
-
-}
+void ClientPermissionValidator::UnregisterPermissionChanged(const KvStoreTuple &kvStoreTuple) {}
 
 // after the BMS service restarted, rebuild BundleManager object and re-register permission callbacks for all apps.
-void ClientPermissionValidator::RebuildBundleManager()
-{
-
-}
+void ClientPermissionValidator::RebuildBundleManager() {}
 
 void ClientPermissionValidator::UpdateKvStoreTupleMap(const KvStoreTuple &srcKvStoreTuple,
                                                       const KvStoreTuple &dstKvStoreTuple)
-{
-
-}
+{}
 } // namespace DistributedKv
 } // namespace OHOS
diff --git a/services/distributeddataservice/app/src/kvstore_observer_impl.h b/services/distributeddataservice/app/src/kvstore_observer_impl.h
index 7887c2c42894a5cdb221709d93ef4bc0fa61c5d3..55c9d792aa20dafd8a4ba114283e2b8139efc28e 100644
--- a/services/distributeddataservice/app/src/kvstore_observer_impl.h
+++ b/services/distributeddataservice/app/src/kvstore_observer_impl.h
@@ -23,7 +23,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreObserverImpl : public DistributedDB::KvStoreObserver {
 public:
     KvStoreObserverImpl(SubscribeType subscribeType, sptr<IKvStoreObserver> observerProxy);
@@ -40,7 +39,6 @@ private:
     SubscribeType subscribeType_;
     sptr<IKvStoreObserver> observerProxy_;
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS
 
diff --git a/services/distributeddataservice/app/src/kvstore_snapshot_impl.h b/services/distributeddataservice/app/src/kvstore_snapshot_impl.h
index d806f1a44a6a297a9dfa0e6bffefbe2c16ac162f..74f385f57561049ea8729d98ba6c37c8e611abe3 100644
--- a/services/distributeddataservice/app/src/kvstore_snapshot_impl.h
+++ b/services/distributeddataservice/app/src/kvstore_snapshot_impl.h
@@ -30,7 +30,6 @@
 
 namespace OHOS {
 namespace DistributedKv {
-
 class KvStoreSnapshotImpl : public KvStoreSnapshotImplStub {
 public:
     explicit KvStoreSnapshotImpl(DistributedDB::KvStoreSnapshotDelegate *kvStoreSnapshotDelegate,
@@ -79,7 +78,6 @@ private:
     void GetKeysFromDelegateLocked(const Key &prefixKey, const Key &nextKey,
                                    std::function<void(Status, std::vector<Key> &, const Key &)> callback);
 };
-
 }  // namespace DistributedKv
 }  // namespace OHOS