Skip to content

Commit 4cb9dde

Browse files
obdevstuBirdFly
authored and
ob-robot
committed
patch dml remove locker for seekdb
Co-authored-by: stuBirFly <1065492934@qq.com>
1 parent 1d6444c commit 4cb9dde

11 files changed

Lines changed: 18 additions & 19 deletions

‎deps/init/oceanbase.al8.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ devdeps-s3-cpp-sdk-1.11.156-262026021209.al8.aarch64.rpm
3131
devdeps-protobuf-c-1.5.1-100000052025032810.al8.aarch64.rpm
3232
devdeps-roaringbitmap-croaring-3.0.0-92024092815.al8.aarch64.rpm
3333
devdeps-apache-arrow-20.0.0-452026020914.al8.aarch64.rpm
34-
devdeps-vsag-1.1.0-1512026022617.al8.aarch64.rpm
34+
devdeps-vsag-abiv1-1.1.0-1682026031620.al8.aarch64.rpm
3535
devdeps-apache-orc-2.1.1-122026020912.al8.aarch64.rpm
3636
devdeps-fast-float-6.1.3-42024112122.al8.aarch64.rpm
3737

‎deps/init/oceanbase.al8.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ devdeps-protobuf-c-1.5.1-100000052025032810.al8.x86_64.rpm
3333
devdeps-roaringbitmap-croaring-3.0.0-92024092815.al8.x86_64.rpm
3434
devdeps-apache-arrow-20.0.0-452026020914.al8.x86_64.rpm
3535
devdeps-hyperscan-5.4.2-252024092817.al8.x86_64.rpm
36-
devdeps-vsag-1.1.0-1512026022617.al8.x86_64.rpm
36+
devdeps-vsag-abiv1-1.1.0-1682026031620.al8.x86_64.rpm
3737
devdeps-apache-orc-2.1.1-122026020912.al8.x86_64.rpm
3838
devdeps-fast-float-6.1.3-42024112122.al8.x86_64.rpm
3939

‎deps/init/oceanbase.el7.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ devdeps-s3-cpp-sdk-1.11.156-262026021209.el7.aarch64.rpm
3232
devdeps-protobuf-c-1.5.1-100000052025032810.el7.aarch64.rpm
3333
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.aarch64.rpm
3434
devdeps-apache-arrow-20.0.0-452026020914.el7.aarch64.rpm
35-
devdeps-vsag-1.1.0-1512026022617.el7.aarch64.rpm
35+
devdeps-vsag-abiv1-1.1.0-1682026031620.el7.aarch64.rpm
3636
devdeps-apache-orc-2.1.1-122026020912.el7.aarch64.rpm
3737
devdeps-fast-float-6.1.3-42024112122.el7.aarch64.rpm
3838

‎deps/init/oceanbase.el7.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ devdeps-protobuf-c-1.5.1-100000052025032810.el7.x86_64.rpm
3535
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.x86_64.rpm
3636
devdeps-hyperscan-5.4.2-242024090219.el7.x86_64.rpm
3737
devdeps-apache-arrow-20.0.0-452026020914.el7.x86_64.rpm
38-
devdeps-vsag-1.1.0-1512026022617.el7.x86_64.rpm
38+
devdeps-vsag-abiv1-1.1.0-1682026031620.el7.x86_64.rpm
3939
devdeps-apache-orc-2.1.1-122026020912.el7.x86_64.rpm
4040
devdeps-fast-float-6.1.3-42024112122.el7.x86_64.rpm
4141

‎deps/init/oceanbase.el8.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ devdeps-s3-cpp-sdk-1.11.156-262026021209.el8.aarch64.rpm
3232
devdeps-protobuf-c-1.5.1-100000052025032810.el8.aarch64.rpm
3333
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
3434
devdeps-apache-arrow-20.0.0-452026020914.el8.aarch64.rpm
35-
devdeps-vsag-1.1.0-1512026022617.el8.aarch64.rpm
35+
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.aarch64.rpm
3636
devdeps-apache-orc-2.1.1-122026020912.el8.aarch64.rpm
3737
devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
3838

