This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch PHOENIX-7876-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit e0fb908eda50ab2aa4a0e54e0a358373e1b2cb2e Author: Andrew Purtell <[email protected]> AuthorDate: Mon Jun 15 10:09:00 2026 -0700 PHOENIX-7928 Re-baseline some missed tests (#2533) Co-authored-by: Claude Opus 4.8[1m] <[email protected]> --- .../apache/phoenix/end2end/CDCDefinitionIT.java | 4 +-- .../apache/phoenix/end2end/index/IndexUsageIT.java | 30 +++++++++++----------- .../phoenix/end2end/json/JsonFunctionsIT.java | 2 +- .../schema/tool/SchemaToolExtractionIT.java | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCDefinitionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCDefinitionIT.java index 6941735d23..c2484c5571 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCDefinitionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CDCDefinitionIT.java @@ -244,8 +244,8 @@ public class CDCDefinitionIT extends CDCBaseIT { assertEquals(true, indexTable.isMultiTenant()); List<PColumn> idxPkColumns = indexTable.getPKColumns(); assertEquals(":TENANTID", idxPkColumns.get(0).getName().getString()); - assertEquals(": PARTITION_ID()", idxPkColumns.get(1).getName().getString()); - assertEquals(": PHOENIX_ROW_TIMESTAMP()", idxPkColumns.get(2).getName().getString()); + assertEquals(":PARTITION_ID()", idxPkColumns.get(1).getName().getString()); + assertEquals(":PHOENIX_ROW_TIMESTAMP()", idxPkColumns.get(2).getName().getString()); assertEquals(":K", idxPkColumns.get(3).getName().getString()); PTable cdcTable = PhoenixRuntime.getTable(conn, cdcName); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java index 74826e9f65..de405ef9f5 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexUsageIT.java @@ -135,7 +135,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { .iteratorType("PARALLEL 1-WAY").serverFirstKeyOnlyProjection(true) .serverAggregate("SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY " + "[TO_BIGINT(\"(A.INT_COL1 + B.INT_COL2)\")]") - .indexRule(OptimizerReasons.RULE_ORDER_PRESERVING).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.scanType("RANGE SCAN") .table("INDEX_TEST." + indexName + "(" + fullDataTableName + ")") @@ -192,7 +192,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER " + "[TO_BIGINT(\"(A.INT_COL1 + 1)\")]") .serverAggregate( "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY " + "[TO_BIGINT(\"(A.INT_COL1 + 1)\")]") - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.table("INDEX_TEST." + indexName + "(" + fullDataTableName + ")") .keyRanges(" [1,0] - [1,*]").clientSortAlgo("CLIENT MERGE SORT"); @@ -245,9 +245,9 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { conn.createStatement().execute(ddl); String sql = "SELECT int_col1+1 FROM " + fullDataTableName + " where int_col1+1 IN (2)"; - ExplainPlanTestUtil.ExplainPlanAssert basePlan = assertPlan(conn, sql) - .iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN").serverFirstKeyOnlyProjection(true) - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + ExplainPlanTestUtil.ExplainPlanAssert basePlan = + assertPlan(conn, sql).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") + .serverFirstKeyOnlyProjection(true).indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.table("INDEX_TEST." + indexName + "(" + fullDataTableName + ")") .keyRanges(" [1,2]").clientSortAlgo("CLIENT MERGE SORT"); @@ -301,7 +301,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { ExplainPlanTestUtil.ExplainPlanAssert basePlan = assertPlan(conn, sql).iteratorType("PARALLEL 1-WAY").serverFirstKeyOnlyProjection(true) - .indexRule(OptimizerReasons.RULE_NON_LOCAL_PREFERRED).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.scanType("RANGE SCAN") .table("INDEX_TEST." + indexName + "(" + fullDataTableName + ")").keyRanges(" [1]") @@ -376,7 +376,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { + " WHERE (\"V1\" || '_' || \"v2\") = 'x_1'"; ExplainPlanTestUtil.ExplainPlanAssert basePlan = assertPlan(conn, query).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.table(indexName + "(" + dataTableName + ")").keyRanges(" [1,'x_1']") .clientSortAlgo("CLIENT MERGE SORT"); @@ -401,7 +401,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { "SELECT \"V1\", \"V1\" as foo1, (\"V1\" || '_' || \"v2\") as foo, (\"V1\" || '_' || \"v2\") as \"Foo1\", (\"V1\" || '_' || \"v2\") FROM " + dataTableName + " ORDER BY foo"; basePlan = assertPlan(conn, query).iteratorType("PARALLEL 1-WAY") - .indexRule(OptimizerReasons.RULE_NON_LOCAL_PREFERRED).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.scanType("RANGE SCAN").table(indexName + "(" + dataTableName + ")") .keyRanges(" [1]").clientSortAlgo("CLIENT MERGE SORT"); @@ -482,7 +482,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { basePlan.scanType("RANGE SCAN") .table("INDEX_TEST." + indexName + "(" + fullDataTableName + ")").keyRanges(" [1,2]") .clientSortAlgo("CLIENT MERGE SORT").serverFirstKeyOnlyProjection(true) - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); } else { basePlan.scanType("FULL SCAN").table(fullDataTableName).clientSortAlgo(null) .serverWhereFilter("SERVER FILTER BY (A.INT_COL1 + 1) = 2") @@ -537,7 +537,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { String query = "SELECT k1, k2, k3, s1, s2 FROM " + viewName + " WHERE k1+k2+k3 = 173.0"; ExplainPlanTestUtil.ExplainPlanAssert basePlan = assertPlan(conn, query).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); if (local) { basePlan.table(indexName1 + "(" + dataTableName + ")").keyRanges(" [1,173]") .clientSortAlgo("CLIENT MERGE SORT"); @@ -560,7 +560,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { query = "SELECT k1, k2, s1||'_'||s2 FROM " + viewName + " WHERE (s1||'_'||s2)='foo2_bar2'"; basePlan = assertPlan(conn, query).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") - .serverFirstKeyOnlyProjection(true).indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS) + .serverFirstKeyOnlyProjection(true).indexRuleStartsWith("matches") .indexRejectedCount(1); if (local) { basePlan.table(indexName2 + "(" + dataTableName + ")") @@ -625,7 +625,7 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { assertPlan(conn, query).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") .table(indexName2).keyRanges(" [1,'abc_cab','foo']").serverFirstKeyOnlyProjection(true) - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedCount(1); + .indexRuleStartsWith("matches").indexRejectedCount(1); rs = conn.createStatement().executeQuery(query); assertTrue(rs.next()); @@ -722,9 +722,9 @@ public class IndexUsageIT extends ParallelStatsDisabledIT { query = "SELECT k FROM " + dataTableName + " WHERE REGEXP_SUBSTR(v,'id:\\\\w+') = 'id:id1'"; - ExplainPlanTestUtil.ExplainPlanAssert basePlan = assertPlan(conn, query) - .iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN").serverFirstKeyOnlyProjection(true) - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + ExplainPlanTestUtil.ExplainPlanAssert basePlan = + assertPlan(conn, query).iteratorType("PARALLEL 1-WAY").scanType("RANGE SCAN") + .serverFirstKeyOnlyProjection(true).indexRuleStartsWith("matches").indexRejectedNone(); if (localIndex) { basePlan.table(indexName + "(" + dataTableName + ")").keyRanges(" [1,'id:id1']") .clientSortAlgo("CLIENT MERGE SORT"); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/json/JsonFunctionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/json/JsonFunctionsIT.java index d33debd7b7..e527e76d12 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/json/JsonFunctionsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/json/JsonFunctionsIT.java @@ -369,7 +369,7 @@ public class JsonFunctionsIT extends ParallelStatsDisabledIT { "SELECT JSON_VALUE(JSONCOL,'$.type'), " + "JSON_VALUE(JSONCOL,'$.info.address.town') FROM " + tableName + " WHERE JSON_VALUE(JSONCOL,'$.type') = 'Basic'"; assertPlan(conn, selectSql).scanType("RANGE SCAN").table(indexName) - .indexRule(OptimizerReasons.RULE_MORE_BOUND_PK_COLUMNS).indexRejectedNone(); + .indexRuleStartsWith("matches").indexRejectedNone(); // Validate the total count of rows String countSql = "SELECT COUNT(1) FROM " + tableName; ResultSet rs = conn.createStatement().executeQuery(countSql); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java index beed114ef0..097ea96f4c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/schema/tool/SchemaToolExtractionIT.java @@ -175,7 +175,7 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String createIndexStatement = "CREATE LOCAL INDEX " + indexName + " ON " + pTableFullName + "(v1 DESC, k) INCLUDE (v2)"; String createIndexStatement2 = "CREATE LOCAL INDEX " + indexName2 + " ON " + pTableFullName - + "( LPAD(v1,10) DESC, k) INCLUDE (v2)"; + + "(LPAD(v1,10) DESC, k) INCLUDE (v2)"; List<String> queries = new ArrayList<String>() { }; @@ -203,7 +203,7 @@ public class SchemaToolExtractionIT extends ParallelStatsEnabledIT { String createTableStatement = "CREATE TABLE " + pTableFullName + "(K VARCHAR NOT NULL PRIMARY KEY, \"v1\" VARCHAR, V2 VARCHAR)" + properties; String createIndexStatement = "CREATE LOCAL INDEX " + indexName + " ON " + pTableFullName - + "( LPAD(\"v1\",10) DESC, K) INCLUDE (V2)"; + + "(LPAD(\"v1\",10) DESC, K) INCLUDE (V2)"; List<String> queries = new ArrayList<String>() { };
