PHOENIX-6883 : Phoenix Metadata Caching Redesign

phoenix-core-client/src/main/java/org/apache/phoenix/cache/ServerMetadataCacheImpl.java

@@ -133,8 +133,8 @@ public long getLastDDLTimestampForTable(byte[] tenantID, byte[] schemaName, byte
             properties.setProperty(TENANT_ID_ATTRIB, tenantIDStr);
         }
         try (Connection connection = getConnection(properties)) {
-            // Using PhoenixRuntime#getTableNoCache since se don't want to read cached value.
-            table = PhoenixRuntime.getTableNoCache(connection, fullTableNameStr);
+            // Using PhoenixRuntime#getTableFromServerNoCache to completely bypass CQSI cache.
+            table = PhoenixRuntime.getTableFromServerNoCache(connection, schemaName, tableName);
             // TODO PhoenixRuntime#getTableNoCache can throw TableNotFoundException.
             //  In that case, do we want to throw non retryable exception back to the client?
             // Update cache with the latest DDL timestamp from SYSCAT server.

phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java

@@ -129,6 +129,7 @@
 import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap.Builder;
 import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.transaction.PhoenixTransactionContext;
+import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.EnvironmentEdgeManager;
 import org.apache.phoenix.util.JDBCUtil;
@@ -726,6 +727,20 @@ public PTable getTableNoCache(String name) throws SQLException {
         return getTableNoCache(getTenantId(), name);
     }
 
+    /**
+     * Returns the most recent PTable fetched from the server without updating the CQSI cache.
+     */
+    public PTable getTableFromServerNoCache(byte[] schemaName, byte[] tableName)
+                    throws SQLException {
+        MetaDataProtocol.MetaDataMutationResult result =
+                getQueryServices().getTable(getTenantId(), schemaName,
+                        tableName, HConstants.LATEST_TIMESTAMP, HConstants.LATEST_TIMESTAMP);
+        if (result.getMutationCode() != MetaDataProtocol.MutationCode.TABLE_ALREADY_EXISTS) {
+            throw new TableNotFoundException(new String(schemaName), new String(tableName));
+        }
+        return result.getTable();
+    }
+
     /**
      * Returns the table if it is found in the client metadata cache. If the metadata of this
      * table has changed since it was put in the cache these changes will not necessarily be

phoenix-core-client/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java

@@ -54,6 +54,7 @@
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
 import org.apache.phoenix.compile.QueryPlan;
+import org.apache.phoenix.coprocessorclient.MetaDataProtocol;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.LiteralExpression;
 import org.apache.phoenix.expression.OrderByExpression;
@@ -71,6 +72,7 @@
 import org.apache.phoenix.monitoring.PhoenixTableMetric;
 import org.apache.phoenix.monitoring.TableMetricsManager;
 import org.apache.phoenix.monitoring.connectionqueryservice.ConnectionQueryServicesMetricsManager;
+import org.apache.phoenix.query.ConnectionQueryServices;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.AmbiguousColumnException;
@@ -539,6 +541,18 @@ public static PTable getTable(Connection conn, @Nullable String tenantId, String
         return pconn.getTable(tenantId, fullTableName, timestamp);
     }
 
+    /**
+     * Returns the most recent PTable fetched from the server without updating the CQSI cache.
+     */
+    public static PTable getTableFromServerNoCache(Connection conn, byte[] schemaName,
+                                                   byte[] tableName) throws SQLException {
+        if (schemaName == null) {
+            schemaName = ByteUtil.EMPTY_BYTE_ARRAY;
+        }
+        PhoenixConnection pconn = conn.unwrap(PhoenixConnection.class);
+        return pconn.getTableFromServerNoCache(schemaName, tableName);
+    }
+
     /**
      * Get list of ColumnInfos that contain Column Name and its associated PDataType for an import.
      * The supplied list of columns can be null -- if it is non-null, it represents a user-supplied