diff --git a/src/sql/das/ob_das_utils.cpp b/src/sql/das/ob_das_utils.cpp index 66260fd4a..8501c5990 100644 --- a/src/sql/das/ob_das_utils.cpp +++ b/src/sql/das/ob_das_utils.cpp @@ -455,7 +455,6 @@ int ObDASUtils::generate_mlog_row(const ObTabletID &tablet_id, row.storage_datums_[dmltype_col].set_string(ObString("I")); row.storage_datums_[old_new_col].set_string(ObString("N")); } - // TODO: if we need to update col_type_ in col_descs with ObCollationType::CS_TYPE_UTF8MB4_GENERAL_CI ?@xuanxi } return ret; } diff --git a/src/sql/engine/table/ob_table_scan_op.cpp b/src/sql/engine/table/ob_table_scan_op.cpp index dd70d1a4b..5aa7ece3b 100644 --- a/src/sql/engine/table/ob_table_scan_op.cpp +++ b/src/sql/engine/table/ob_table_scan_op.cpp @@ -3193,7 +3193,7 @@ int ObTableScanOp::inner_get_next_spatial_index_row() } } } - if (OB_SUCC(ret)) { + if (OB_SUCC(ret) && !need_ignore_null) { ObDatumRow *row = (*(spat_index_.spat_rows_))[spat_index_.spat_row_index_++]; ObStorageDatum &cellid = row->storage_datums_[0]; ObStorageDatum &mbr = row->storage_datums_[1]; diff --git a/src/storage/lob/ob_lob_persistent_adaptor.cpp b/src/storage/lob/ob_lob_persistent_adaptor.cpp index e6b8ab4a0..e5c13d1df 100644 --- a/src/storage/lob/ob_lob_persistent_adaptor.cpp +++ b/src/storage/lob/ob_lob_persistent_adaptor.cpp @@ -826,14 +826,11 @@ void ObPersistentLobApator::set_lob_meta_row( { datum_row.reuse(); datum_row.storage_datums_[ObLobMetaUtil::LOB_ID_COL_ID].set_string(reinterpret_cast(&in_row.lob_id_), sizeof(ObLobId)); - // TODO: if we need set collation type to be common::ObCollationType::CS_TYPE_BINARY@xuanxi datum_row.storage_datums_[ObLobMetaUtil::SEQ_ID_COL_ID].set_string(in_row.seq_id_); - // TODO: if we need set collation type to be common::ObCollationType::CS_TYPE_BINARY@xuanxi datum_row.storage_datums_[ObLobMetaUtil::BYTE_LEN_COL_ID].set_uint32(in_row.byte_len_); datum_row.storage_datums_[ObLobMetaUtil::CHAR_LEN_COL_ID].set_uint32(in_row.char_len_); datum_row.storage_datums_[ObLobMetaUtil::PIECE_ID_COL_ID].set_uint(in_row.piece_id_); datum_row.storage_datums_[ObLobMetaUtil::LOB_DATA_COL_ID].set_string(in_row.lob_data_); - // TODO: if we need set collation type to be common::ObCollationType::CS_TYPE_BINARY@xuanxi } int ObPersistentLobApator::set_lob_piece_row( @@ -855,7 +852,6 @@ int ObPersistentLobApator::set_lob_piece_row( LOG_WARN("failed to serialize macro id", K(ret), K(buf_len), K(pos)); } else { datum_row.storage_datums_[2].set_string(buf, pos); - // TODO: if we need set collation type to be common::ObCollationType::CS_TYPE_BINARY@xuanxi new_row_iter->set_row(&datum_row); } diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp index 7f82bf2bc..5a0465cdf 100644 --- a/src/storage/ls/ob_ls_tablet_service.cpp +++ b/src/storage/ls/ob_ls_tablet_service.cpp @@ -5729,7 +5729,6 @@ int ObLSTabletService::table_refresh_row( } else { LOG_DEBUG("get new row success.", K(datum_row), KPC(new_row)); // only write cells, not write row - // TODO:concern about fixed double scale from row to new_row?@xuanxi for (int64_t i = 0; OB_SUCC(ret) && i < new_row->count_; ++i) { if (OB_FAIL(datum_row.storage_datums_[i].deep_copy(new_row->storage_datums_[i], run_ctx.dml_param_.lob_allocator_))) { LOG_WARN("copy storage datum error", K(ret), K(i), K(new_row->storage_datums_[i])); diff --git a/src/storage/memtable/ob_memtable.cpp b/src/storage/memtable/ob_memtable.cpp index 62992121d..5fba27f09 100644 --- a/src/storage/memtable/ob_memtable.cpp +++ b/src/storage/memtable/ob_memtable.cpp @@ -583,9 +583,14 @@ int ObMemtable::set( context, memtable_key_generator, nullptr /*mvcc_row*/); - TRANS_LOG(WARN, "[xuanxi] set row", K(ret), K(row), K(check_exist), K(memtable_key_generator.get_memtable_key())); guard.set_memtable(this); } + if (OB_SUCC(ret)) { + int tmp_ret = OB_SUCCESS; + if (OB_TMP_FAIL(try_report_dml_stat_(param.table_id_))) { + TRANS_LOG_RET(WARN, tmp_ret, "fail to report dml stat", K_(reported_dml_stat)); + } + } } return ret; } @@ -642,6 +647,13 @@ int ObMemtable::set( nullptr /*mvcc_row*/); guard.set_memtable(this); } + + if (OB_SUCC(ret)) { + int tmp_ret = OB_SUCCESS; + if (OB_TMP_FAIL(try_report_dml_stat_(param.table_id_))) { + TRANS_LOG_RET(WARN, tmp_ret, "fail to report dml stat", K_(reported_dml_stat)); + } + } } return ret; }