This is an automated email from the ASF dual-hosted git repository.
kadir pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new 8cd68e8c1c PHOENIX-6761 : Phoenix Client Side Metadata Caching
Improvement (#1506)
8cd68e8c1c is described below
commit 8cd68e8c1c9e60e2268071cb16f3af511ed97b6e
Author: palash
AuthorDate: Tue Nov 29 08:19:34 2022 +0530
PHOENIX-6761 : Phoenix Client Side Metadata Caching Improvement (#1506)
Co-authored-by: Palash Chauhan
---
.../apache/phoenix/end2end/AppendOnlySchemaIT.java | 40 +
.../java/org/apache/phoenix/end2end/UpgradeIT.java | 3 +-
.../apache/phoenix/end2end/index/BaseIndexIT.java | 5 +
.../apache/phoenix/query/MetaDataCachingIT.java| 190
.../rpc/UpdateCacheConnectionLevelPropIT.java | 17 +-
.../java/org/apache/phoenix/rpc/UpdateCacheIT.java | 2 +-
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 116 ++---
.../phoenix/monitoring/GlobalClientMetrics.java| 7 +-
.../org/apache/phoenix/monitoring/MetricType.java | 2 +
.../phoenix/query/ConnectionQueryServices.java | 3 +
.../phoenix/query/ConnectionQueryServicesImpl.java | 26 +--
.../query/ConnectionlessQueryServicesImpl.java | 19 +-
.../query/DelegateConnectionQueryServices.java | 6 +
.../org/apache/phoenix/schema/MetaDataClient.java | 10 +-
.../java/org/apache/phoenix/schema/PMetaData.java | 3 +-
.../org/apache/phoenix/schema/PMetaDataCache.java | 193 ++---
.../org/apache/phoenix/schema/PMetaDataImpl.java | 61 ---
.../phoenix/schema/PSynchronizedMetaData.java | 11 --
.../java/org/apache/phoenix/schema/PTableRef.java | 15 +-
.../org/apache/phoenix/schema/PTableRefImpl.java | 2 +-
.../apache/phoenix/schema/SerializedPTableRef.java | 2 +-
.../java/org/apache/phoenix/util/MetaDataUtil.java | 17 +-
.../apache/phoenix/schema/PMetaDataImplTest.java | 45 +
23 files changed, 432 insertions(+), 363 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index a865121abb..2a76844029 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -58,8 +58,10 @@ import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.schema.PTableType;
import org.apache.phoenix.schema.TableAlreadyExistsException;
import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.AdditionalMatchers;
import org.mockito.Mockito;
@Category(ParallelStatsDisabledTest.class)
@@ -112,9 +114,9 @@ public class AppendOnlySchemaIT extends
ParallelStatsDisabledIT {
}
// verify getTable rpcs
-verify(connectionQueryServices, sameClient ? never() : times(1))
-.getTable((PName) isNull(), eq(new byte[0]),
-eq(Bytes.toBytes(viewName)), anyLong(), anyLong());
+verify(connectionQueryServices, never())
+.getTable((PName) isNull(), AdditionalMatchers.aryEq(new
byte[0]),
+AdditionalMatchers.aryEq(Bytes.toBytes(viewName)),
anyLong(), anyLong());
// verify no create table rpcs
verify(connectionQueryServices,
never()).createTable(anyListOf(Mutation.class),
@@ -324,38 +326,6 @@ public class AppendOnlySchemaIT extends
ParallelStatsDisabledIT {
assertEquals(1000, view.getUpdateCacheFrequency());
}
}
-
-@Test
-public void testUpsertRowToDeletedTable() throws Exception {
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-try (Connection conn1 = DriverManager.getConnection(getUrl(), props);
-Connection conn2 = DriverManager.getConnection(getUrl(),
props)) {
-String metricTableName = generateUniqueName();
-String viewName = generateUniqueName();
-String metricIdSeqTableName = generateUniqueName();
-// create sequence for auto partition
-conn1.createStatement().execute("CREATE SEQUENCE " +
metricIdSeqTableName + " CACHE 1");
-// create base table
-conn1.createStatement().execute("CREATE TABLE " + metricTableName
+ " (metricId INTEGER NOT NULL, metricVal DOUBLE, CONSTRAINT PK PRIMARY
KEY(metricId))"
-+ " APPEND_ONLY_SCHEMA = true, UPDATE_CACHE_FREQUENCY=1,
AUTO_PARTITION_SEQ=" + metricIdSeqTableName);
-// create view
-String ddl =
-"CREATE VIEW IF NOT EXISTS "
-+ viewName + "( hostName