‎deps/init/oceanbase.el8.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ devdeps-protobuf-c-1.5.1-100000052025032810.el8.x86_64.rpm
3434
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
3535
devdeps-apache-arrow-20.0.0-452026020914.el8.x86_64.rpm
3636
devdeps-hyperscan-5.4.2-242024090219.el8.x86_64.rpm
37-
devdeps-vsag-1.1.0-1512026022617.el8.x86_64.rpm
37+
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.x86_64.rpm
3838
devdeps-apache-orc-2.1.1-122026020912.el8.x86_64.rpm
3939
devdeps-fast-float-6.1.3-42024112122.el8.x86_64.rpm
4040

‎deps/init/oceanbase.el9.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ devdeps-s3-cpp-sdk-1.11.156-262026021209.el8.aarch64.rpm
3636
devdeps-protobuf-c-1.5.1-100000052025032810.el8.aarch64.rpm
3737
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
3838
devdeps-apache-arrow-20.0.0-452026020914.el8.aarch64.rpm
39-
devdeps-vsag-1.1.0-1512026022617.el8.aarch64.rpm
39+
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.aarch64.rpm
4040
devdeps-apache-orc-2.1.1-122026020912.el8.aarch64.rpm
4141
devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
4242

‎deps/init/oceanbase.el9.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ devdeps-protobuf-c-1.5.1-100000052025032810.el8.x86_64.rpm
3838
devdeps-apache-arrow-20.0.0-452026020914.el8.x86_64.rpm
3939
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
4040
devdeps-hyperscan-5.4.2-242024090219.el8.x86_64.rpm
41-
devdeps-vsag-1.1.0-1512026022617.el8.x86_64.rpm
41+
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.x86_64.rpm
4242
devdeps-apache-orc-2.1.1-122026020912.el8.x86_64.rpm
4343
devdeps-fast-float-6.1.3-42024112122.el8.x86_64.rpm
4444

