You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2025/12/04 12:06:52 UTC
(ignite-3) 02/02: fix tests
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-27084
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 6490016900a5d47abf3b0b0e14b50db468b4c5e7
Author: amashenkov <am...@apache.org>
AuthorDate: Thu Dec 4 15:04:00 2025 +0300
fix tests
---
modules/sql-engine/src/integrationTest/sql/group1/explain/scan.test | 6 +++---
modules/sql-engine/src/test/resources/tpcds/plan/q9.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q1.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q10.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q12.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q14.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q15.plan | 4 ++--
modules/sql-engine/src/test/resources/tpch/plan/q17.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q2.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q20.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q21.plan | 4 ++--
modules/sql-engine/src/test/resources/tpch/plan/q22.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/q3.plan | 4 ++--
modules/sql-engine/src/test/resources/tpch/plan/q4.plan | 4 ++--
modules/sql-engine/src/test/resources/tpch/plan/q6.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/variant_q12.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/variant_q14.plan | 2 +-
modules/sql-engine/src/test/resources/tpch/plan/variant_q8.plan | 2 +-
18 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/modules/sql-engine/src/integrationTest/sql/group1/explain/scan.test b/modules/sql-engine/src/integrationTest/sql/group1/explain/scan.test
index 48d9b6e596c..6df982ba767 100644
--- a/modules/sql-engine/src/integrationTest/sql/group1/explain/scan.test
+++ b/modules/sql-engine/src/integrationTest/sql/group1/explain/scan.test
@@ -317,7 +317,7 @@ Exchange
index: TEST_TABLE_IDX
type: SORTED
predicate: >(C1, 1)
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1, lowerInclude=false, shouldComputeUpper=true, upperBound=null:INTEGER, upperInclude=false]]
+ searchBounds: (<1>..<null:INTEGER>)
fieldNames: [C1]
collation: [C1 ASC]
est: (rows=1)
@@ -334,7 +334,7 @@ Exchange
index: TEST_TABLE_IDX
type: SORTED
predicate: AND(SEARCH(C1, Sarg[1, 2, 3]), >(CAST(CURRENT_TIMESTAMP):TIMESTAMP(0) NOT NULL, 1970-01-01 00:00:00))
- searchBounds: [MultiBounds [bounds=ArrayList [ExactBounds [bound=1], ExactBounds [bound=2], ExactBounds [bound=3]]]]
+ searchBounds: <1>, <2>, <3>
fieldNames: [C1]
collation: [C1 ASC]
est: (rows=1)
@@ -354,7 +354,7 @@ Exchange
index: HASH_IDX
type: HASH
predicate: =(C2, 10)
- searchBounds: [ExactBounds [bound=10]]
+ searchBounds: <10>
fieldNames: [C1]
est: (rows=1)
diff --git a/modules/sql-engine/src/test/resources/tpcds/plan/q9.plan b/modules/sql-engine/src/test/resources/tpcds/plan/q9.plan
index 3f9ddc04a17..3761975b5a5 100644
--- a/modules/sql-engine/src/test/resources/tpcds/plan/q9.plan
+++ b/modules/sql-engine/src/test/resources/tpcds/plan/q9.plan
@@ -84,7 +84,7 @@ Project
index: REASON_PK
type: HASH
predicate: =(R_REASON_SK, 1)
- searchBounds: [ExactBounds [bound=1]]
+ searchBounds: <1>
fieldNames: [R_REASON_SK]
est: (rows=1)
Project
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q1.plan b/modules/sql-engine/src/test/resources/tpch/plan/q1.plan
index 081944b1708..f82e2fed9e6 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q1.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q1.plan
@@ -27,7 +27,7 @@ Sort
index: L_SD
type: SORTED
predicate: <=(L_SHIPDATE, 1998-09-02)
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=null, lowerInclude=true, shouldComputeUpper=true, upperBound=1998-09-02, upperInclude=true]]
+ searchBounds: [..<1998-09-02>]
fieldNames: [L_RETURNFLAG, L_LINESTATUS, L_QUANTITY, L_EXTENDEDPRICE, $f4, $f5, L_DISCOUNT]
projection: [L_RETURNFLAG, L_LINESTATUS, L_QUANTITY, L_EXTENDEDPRICE, *(L_EXTENDEDPRICE, -(1, L_DISCOUNT)), *(*(L_EXTENDEDPRICE, -(1, L_DISCOUNT)), +(1, L_TAX)), L_DISCOUNT]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q10.plan b/modules/sql-engine/src/test/resources/tpch/plan/q10.plan
index 559f8f7922f..a356aba7d38 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q10.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q10.plan
@@ -39,7 +39,7 @@ Sort
index: O_OD
type: SORTED
predicate: SEARCH(O_ORDERDATE, Sarg[[1993-10-01..1994-01-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1993-10-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1994-01-01, upperInclude=false]]
+ searchBounds: [<1993-10-01>..<1994-01-01>)
fieldNames: [O_ORDERKEY, O_CUSTKEY, O_ORDERDATE]
collation: [O_ORDERDATE ASC]
est: (rows=375000)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q12.plan b/modules/sql-engine/src/test/resources/tpch/plan/q12.plan
index 88565dfcd8a..d6e10143d12 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q12.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q12.plan
@@ -34,7 +34,7 @@ Sort
index: L_RD
type: SORTED
predicate: AND(SEARCH(L_SHIPMODE, Sarg[_UTF-8'MAIL':VARCHAR(10) CHARACTER SET "UTF-8", _UTF-8'SHIP':VARCHAR(10) CHARACTER SET "UTF-8"]:VARCHAR(10) CHARACTER SET "UTF-8"), <(L_COMMITDATE, L_RECEIPTDATE), <(L_SHIPDATE, L_COMMITDATE), SEARCH(L_RECEIPTDATE, Sarg[[1994-01-01..1995-01-01)]))
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1994-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-01-01, upperInclude=false]]
+ searchBounds: [<1994-01-01>..<1995-01-01>)
fieldNames: [L_ORDERKEY, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPMODE]
collation: [L_RECEIPTDATE ASC]
est: (rows=213218)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q14.plan b/modules/sql-engine/src/test/resources/tpch/plan/q14.plan
index 7b966d1efa6..5c2e74e1ab5 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q14.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q14.plan
@@ -33,7 +33,7 @@ Project
index: L_SD
type: SORTED
predicate: SEARCH(L_SHIPDATE, Sarg[[1995-09-01..1995-10-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1995-09-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-10-01, upperInclude=false]]
+ searchBounds: [<1995-09-01>..<1995-10-01>)
fieldNames: [L_PARTKEY, L_EXTENDEDPRICE, L_DISCOUNT, L_SHIPDATE]
collation: [L_SHIPDATE ASC]
est: (rows=1500304)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q15.plan b/modules/sql-engine/src/test/resources/tpch/plan/q15.plan
index 4c20d166e18..24c118a010c 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q15.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q15.plan
@@ -31,7 +31,7 @@ Project
index: L_SD
type: SORTED
predicate: SEARCH(L_SHIPDATE, Sarg[[1996-01-01..1996-04-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1996-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1996-04-01, upperInclude=false]]
+ searchBounds: [<1996-01-01>..<1996-04-01>)
fieldNames: [L_SUPPKEY, $f1]
projection: [L_SUPPKEY, *(L_EXTENDEDPRICE, -(1, L_DISCOUNT))]
collation: []
@@ -63,7 +63,7 @@ Project
index: L_SD
type: SORTED
predicate: SEARCH(L_SHIPDATE, Sarg[[1996-01-01..1996-04-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1996-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1996-04-01, upperInclude=false]]
+ searchBounds: [<1996-01-01>..<1996-04-01>)
fieldNames: [L_SUPPKEY, $f1]
projection: [L_SUPPKEY, *(L_EXTENDEDPRICE, -(1, L_DISCOUNT))]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q17.plan b/modules/sql-engine/src/test/resources/tpch/plan/q17.plan
index a420557c943..7ee58d1225a 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q17.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q17.plan
@@ -80,7 +80,7 @@ Project
index: L_PK_SK
type: SORTED
predicate: =(L_PARTKEY, $cor1.P_PARTKEY)
- searchBounds: [ExactBounds [bound=$cor1.P_PARTKEY]]
+ searchBounds: <$cor1.P_PARTKEY>
fieldNames: [L_QUANTITY]
collation: []
est: (rows=1998405)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q2.plan b/modules/sql-engine/src/test/resources/tpch/plan/q2.plan
index 22a319d024c..91a2cf8bbc7 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q2.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q2.plan
@@ -104,7 +104,7 @@ Sort
index: PS_PK
type: SORTED
predicate: =($cor1.P_PARTKEY, PS_PARTKEY)
- searchBounds: [ExactBounds [bound=$cor1.P_PARTKEY]]
+ searchBounds: <$cor1.P_PARTKEY>
fieldNames: [PS_PARTKEY, PS_SUPPKEY, PS_SUPPLYCOST]
collation: [PS_PARTKEY ASC]
est: (rows=266400)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q20.plan b/modules/sql-engine/src/test/resources/tpch/plan/q20.plan
index 01ea48efb0c..79c2ae2f16b 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q20.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q20.plan
@@ -91,7 +91,7 @@ Project
index: L_SK_PK
type: SORTED
predicate: AND(=(L_PARTKEY, $cor2.PS_PARTKEY), =(L_SUPPKEY, $cor2.PS_SUPPKEY), SEARCH(L_SHIPDATE, Sarg[[1994-01-01..1995-01-01)]))
- searchBounds: [ExactBounds [bound=$cor2.PS_SUPPKEY], ExactBounds [bound=$cor2.PS_PARTKEY]]
+ searchBounds: <$cor2.PS_SUPPKEY>, <$cor2.PS_PARTKEY>
fieldNames: [L_QUANTITY]
collation: []
est: (rows=166367)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q21.plan b/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
index 375592959f6..2fd781cad74 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q21.plan
@@ -103,7 +103,7 @@ Sort
index: L_OK
type: SORTED
predicate: AND(=(L_ORDERKEY, $cor6.L_ORDERKEY), <>(L_SUPPKEY, $cor6.L_SUPPKEY))
- searchBounds: [ExactBounds [bound=$cor6.L_ORDERKEY]]
+ searchBounds: <$cor6.L_ORDERKEY>
fieldNames: [i]
projection: [true]
collation: []
@@ -126,7 +126,7 @@ Sort
index: L_OK
type: SORTED
predicate: AND(=(L_ORDERKEY, $cor5.L_ORDERKEY), <>(L_SUPPKEY, $cor5.L_SUPPKEY), >(L_RECEIPTDATE, L_COMMITDATE))
- searchBounds: [ExactBounds [bound=$cor5.L_ORDERKEY]]
+ searchBounds: <$cor5.L_ORDERKEY>
fieldNames: [i]
projection: [true]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q22.plan b/modules/sql-engine/src/test/resources/tpch/plan/q22.plan
index dc6d74685cd..c3ecf99edae 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q22.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q22.plan
@@ -80,7 +80,7 @@ Sort
index: O_CK
type: SORTED
predicate: =(O_CUSTKEY, $cor1.C_CUSTKEY)
- searchBounds: [ExactBounds [bound=$cor1.C_CUSTKEY]]
+ searchBounds: <$cor1.C_CUSTKEY>
fieldNames: [i]
projection: [true]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q3.plan b/modules/sql-engine/src/test/resources/tpch/plan/q3.plan
index e137694299b..697975b4e48 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q3.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q3.plan
@@ -27,7 +27,7 @@ Sort
index: L_SD
type: SORTED
predicate: >(L_SHIPDATE, 1995-03-15)
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1995-03-15, lowerInclude=false, shouldComputeUpper=true, upperBound=null:DATE, upperInclude=false]]
+ searchBounds: (<1995-03-15>..<null:DATE>)
fieldNames: [L_ORDERKEY, L_EXTENDEDPRICE, L_DISCOUNT, L_SHIPDATE]
collation: [L_SHIPDATE ASC]
est: (rows=3000608)
@@ -43,7 +43,7 @@ Sort
index: O_OD
type: SORTED
predicate: <(O_ORDERDATE, 1995-03-15)
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=null, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-03-15, upperInclude=false]]
+ searchBounds: [..<1995-03-15>)
fieldNames: [O_ORDERKEY, O_CUSTKEY, O_ORDERDATE, O_SHIPPRIORITY]
collation: [O_ORDERDATE ASC]
est: (rows=750000)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q4.plan b/modules/sql-engine/src/test/resources/tpch/plan/q4.plan
index 317fb82720f..4028daa5e3c 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q4.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q4.plan
@@ -24,7 +24,7 @@ ColocatedSortAggregate
index: O_OD
type: SORTED
predicate: SEARCH(O_ORDERDATE, Sarg[[1993-07-01..1993-10-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1993-07-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1993-10-01, upperInclude=false]]
+ searchBounds: [<1993-07-01>..<1993-10-01>)
fieldNames: [O_ORDERKEY, O_ORDERPRIORITY]
collation: []
est: (rows=375000)
@@ -50,7 +50,7 @@ ColocatedSortAggregate
index: L_OK
type: SORTED
predicate: AND(=(L_ORDERKEY, $cor1.O_ORDERKEY), <(L_COMMITDATE, L_RECEIPTDATE))
- searchBounds: [ExactBounds [bound=$cor1.O_ORDERKEY]]
+ searchBounds: <$cor1.O_ORDERKEY>
fieldNames: [i]
projection: [true]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/q6.plan b/modules/sql-engine/src/test/resources/tpch/plan/q6.plan
index 75f7477a41f..95fc33752af 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/q6.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/q6.plan
@@ -18,7 +18,7 @@ ReduceSortAggregate
index: L_SD
type: SORTED
predicate: AND(SEARCH(L_SHIPDATE, Sarg[[1994-01-01..1995-01-01)]), SEARCH(L_DISCOUNT, Sarg[[0.05:DECIMAL(4, 2)..0.07:DECIMAL(4, 2)]]:DECIMAL(4, 2)), <(L_QUANTITY, 24.00))
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1994-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-01-01, upperInclude=false]]
+ searchBounds: [<1994-01-01>..<1995-01-01>)
fieldNames: [$f0]
projection: [*(L_EXTENDEDPRICE, L_DISCOUNT)]
collation: []
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/variant_q12.plan b/modules/sql-engine/src/test/resources/tpch/plan/variant_q12.plan
index 5567323023a..80cae2cead0 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/variant_q12.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/variant_q12.plan
@@ -34,7 +34,7 @@ Sort
index: L_RD
type: SORTED
predicate: AND(SEARCH(L_SHIPMODE, Sarg[_UTF-8'MAIL':VARCHAR(10) CHARACTER SET "UTF-8", _UTF-8'SHIP':VARCHAR(10) CHARACTER SET "UTF-8"]:VARCHAR(10) CHARACTER SET "UTF-8"), <(L_COMMITDATE, L_RECEIPTDATE), <(L_SHIPDATE, L_COMMITDATE), SEARCH(L_RECEIPTDATE, Sarg[[1994-01-01..1995-01-01)]))
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1994-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-01-01, upperInclude=false]]
+ searchBounds: [<1994-01-01>..<1995-01-01>)
fieldNames: [L_ORDERKEY, L_SHIPDATE, L_COMMITDATE, L_RECEIPTDATE, L_SHIPMODE]
collation: [L_RECEIPTDATE ASC]
est: (rows=213218)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/variant_q14.plan b/modules/sql-engine/src/test/resources/tpch/plan/variant_q14.plan
index a32bcb88501..d7ab149b3a7 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/variant_q14.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/variant_q14.plan
@@ -33,7 +33,7 @@ Project
index: L_SD
type: SORTED
predicate: SEARCH(L_SHIPDATE, Sarg[[1995-09-01..1995-10-01)])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1995-09-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1995-10-01, upperInclude=false]]
+ searchBounds: [<1995-09-01>..<1995-10-01>)
fieldNames: [L_PARTKEY, L_EXTENDEDPRICE, L_DISCOUNT, L_SHIPDATE]
collation: [L_SHIPDATE ASC]
est: (rows=1500304)
diff --git a/modules/sql-engine/src/test/resources/tpch/plan/variant_q8.plan b/modules/sql-engine/src/test/resources/tpch/plan/variant_q8.plan
index 81687549644..085c19c6542 100644
--- a/modules/sql-engine/src/test/resources/tpch/plan/variant_q8.plan
+++ b/modules/sql-engine/src/test/resources/tpch/plan/variant_q8.plan
@@ -49,7 +49,7 @@ Sort
index: O_OD
type: SORTED
predicate: SEARCH(O_ORDERDATE, Sarg[[1995-01-01..1996-12-31]])
- searchBounds: [RangeBounds [shouldComputeLower=true, lowerBound=1995-01-01, lowerInclude=true, shouldComputeUpper=true, upperBound=1996-12-31, upperInclude=true]]
+ searchBounds: [<1995-01-01>..<1996-12-31>]
fieldNames: [O_ORDERKEY, O_CUSTKEY, O_ORDERDATE]
collation: [O_ORDERDATE ASC]
est: (rows=375000)