diff --git a/services/distributeddataservice/libs/distributeddb/common/src/relational/relational_schema_object.cpp b/services/distributeddataservice/libs/distributeddb/common/src/relational/relational_schema_object.cpp index 7f4db0870ba378159a3bbbc472d2b202632fb2cd..099d0c899f4400446abfebc8d0a00e9732437c53 100644 --- a/services/distributeddataservice/libs/distributeddb/common/src/relational/relational_schema_object.cpp +++ b/services/distributeddataservice/libs/distributeddb/common/src/relational/relational_schema_object.cpp @@ -590,7 +590,7 @@ RelationalSyncOpinion RelationalSchemaObject::MakeLocalSyncOpinion(const Relatio } if (remoteType != SchemaType::RELATIVE) { - LOGW("[RelationalSchema][opinion] Not support sync with schema type: local-type=[%d] remote-type=[%d]", + LOGW("[RelationalSchema][opinion] Not support sync with schema type: local-type=[%s] remote-type=[%s]", SchemaUtils::SchemaTypeString(localType).c_str(), SchemaUtils::SchemaTypeString(remoteType).c_str()); return {}; } diff --git a/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_sqlite_ext.cpp b/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_sqlite_ext.cpp index 92421716da3213b66520650538dacc77c11af4f7..b22eb7479bae4c9d187f5044a672a2fb3aeaff21 100644 --- a/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_sqlite_ext.cpp +++ b/services/distributeddataservice/libs/distributeddb/interfaces/src/relational/relational_store_sqlite_ext.cpp @@ -328,7 +328,7 @@ int GetCurrentMaxTimeStamp(sqlite3 *db, TimeStamp &maxTimestamp) ResetStatement(getTimeStmt); continue; } - TimeStamp tableMaxTimestamp = sqlite3_column_int64(getTimeStmt, 0); + auto tableMaxTimestamp = static_cast(sqlite3_column_int64(getTimeStmt, 0)); maxTimestamp = (maxTimestamp > tableMaxTimestamp) ? maxTimestamp : tableMaxTimestamp; ResetStatement(getTimeStmt); } diff --git a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.cpp b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.cpp index b866028f0828437be053dd53622e64b8fbfb8349..ff2a3b3656e2621a78cf77934b97068e332131ca 100644 --- a/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.cpp +++ b/services/distributeddataservice/libs/distributeddb/syncer/src/single_ver_data_message_schedule.cpp @@ -193,8 +193,7 @@ Message *SingleVerDataMessageSchedule::GetMsgFromMap(bool &isNeedHandle) uint64_t packetId = packet->GetPacketId(); if (sequenceId < expectedSequenceId_) { uint64_t revisePacketId = finishedPacketId_ - (expectedSequenceId_ - 1 - sequenceId); - LOGI("[DataMsgSchedule] msg seqId=%llu less than exSeqId=%llu,pacId=%llu,revisePacId=%llu,label=%s,dev=%s", - sequenceId, expectedSequenceId_, packetId, revisePacketId, label_.c_str(), STR_MASK(deviceId_)); + LOGI("[DataMsgSchedule] drop msg because seqId less than exSeqId"); if (packetId < revisePacketId) { delete msg; continue; @@ -205,8 +204,7 @@ Message *SingleVerDataMessageSchedule::GetMsgFromMap(bool &isNeedHandle) } if (sequenceId == expectedSequenceId_) { if (packetId < finishedPacketId_) { - LOGI("[DataMsgSchedule] drop msg seqId=%llu,packetId=%llu,label=%s,dev=%s", sequenceId, packetId, - label_.c_str(), STR_MASK(deviceId_)); + LOGI("[DataMsgSchedule] drop msg because packetId less than finishedPacketId"); delete msg; continue; }