You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vj...@apache.org on 2023/08/07 00:03:29 UTC
[phoenix] 01/01: Merge branch 'master' into PHOENIX-6978-feature
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 8c947062be94eca848775444e6841765cf3b58a9
Merge: fa6e7b5c3f a3015bd1de
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Sun Aug 6 17:03:18 2023 -0700
Merge branch 'master' into PHOENIX-6978-feature
.../org/apache/phoenix/end2end/AlterTableIT.java | 97 ----------------------
.../apache/phoenix/end2end/BaseAggregateIT.java | 2 -
.../org/apache/phoenix/end2end/CreateTableIT.java | 58 -------------
.../phoenix/end2end/ParallelStatsDisabledIT.java | 2 +-
.../phoenix/end2end/RowValueConstructorIT.java | 41 +++++++++
.../org/apache/phoenix/cache/TenantCacheImpl.java | 1 -
.../org/apache/phoenix/compile/WhereOptimizer.java | 4 +
.../phoenix/iterate/BaseResultIterators.java | 31 ++++---
.../org/apache/phoenix/iterate/ExplainTable.java | 94 ++++-----------------
.../phoenix/iterate/ParallelScansCollector.java | 12 ++-
.../phoenix/iterate/ScansWithRegionLocations.java | 47 +++++++++++
.../phoenix/query/ConnectionQueryServicesImpl.java | 26 +-----
.../org/apache/phoenix/schema/MetaDataClient.java | 6 --
.../apache/phoenix/compile/WhereOptimizerTest.java | 34 +++++++-
.../java/org/apache/phoenix/query/BaseTest.java | 2 +-
phoenix-tracing-webapp/pom.xml | 1 -
pom.xml | 4 +-
17 files changed, 177 insertions(+), 285 deletions(-)
diff --cc phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
index e8b3e721ba,2b30f25b81..c0d4cb5756
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CreateTableIT.java
@@@ -47,10 -46,8 +47,9 @@@ import org.apache.hadoop.hbase.client.A
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
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.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;