Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 db042d360 -> b583630ca
Revert "PHOENIX-4726 save index build timestamp -- for SYNC case only" This reverts commit db042d360f1f69d56bd18a78c6852c0ab423162c. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/37a33e84 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/37a33e84 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/37a33e84 Branch: refs/heads/5.x-HBase-2.0 Commit: 37a33e844b936902e890c03dfa1097efeea39150 Parents: db042d3 Author: Vincent Poon <[email protected]> Authored: Mon May 14 10:24:27 2018 -0700 Committer: Vincent Poon <[email protected]> Committed: Mon May 14 10:24:27 2018 -0700 ---------------------------------------------------------------------- .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 1 - .../org/apache/phoenix/schema/MetaDataClient.java | 17 ----------------- 2 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/37a33e84/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java index 265485f..68f94c1 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java @@ -317,7 +317,6 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData { public static final String ASYNC_CREATED_DATE = "ASYNC_CREATED_DATE"; public static final String SEQUENCE_TABLE_TYPE = SYSTEM_SEQUENCE_TABLE; - public static final String SYNC_INDEX_CREATED_DATE = "SYNC_INDEX_CREATED_DATE"; public static final String SYSTEM_MUTEX_TABLE_NAME = "MUTEX"; public static final String SYSTEM_MUTEX_NAME = SchemaUtil.getTableName(QueryConstants.SYSTEM_SCHEMA_NAME, SYSTEM_MUTEX_TABLE_NAME); public static final TableName SYSTEM_MUTEX_HBASE_TABLE_NAME = TableName.valueOf(SYSTEM_MUTEX_NAME); http://git-wip-us.apache.org/repos/asf/phoenix/blob/37a33e84/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 47f628f..4997af9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -73,7 +73,6 @@ import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.RETURN_TYPE; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SALT_BUCKETS; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SORT_ORDER; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.STORE_NULLS; -import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYNC_INDEX_CREATED_DATE; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE; import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_FUNCTION_TABLE; @@ -266,14 +265,6 @@ public class MetaDataClient { TABLE_NAME + "," + ASYNC_CREATED_DATE + " " + PDate.INSTANCE.getSqlTypeName() + ") VALUES (?, ?, ?, ?)"; - - private static final String SET_INDEX_SYNC_CREATED_DATE = - "UPSERT INTO " + SYSTEM_CATALOG_SCHEMA + ".\"" + SYSTEM_CATALOG_TABLE + "\"( " + - TENANT_ID + "," + - TABLE_SCHEM + "," + - TABLE_NAME + "," + - SYNC_INDEX_CREATED_DATE + " " + PDate.INSTANCE.getSqlTypeName() + - ") VALUES (?, ?, ?, ?)"; private static final String CREATE_TABLE = "UPSERT INTO " + SYSTEM_CATALOG_SCHEMA + ".\"" + SYSTEM_CATALOG_TABLE + "\"( " + TENANT_ID + "," + @@ -2689,14 +2680,6 @@ public class MetaDataClient { setAsync.setString(3, tableName); setAsync.setDate(4, asyncCreatedDate); setAsync.execute(); - } else { - Date syncCreatedDate = new Date(EnvironmentEdgeManager.currentTimeMillis()); - PreparedStatement setSync = connection.prepareStatement(SET_INDEX_SYNC_CREATED_DATE); - setSync.setString(1, tenantIdStr); - setSync.setString(2, schemaName); - setSync.setString(3, tableName); - setSync.setDate(4, syncCreatedDate); - setSync.execute(); } tableMetaData.addAll(connection.getMutationState().toMutations(timestamp).next().getSecond()); connection.rollback();
