From commits-return-21256-archive-asf-public=cust-asf.ponee.io@phoenix.apache.org Mon May 14 19:12:58 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 571D9180627 for ; Mon, 14 May 2018 19:12:58 +0200 (CEST) Received: (qmail 67026 invoked by uid 500); 14 May 2018 17:12:57 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 67017 invoked by uid 99); 14 May 2018 17:12:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2018 17:12:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55580E96A8; Mon, 14 May 2018 17:12:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vincentpoon@apache.org To: commits@phoenix.apache.org Message-Id: <8e9b1cc0ff4a458abc6b6e8398f77419@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-4726 save index build timestamp -- for SYNC case only Date: Mon, 14 May 2018 17:12:57 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 829f3fcc8 -> 1907f74a6 PHOENIX-4726 save index build timestamp -- for SYNC case only Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1907f74a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1907f74a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1907f74a Branch: refs/heads/4.x-HBase-0.98 Commit: 1907f74a61542d993245e9a9849dc2d9b148f6e1 Parents: 829f3fc Author: Vincent Poon Authored: Mon May 14 10:10:32 2018 -0700 Committer: Vincent Poon Committed: Mon May 14 10:12:52 2018 -0700 ---------------------------------------------------------------------- .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 1 + .../org/apache/phoenix/schema/MetaDataClient.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1907f74a/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 29673b5..b70a5e0 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 @@ -316,6 +316,7 @@ 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/1907f74a/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 e69dac7..2548213 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 @@ -74,6 +74,7 @@ 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; @@ -258,6 +259,14 @@ 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 + "," + @@ -2673,6 +2682,14 @@ 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();