From f96b86a167a79df636dda17954b9eb215040caea Mon Sep 17 00:00:00 2001 From: lokax Date: Wed, 26 Nov 2025 10:19:56 +0800 Subject: [PATCH 1/4] update submodule --- storage/eloq/tx_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/tx_service b/storage/eloq/tx_service index 7e38a11f4f8..d539847ee0d 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit 7e38a11f4f8dafe6e6c38fa7f10c83c48412699c +Subproject commit d539847ee0d8f0ae1947497208d2b1dff2666a2e From 1b56c3c4d6a16f65867c5594614d23243422556f Mon Sep 17 00:00:00 2001 From: lokax Date: Wed, 26 Nov 2025 10:51:25 +0800 Subject: [PATCH 2/4] fix build --- storage/eloq/ha_eloq.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/eloq/ha_eloq.cc b/storage/eloq/ha_eloq.cc index 4ed299ccf09..7598ae7771a 100644 --- a/storage/eloq/ha_eloq.cc +++ b/storage/eloq/ha_eloq.cc @@ -5794,6 +5794,7 @@ int ha_eloq::BulkUniqueCheck(size_t bulk_size) std::get<1>(index_it->second.second[idx])); batch_tuples.at(idx).status_= RecordStatus::Unknown; batch_tuples.at(idx).version_ts_= 0; + batch_tuples.at(idx).object_type_= -1; } else { @@ -6861,7 +6862,7 @@ int ha_eloq::SkIndexScanNext(uchar *table_record) // into new tuple. const auto &tuple= scan_batch_[scan_batch_idx_ - 1]; tmp_scan_batch.emplace_back(TxKey(), nullptr, tuple.status_, - tuple.version_ts_, tuple.cce_addr_); + tuple.version_ts_, -1, tuple.cce_addr_); } } } while (ccm_scan_open_ || store_key != nullptr); @@ -6893,7 +6894,7 @@ int ha_eloq::SkIndexScanNext(uchar *table_record) KeyOrder &order= vct_key_order[i]; batch_key_[i]= std::move(order.key_); sk_pk_scan_batch_.emplace_back(TxKey(&batch_key_[i]), &batch_rec_[i], - RecordStatus::Unknown, order.ts_); + RecordStatus::Unknown, order.ts_, -1); batch_order_[order.pos_]= i; } From 95c4deb2b7feee8a89096202c4a0ce15b8ff0b1b Mon Sep 17 00:00:00 2001 From: lokax Date: Thu, 27 Nov 2025 11:04:01 +0800 Subject: [PATCH 3/4] update submodule --- storage/eloq/tx_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/tx_service b/storage/eloq/tx_service index d539847ee0d..686e7392dc7 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit d539847ee0d8f0ae1947497208d2b1dff2666a2e +Subproject commit 686e7392dc7710f5ea78b2542e08ee5e4acad7b5 From 81a77860dc83ee4d865a056f594c83edadb9e120 Mon Sep 17 00:00:00 2001 From: lokax Date: Thu, 27 Nov 2025 14:06:45 +0800 Subject: [PATCH 4/4] update submodule --- storage/eloq/tx_service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/eloq/tx_service b/storage/eloq/tx_service index 686e7392dc7..4116a40315e 160000 --- a/storage/eloq/tx_service +++ b/storage/eloq/tx_service @@ -1 +1 @@ -Subproject commit 686e7392dc7710f5ea78b2542e08ee5e4acad7b5 +Subproject commit 4116a40315ee80f38cf39db1a8f00accbe750ca1