This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 85dd9a27586 Branch-3.1: [fix](variant) fix some ut and regression-test
(#52373)
85dd9a27586 is described below
commit 85dd9a27586ae0bbc9d3c074499ea64e55e33c2b
Author: lihangyu <[email protected]>
AuthorDate: Mon Jun 30 10:39:20 2025 +0800
Branch-3.1: [fix](variant) fix some ut and regression-test (#52373)
---
be/test/vec/columns/column_object_test.cpp | 17 +++++++++++------
.../predefine/test_multi_index_nonCurrent.groovy | 6 +++++-
.../variant_p0/with_index/test_array_index_write.groovy | 4 ++--
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/be/test/vec/columns/column_object_test.cpp
b/be/test/vec/columns/column_object_test.cpp
index de7a289a7c3..27b7cf8be1f 100644
--- a/be/test/vec/columns/column_object_test.cpp
+++ b/be/test/vec/columns/column_object_test.cpp
@@ -25,6 +25,7 @@
#include <stdio.h>
#include "common/cast_set.h"
+#include "common/exception.h"
#include "runtime/jsonb_value.h"
#include "testutil/variant_util.h"
#include "vec/columns/common_column_test.h"
@@ -137,14 +138,18 @@ TEST(ColumnVariantTest, insert_try_insert) {
info.num_dimensions = 0;
PathInData path("v.f");
auto sub = v->get_subcolumn(path);
- Int64 value = 43;
- sub->insert(value, info);
+ Int64 value = 43000000;
- info.num_dimensions = 1;
- sub->insert(value, info);
+ try {
+ sub->insert(value, info);
+ info.num_dimensions = 1;
+ sub->insert(value, info);
- info.num_dimensions = 2;
- sub->insert(value, info);
+ info.num_dimensions = 2;
+ sub->insert(value, info);
+ } catch (const doris::Exception& e) {
+ std::cout << "encounter exception: " << e.what() << std::endl;
+ }
}
TEST(ColumnVariantTest, basic_finalize) {
diff --git
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
index 8b08cf06669..fb853e41022 100644
---
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
@@ -26,8 +26,12 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("segment_iterator.apply_inverted_index")
GetDebugPoint().enableDebugPointForAllBEs(checkpoints_name,
[filtered_rows: expectedFilteredRows])
sql "set experimental_enable_parallel_scan = false"
+ sql " set inverted_index_skip_threshold = 0 "
+ sql " set enable_common_expr_pushdown_for_inverted_index = true"
+ sql " set enable_common_expr_pushdown = true"
+ sql " set enable_parallel_scan = false"
sql "sync"
- sql "${sqlQuery}"
+ sql "${sqlQuery}"
} finally {
GetDebugPoint().disableDebugPointForAllBEs(checkpoints_name)
GetDebugPoint().disableDebugPointForAllBEs("segment_iterator.apply_inverted_index")
diff --git
a/regression-test/suites/variant_p0/with_index/test_array_index_write.groovy
b/regression-test/suites/variant_p0/with_index/test_array_index_write.groovy
index a1530a60014..cb1100aa01a 100644
--- a/regression-test/suites/variant_p0/with_index/test_array_index_write.groovy
+++ b/regression-test/suites/variant_p0/with_index/test_array_index_write.groovy
@@ -28,8 +28,8 @@ suite("test_array_index_write", "nonConcurrent"){
stmt += strTmp
stmt = stmt.substring(0, stmt.length()-2)
def storageFormat = new Random().nextBoolean() ? "V1" : "V2"
- if (storageFormat == "V1" && isCloudMode()) {
- return;
+ if (isCloudMode()) {
+ storageFormat = "V2";
}
stmt += ") \nENGINE=OLAP\n" +
"DUPLICATE KEY(`k1`)\n" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
