Copilot commented on code in PR #65190:
URL: https://github.com/apache/doris/pull/65190#discussion_r3733260218
##########
cloud/test/recycler_test.cpp:
##########
@@ -6134,6 +6134,88 @@ TEST(RecyclerTest, delete_rowset_data) {
}
}
+TEST(RecyclerTest, delete_v2_inverted_index_with_segment_list) {
+ auto txn_kv = std::make_shared<MemTxnKv>();
+ ASSERT_EQ(txn_kv->init(), 0);
+
+ constexpr std::string_view resource_id =
"delete_v2_index_with_segment_list";
+ InstanceInfoPB instance;
+ instance.set_instance_id(instance_id);
+ auto obj_info = instance.add_obj_info();
+ obj_info->set_id(std::string(resource_id));
+ obj_info->set_ak(config::test_s3_ak);
+ obj_info->set_sk(config::test_s3_sk);
+ obj_info->set_endpoint(config::test_s3_endpoint);
+ obj_info->set_region(config::test_s3_region);
+ obj_info->set_bucket(config::test_s3_bucket);
+ obj_info->set_prefix(std::string(resource_id));
+
+ InstanceRecycler recycler(txn_kv, instance, thread_group,
+ std::make_shared<TxnLazyCommitter>(txn_kv));
+ ASSERT_EQ(recycler.init(), 0);
+ auto accessor = recycler.accessor_map_.begin()->second;
+
+ doris::TabletSchemaCloudPB schema;
+ schema.set_schema_version(1);
+ schema.set_inverted_index_storage_format(InvertedIndexStorageFormatPB::V2);
+ auto index = schema.add_index();
+ index->set_index_id(100);
+ index->set_index_type(IndexType::INVERTED);
+
+ constexpr int num_segments = 2;
+ constexpr std::array<int64_t, num_segments> segment_ids = {10, 12};
+ auto rowset = create_rowset(std::string(resource_id), 10002, 10001,
num_segments, schema);
+ for (auto segment_id : segment_ids) {
+ rowset.add_segment_ids(segment_id);
+ ASSERT_EQ(accessor->put_file(
+ segment_path(rowset.tablet_id(),
rowset.rowset_id_v2(), segment_id), ""),
+ 0);
+ ASSERT_EQ(accessor->put_file(inverted_index_path_v2(rowset.tablet_id(),
+
rowset.rowset_id_v2(), segment_id),
+ ""),
+ 0);
+ }
+
+ ASSERT_EQ(recycler.delete_rowset_data(rowset), 0);
+ for (auto segment_id : segment_ids) {
+ EXPECT_EQ(accessor->exists(
+ segment_path(rowset.tablet_id(),
rowset.rowset_id_v2(), segment_id)),
+ 1);
Review Comment:
After a successful recycler.delete_rowset_data(rowset), the segment files
should be deleted from object storage. This assertion currently expects the
segment file to still exist (exists()==1), which contradicts other recycler
tests and the API semantics.
This issue also appears on line 6184 of the same file.
##########
cloud/test/recycler_test.cpp:
##########
@@ -6134,6 +6134,88 @@ TEST(RecyclerTest, delete_rowset_data) {
}
}
+TEST(RecyclerTest, delete_v2_inverted_index_with_segment_list) {
+ auto txn_kv = std::make_shared<MemTxnKv>();
+ ASSERT_EQ(txn_kv->init(), 0);
+
+ constexpr std::string_view resource_id =
"delete_v2_index_with_segment_list";
+ InstanceInfoPB instance;
+ instance.set_instance_id(instance_id);
+ auto obj_info = instance.add_obj_info();
+ obj_info->set_id(std::string(resource_id));
+ obj_info->set_ak(config::test_s3_ak);
+ obj_info->set_sk(config::test_s3_sk);
+ obj_info->set_endpoint(config::test_s3_endpoint);
+ obj_info->set_region(config::test_s3_region);
+ obj_info->set_bucket(config::test_s3_bucket);
+ obj_info->set_prefix(std::string(resource_id));
+
+ InstanceRecycler recycler(txn_kv, instance, thread_group,
+ std::make_shared<TxnLazyCommitter>(txn_kv));
+ ASSERT_EQ(recycler.init(), 0);
+ auto accessor = recycler.accessor_map_.begin()->second;
+
+ doris::TabletSchemaCloudPB schema;
+ schema.set_schema_version(1);
+ schema.set_inverted_index_storage_format(InvertedIndexStorageFormatPB::V2);
+ auto index = schema.add_index();
+ index->set_index_id(100);
+ index->set_index_type(IndexType::INVERTED);
+
+ constexpr int num_segments = 2;
+ constexpr std::array<int64_t, num_segments> segment_ids = {10, 12};
+ auto rowset = create_rowset(std::string(resource_id), 10002, 10001,
num_segments, schema);
+ for (auto segment_id : segment_ids) {
+ rowset.add_segment_ids(segment_id);
+ ASSERT_EQ(accessor->put_file(
+ segment_path(rowset.tablet_id(),
rowset.rowset_id_v2(), segment_id), ""),
+ 0);
+ ASSERT_EQ(accessor->put_file(inverted_index_path_v2(rowset.tablet_id(),
+
rowset.rowset_id_v2(), segment_id),
+ ""),
+ 0);
+ }
+
+ ASSERT_EQ(recycler.delete_rowset_data(rowset), 0);
+ for (auto segment_id : segment_ids) {
+ EXPECT_EQ(accessor->exists(
+ segment_path(rowset.tablet_id(),
rowset.rowset_id_v2(), segment_id)),
+ 1);
+ EXPECT_EQ(accessor->exists(inverted_index_path_v2(rowset.tablet_id(),
rowset.rowset_id_v2(),
+ segment_id)),
+ 1);
+ }
+
+ auto batch_rowset = create_rowset(std::string(resource_id), 10003, 10001,
num_segments, schema);
+ for (auto segment_id : segment_ids) {
+ batch_rowset.add_segment_ids(segment_id);
+ ASSERT_EQ(accessor->put_file(segment_path(batch_rowset.tablet_id(),
+ batch_rowset.rowset_id_v2(),
segment_id),
+ ""),
+ 0);
+ ASSERT_EQ(
+
accessor->put_file(inverted_index_path_v2(batch_rowset.tablet_id(),
+
batch_rowset.rowset_id_v2(), segment_id),
+ ""),
+ 0);
+ }
+
+ std::map<std::string, doris::RowsetMetaCloudPB> rowsets;
+ rowsets.emplace(batch_rowset.rowset_id_v2(), batch_rowset);
+ RecyclerMetricsContext metrics_context;
+ ASSERT_EQ(recycler.delete_rowset_data(rowsets,
RowsetRecyclingState::FORMAL_ROWSET,
+ metrics_context),
+ 0);
+ for (auto segment_id : segment_ids) {
+ EXPECT_EQ(accessor->exists(segment_path(batch_rowset.tablet_id(),
+ batch_rowset.rowset_id_v2(),
segment_id)),
+ 1);
Review Comment:
In the batch delete path, recycler.delete_rowset_data(rowsets, ...) should
remove the segment files. This assertion currently expects the segment file to
still exist (exists()==1).
This issue also appears on line 6213 of the same file.
##########
regression-test/suites/compaction/test_mow_cumulative_compaction_multi_output_segments.groovy:
##########
@@ -0,0 +1,424 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_mow_cumulative_compaction_multi_output_segments", "nonConcurrent")
{
+ if (!isCloudMode()) {
+ logger.info("skip test_mow_cumulative_compaction_multi_output_segments
in non-cloud mode")
+ return
+ }
+
+ def backendIdToHost = [:]
+ def backendIdToHttpPort = [:]
+ getBackendIpHttpPort(backendIdToHost, backendIdToHttpPort)
+
+ def configNames = [
+ "compaction_batch_size",
+ "doris_scanner_row_bytes",
+ "enable_rowid_conversion_correctness_check",
+ "enable_vertical_compaction",
+ "inverted_index_compaction_enable",
+ "vertical_compaction_max_segment_size"
+ ]
Review Comment:
This suite updates BE config `enable_cloud_random_segment_id` (line ~248)
but it is not included in `configNames`, so `resetBeConfigs()` will not restore
the original value and can leak config changes into later regression suites.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
