This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch PHOENIX-7001-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 683aeda80c69cb23435a1dc10f8c1273a2f05802 Merge: 4c9827a43f 48d712ca41 Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Tue Sep 19 22:06:51 2023 -0700 Merge branch 'master' into PHOENIX-7001-feature .../org/apache/phoenix/end2end/BaseOrderByIT.java | 20 +- .../org/apache/phoenix/end2end/CreateTableIT.java | 88 ++ .../apache/phoenix/end2end/LikeExpressionIT.java | 1569 ++++++++++++++++++++ .../org/apache/phoenix/end2end/ServerPagingIT.java | 370 +++++ .../phoenix/iterate/PhoenixQueryTimeoutIT.java | 12 +- phoenix-core/src/main/antlr3/PhoenixSQL.g | 6 +- .../apache/phoenix/compile/ColumnProjector.java | 10 +- .../phoenix/compile/ExpressionProjector.java | 16 +- .../apache/phoenix/compile/ListJarsQueryPlan.java | 2 +- .../apache/phoenix/compile/ProjectionCompiler.java | 34 +- .../org/apache/phoenix/compile/RowProjector.java | 7 +- .../org/apache/phoenix/compile/TraceQueryPlan.java | 2 +- .../org/apache/phoenix/compile/UnionCompiler.java | 2 +- .../org/apache/phoenix/compile/WhereOptimizer.java | 21 +- .../phoenix/coprocessor/PagingRegionScanner.java | 16 +- .../UncoveredGlobalIndexRegionScanner.java | 3 + .../coprocessor/UncoveredIndexRegionScanner.java | 30 +- .../UncoveredLocalIndexRegionScanner.java | 3 + .../org/apache/phoenix/filter/PagingFilter.java | 84 +- .../phoenix/iterate/BaseResultIterators.java | 3 + .../phoenix/iterate/OffsetResultIterator.java | 19 +- .../apache/phoenix/iterate/ParallelIterators.java | 5 +- .../phoenix/iterate/ScanningResultIterator.java | 14 +- .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 84 +- .../org/apache/phoenix/jdbc/PhoenixResultSet.java | 2 +- .../phoenix/jdbc/PhoenixResultSetMetaData.java | 3 +- .../org/apache/phoenix/jdbc/PhoenixStatement.java | 32 +- .../phoenix/monitoring/GlobalClientMetrics.java | 4 +- .../org/apache/phoenix/monitoring/MetricType.java | 4 +- .../phoenix/monitoring/ScanMetricsHolder.java | 7 + .../apache/phoenix/parse/CreateTableStatement.java | 11 +- .../org/apache/phoenix/parse/ParseNodeFactory.java | 54 +- .../org/apache/phoenix/schema/MetaDataClient.java | 4 +- .../java/org/apache/phoenix/util/ScanUtil.java | 12 +- .../phoenix/compile/CreateTableCompilerTest.java | 27 +- .../phoenix/compile/PostIndexDDLCompilerTest.java | 15 + .../apache/phoenix/compile/QueryCompilerTest.java | 6 + .../apache/phoenix/compile/QueryMetaDataTest.java | 3 +- .../apache/phoenix/compile/WhereOptimizerTest.java | 76 + .../phoenix/jdbc/PhoenixPreparedStatementTest.java | 1 - .../phoenix/jdbc/PhoenixResultSetMetadataTest.java | 105 ++ pom.xml | 80 +- 42 files changed, 2652 insertions(+), 214 deletions(-) diff --cc phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java index e0c0b547bb,d73f1cbc15..d9527ecd32 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java @@@ -1843,21 -1836,11 +1857,21 @@@ public class PhoenixStatement implement } @Override - public CreateTableStatement createTable(TableName tableName, ListMultimap<String,Pair<String,Object>> props, List<ColumnDef> columns, PrimaryKeyConstraint pkConstraint, - List<ParseNode> splits, PTableType tableType, boolean ifNotExists, TableName baseTableName, ParseNode tableTypeIdNode, int bindCount, Boolean immutableRows) { - return new ExecutableCreateTableStatement(tableName, props, columns, pkConstraint, splits, tableType, ifNotExists, baseTableName, tableTypeIdNode, bindCount, immutableRows, null); + public CreateTableStatement createTable(TableName tableName, ListMultimap<String,Pair<String,Object>> props, List<ColumnDef> columns, PrimaryKeyConstraint pkConstraint, List<ParseNode> splits, + PTableType tableType, boolean ifNotExists, TableName baseTableName, ParseNode tableTypeIdNode, int bindCount, Boolean immutableRows) { + return createTable(tableName, props, columns, pkConstraint, splits, tableType, ifNotExists, baseTableName, tableTypeIdNode, bindCount, immutableRows, null); } + @Override + public CreateCDCStatement createCDC(NamedNode cdcObj, TableName dataTable, + ColumnName timeIdxColumn, FunctionParseNode timeIdxFunc, + Set<PTable.CDCChangeScope> includeScopes, + ListMultimap<String, Pair<String, Object>> props, + boolean ifNotExists, int bindCount) { + return new ExecutableCreateCDCStatement(cdcObj, dataTable, timeIdxColumn, timeIdxFunc, + includeScopes, props, ifNotExists, bindCount); + } + @Override public CreateSchemaStatement createSchema(String schemaName, boolean ifNotExists) { return new ExecutableCreateSchemaStatement(schemaName, ifNotExists);