‎src/share/vector_index/ob_plugin_vector_index_adaptor.cpp‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,21 +1299,19 @@ int ObPluginVectorIndexAdaptor::handle_insert_embedded_table_rows(blocksstable::
12991299
}
13001300
if (OB_SUCC(ret) && incr_vid_count > 0) {
13011301
lib::ObMallocHookAttrGuard malloc_guard(lib::ObMemAttr(tenant_id_, "VIndexVsagADP"));
1302-
TCWLockGuard lock_guard(incr_data_->mem_data_rwlock_);
13031302
if (OB_FAIL(obvectorutil::add_index(incr_data_->index_,
13041303
vectors,
13051304
incr_vids,
13061305
dim,
13071306
extra_info_buf_ptr,
13081307
incr_vid_count))) {
13091308
LOG_WARN("failed to add index.", K(ret), K(dim), K(row_count));
1310-
} else {
1311-
incr_data_->set_vid_bound(vid_bound);
13121309
}
13131310
}
13141311
if (OB_SUCC(ret)) {
13151312
lib::ObMallocHookAttrGuard malloc_guard(lib::ObMemAttr(tenant_id_, "VIBitmapADPH"));
13161313
TCWLockGuard lock_guard(incr_data_->bitmap_rwlock_);
1314+
incr_data_->set_vid_bound(vid_bound);
13171315
for (int64_t i = 0; OB_SUCC(ret) && i < incr_vid_count; i++) {
13181316
ROARING_TRY_CATCH(roaring::api::roaring64_bitmap_add(incr_data_->bitmap_->insert_bitmap_, incr_vids[i]));
13191317
}
@@ -1580,7 +1578,6 @@ int ObPluginVectorIndexAdaptor::insert_rows(blocksstable::ObDatumRow *rows,
15801578
if (OB_SUCC(ret) && incr_vid_count > 0) {
15811579
lib::ObMallocHookAttrGuard malloc_guard(lib::ObMemAttr(tenant_id_, "VIndexVsagADP"));
15821580
lib::ObLightBacktraceGuard light_backtrace_guard(false);
1583-
TCWLockGuard lock_guard(incr_data_->mem_data_rwlock_);
15841581
if (is_sparse_vector_index_type()) {
15851582
if (OB_FAIL(obvectorutil::add_index(incr_data_->index_,
15861583
lens,
@@ -1591,8 +1588,6 @@ int ObPluginVectorIndexAdaptor::insert_rows(blocksstable::ObDatumRow *rows,
15911588
extra_info_buf_ptr
15921589
))) {
15931590
LOG_WARN("failed to add sparse index.", K(ret), K(dim), K(row_count));
1594-
} else {
1595-
incr_data_->set_vid_bound(vid_bound);
15961591
}
15971592
} else {
15981593
if (OB_FAIL(obvectorutil::add_index(incr_data_->index_,
@@ -1602,14 +1597,13 @@ int ObPluginVectorIndexAdaptor::insert_rows(blocksstable::ObDatumRow *rows,
16021597
extra_info_buf_ptr,
16031598
incr_vid_count))) {
16041599
LOG_WARN("failed to add index.", K(ret), K(dim), K(row_count));
1605-
} else {
1606-
incr_data_->set_vid_bound(vid_bound);
16071600
}
16081601
}
16091602
}
16101603
if (OB_SUCC(ret)) {
16111604
lib::ObMallocHookAttrGuard malloc_guard(lib::ObMemAttr(tenant_id_, "VIBitmapADPH"));
16121605
TCWLockGuard lock_guard(incr_data_->bitmap_rwlock_);
1606+
incr_data_->set_vid_bound(vid_bound);
16131607
for (int64_t i = 0; OB_SUCC(ret) && i < incr_vid_count; i++) {
16141608
ROARING_TRY_CATCH(roaring::api::roaring64_bitmap_add(incr_data_->bitmap_->insert_bitmap_, incr_vids[i]));
16151609
}
@@ -2300,9 +2294,9 @@ int ObPluginVectorIndexAdaptor::write_into_delta_mem(ObVectorQueryAdaptorResultC
23002294
for (int64_t i = 0; OB_SUCC(ret) && i < count; i++) {
23012295
ROARING_TRY_CATCH(roaring::api::roaring64_bitmap_add(incr_data_->bitmap_->insert_bitmap_, vids[i]));
23022296
}
2303-
}
2304-
if (OB_SUCC(ret)) {
2305-
incr_data_->set_vid_bound(vid_bound);
2297+
if (OB_SUCC(ret)) {
2298+
incr_data_->set_vid_bound(vid_bound);
2299+
}
23062300
}
23072301
LOG_TRACE("write into delta mem.", K(ret), K(ctx->get_dim()), K(count));
23082302
}

‎tools/deploy/mysql_test/test_suite/vector_index/r/mysql/sparse_vector_index_vsag_ddl.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ c1 c2 c3
249249
9 [0.928764,0.254038,0.272721,0.648755,0.966464,0.200054,0.093298,0.901419,0.676738,0.122339] {9:0.9,10:1,11:1.1}
250250
select * from t1 where c1 > 5 order by negative_inner_product(c3, '{12:1, 13:1}') APPROXIMATE limit 2;
251251
c1 c2 c3
252+
10 [0.345999,0.254102,0.950869,0.275233,0.844568,0.215723,0.302821,0.563644,0.811224,0.175574] {10:1,11:1.1,12:1.2}
252253
drop index idx1 on t1;
253254
select * from t1 order by negative_inner_product(c3, '{3:1, 4:1}') APPROXIMATE limit 2;
254255
c1 c2 c3

0 commit comments

Comments
 (0)