This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch PHOENIX-6978-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 86ba54583493a17ea63f40d5f0f7a907a972b19c
Merge: ade4d639ce 48d712ca41
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Tue Sep 19 22:04:43 2023 -0700
Merge branch 'master' into PHOENIX-6978-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 | 3 +-
.../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(+), 213 deletions(-)
diff --cc phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index 3424146da9,bf9c9cde86..fbdaf4d94d
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@@ -46,10 -46,16 +47,17 @@@ import org.apache.hadoop.hbase.TableNam
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+ import org.apache.hadoop.hbase.client.Get;
+ import org.apache.hadoop.hbase.client.Put;
+ import org.apache.hadoop.hbase.client.Result;
+ import org.apache.hadoop.hbase.client.Row;
+ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
+ import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory;
import org.apache.hadoop.hbase.regionserver.BloomType;
+import org.apache.phoenix.coprocessor.BaseScannerRegionObserver;
+ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
@@@ -69,7 -76,7 +78,8 @@@ import org.apache.phoenix.schema.PTable
import org.apache.phoenix.schema.SchemaNotFoundException;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.schema.TableNotFoundException;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+ import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
