fix schema error log

src/storage/compaction/ob_medium_compaction_mgr.cpp

@@ -702,7 +702,7 @@ int ObTabletMediumCompactionInfoRecorder::submit_log(
   } else if (OB_FAIL(write_clog(clog_buf, clog_len))) {
     LOG_WARN("fail to submit log", K(ret), K_(tablet_id), K(medium_info_));
     int tmp_ret = OB_SUCCESS;
-    if (clog_scn_.get_val_for_tx() > 0 && OB_TMP_FAIL(dec_ref_on_memtable(false))) {
+    if (OB_TMP_FAIL(dec_ref_on_memtable(false))) {
       LOG_ERROR("failed to dec ref on memtable", K(tmp_ret), K_(ls_id), K_(tablet_id));
     }
   } else {

src/storage/ob_storage_clog_recorder.cpp

@@ -80,7 +80,7 @@ void ObIStorageClogRecorder::destroy()
   lock_ = false;
   logcb_finish_flag_ = true;
   log_handler_ = NULL;
-  clog_scn_.set_min();
+  clog_scn_.reset();
 }
 
 void ObIStorageClogRecorder::reset()
@@ -267,7 +267,7 @@ int ObIStorageClogRecorder::write_clog(
   int ret = OB_SUCCESS;
   const bool need_nonblock = false;
   palf::LSN lsn;
-  clog_scn_.set_min();
+  clog_scn_.reset();
   if (OB_UNLIKELY(nullptr == buf || buf_len < 0)) {
     ret = OB_INVALID_ARGUMENT;
     LOG_WARN("invalid argument", K(ret), K(buf), K(buf_len));

src/storage/tablet/ob_tablet_meta.cpp

@@ -56,9 +56,9 @@ ObTabletMeta::ObTabletMeta()
     ddl_start_scn_(SCN::min_scn()),
     ddl_snapshot_version_(OB_INVALID_TIMESTAMP),
     max_sync_storage_schema_version_(0),
-    max_serialized_medium_scn_(0),
     ddl_execution_id_(-1),
     ddl_cluster_version_(0),
+    max_serialized_medium_scn_(0),
     is_inited_(false)
 {
 }
@@ -508,12 +508,12 @@ int ObTabletMeta::serialize(char *buf, const int64_t len, int64_t &pos)
     LOG_WARN("failed to serialize ddl snapshot version", K(ret), K(len), K(new_pos), K_(ddl_snapshot_version));
   } else if (new_pos - pos < length_ && OB_FAIL(serialization::encode_i64(buf, len, new_pos, max_sync_storage_schema_version_))) {
     LOG_WARN("failed to serialize max_sync_storage_schema_version", K(ret), K(len), K(new_pos), K_(max_sync_storage_schema_version));
-  } else if (new_pos - pos < length_ && OB_FAIL(serialization::encode_i64(buf, len, new_pos, max_serialized_medium_scn_))) {
-    LOG_WARN("failed to serialize max_serialized_medium_scn", K(ret), K(len), K(new_pos), K_(max_serialized_medium_scn));
   } else if (new_pos - pos < length_ && OB_FAIL(serialization::encode_i64(buf, len, new_pos, ddl_execution_id_))) {
     LOG_WARN("failed to serialize ddl execution id", K(ret), K(len), K(new_pos), K_(ddl_execution_id));
   } else if (new_pos - pos < length_ && OB_FAIL(serialization::encode_i64(buf, len, new_pos, ddl_cluster_version_))) {
     LOG_WARN("failed to serialize ddl cluster version", K(ret), K(len), K(new_pos), K_(ddl_cluster_version));
+  } else if (new_pos - pos < length_ && OB_FAIL(serialization::encode_i64(buf, len, new_pos, max_serialized_medium_scn_))) {
+    LOG_WARN("failed to serialize max_serialized_medium_scn", K(ret), K(len), K(new_pos), K_(max_serialized_medium_scn));
   } else if (OB_UNLIKELY(length_ != new_pos - pos)) {
     ret = OB_ERR_UNEXPECTED;
     LOG_WARN("tablet meta's length doesn't match standard length", K(ret), K(new_pos), K(pos), K_(length));
@@ -593,12 +593,12 @@ int ObTabletMeta::deserialize(
       LOG_WARN("failed to deserialize ddl snapshot version", K(ret), K(len), K(new_pos));
     } else if (new_pos - pos < length_ && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &max_sync_storage_schema_version_))) {
       LOG_WARN("failed to deserialize max_sync_storage_schema_version", K(ret), K(len), K(new_pos));
-    } else if (new_pos - pos < length_ && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &max_serialized_medium_scn_))) {
-      LOG_WARN("failed to deserialize max_serialized_medium_scn", K(ret), K(len), K(new_pos));
     } else if (new_pos - pos < length_ && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &ddl_execution_id_))) {
       LOG_WARN("failed to deserialize ddl execution id", K(ret), K(len), K(new_pos));
     } else if (new_pos - pos < length_ && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &ddl_cluster_version_))) {
       LOG_WARN("failed to deserialize ddl cluster version", K(ret), K(len), K(new_pos));
+    } else if (new_pos - pos < length_ && OB_FAIL(serialization::decode_i64(buf, len, new_pos, &max_serialized_medium_scn_))) {
+      LOG_WARN("failed to deserialize max_serialized_medium_scn", K(ret), K(len), K(new_pos));
     } else if (OB_UNLIKELY(length_ != new_pos - pos)) {
       ret = OB_ERR_UNEXPECTED;
       LOG_WARN("tablet's length doesn't match standard length", K(ret), K(new_pos), K(pos), K_(length));
@@ -641,9 +641,9 @@ int64_t ObTabletMeta::get_serialize_size() const
   size += ddl_start_scn_.get_fixed_serialize_size();
   size += serialization::encoded_length_i64(ddl_snapshot_version_);
   size += serialization::encoded_length_i64(max_sync_storage_schema_version_);
-  size += serialization::encoded_length_i64(max_serialized_medium_scn_);
   size += serialization::encoded_length_i64(ddl_execution_id_);
   size += serialization::encoded_length_i64(ddl_cluster_version_);
+  size += serialization::encoded_length_i64(max_serialized_medium_scn_);
   return size;
 }
 

src/storage/tablet/ob_tablet_meta.h

@@ -175,9 +175,9 @@ public:
   // serialized_schema_version > sync_schema_version when major update storage schema
   // sync_schema_version > serialized_schema_version when replay schema clog but not mini merge yet
   int64_t max_sync_storage_schema_version_;
-  int64_t max_serialized_medium_scn_; // update when serialized medium info
   int64_t ddl_execution_id_;
   int64_t ddl_cluster_version_;
+  int64_t max_serialized_medium_scn_; // update when serialized medium info
   //ATTENTION : Add a new variable need consider ObMigrationTabletParam
   // and tablet meta init interface for migration.
   // yuque : https://yuque.antfin.com/ob/ob-backup/zzwpuh