Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 85D3717DBB for ; Tue, 28 Oct 2014 22:58:09 +0000 (UTC) Received: (qmail 20508 invoked by uid 500); 28 Oct 2014 22:58:09 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 20472 invoked by uid 500); 28 Oct 2014 22:58:09 -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 20463 invoked by uid 99); 28 Oct 2014 22:58:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2014 22:58:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 13B40998D77; Tue, 28 Oct 2014 22:58:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Message-Id: <0c2b6fee9f3b49baa97c7477d124921e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Rename method for consistency Date: Tue, 28 Oct 2014 22:58:09 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.0 668d6ee48 -> 6477e0fd3 Rename method for consistency Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6477e0fd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6477e0fd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6477e0fd Branch: refs/heads/4.0 Commit: 6477e0fd3de14a1f1c351ef2a576ff70b6c7ff5b Parents: 668d6ee Author: James Taylor Authored: Tue Oct 28 15:58:01 2014 -0700 Committer: James Taylor Committed: Tue Oct 28 15:58:01 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/ConnectionQueryServices.java | 2 +- .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +- .../apache/phoenix/query/ConnectionlessQueryServicesImpl.java | 2 +- .../apache/phoenix/query/DelegateConnectionQueryServices.java | 4 ++-- .../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6477e0fd/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java index 8af9310..8826b48 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java @@ -104,7 +104,7 @@ public interface ConnectionQueryServices extends QueryServices, MetaDataMutated public boolean supportsFeature(Feature feature); public String getUserName(); - public void incrementTableTimeStamp(final byte[] tenantId, final byte[] schemaName, final byte[] tableName, long clientTS) throws SQLException; + public void clearTableFromCache(final byte[] tenantId, final byte[] schemaName, final byte[] tableName, long clientTS) throws SQLException; public PTableStats getTableStats(byte[] physicalName, long clientTimeStamp) throws SQLException; http://git-wip-us.apache.org/repos/asf/phoenix/blob/6477e0fd/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 4f3a346..21208b5 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -1887,7 +1887,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement } @Override - public void incrementTableTimeStamp(final byte[] tenantId, final byte[] schemaName, final byte[] tableName, + public void clearTableFromCache(final byte[] tenantId, final byte[] schemaName, final byte[] tableName, final long clientTS) throws SQLException { // clear the meta data cache for the table here try { http://git-wip-us.apache.org/repos/asf/phoenix/blob/6477e0fd/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java index 386050c..ec10d5f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java @@ -231,7 +231,7 @@ public class ConnectionlessQueryServicesImpl extends DelegateQueryServices imple } @Override - public void incrementTableTimeStamp(byte[] tenantId, byte[] schemaName, byte[] tableName, long clientTS) + public void clearTableFromCache(byte[] tenantId, byte[] schemaName, byte[] tableName, long clientTS) throws SQLException {} // TODO: share this with ConnectionQueryServicesImpl @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/6477e0fd/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java index defad5b..ae0b689 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java @@ -229,9 +229,9 @@ public class DelegateConnectionQueryServices extends DelegateQueryServices imple } @Override - public void incrementTableTimeStamp(byte[] tenantId, byte[] schemaName, byte[] tableName, long clientTS) + public void clearTableFromCache(byte[] tenantId, byte[] schemaName, byte[] tableName, long clientTS) throws SQLException { - getDelegate().incrementTableTimeStamp(tenantId, schemaName, tableName, clientTS); + getDelegate().clearTableFromCache(tenantId, schemaName, tableName, clientTS); } @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/6477e0fd/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 b763bbb..5892d14 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 @@ -640,7 +640,7 @@ public class MetaDataClient { // We need to update the stats table so that client will pull the new one with // the updated stats. - connection.getQueryServices().incrementTableTimeStamp(tenantIdBytes, + connection.getQueryServices().clearTableFromCache(tenantIdBytes, Bytes.toBytes(SchemaUtil.getSchemaNameFromFullName(physicalName.getString())), Bytes.toBytes(SchemaUtil.getTableNameFromFullName(physicalName.getString())), clientTimeStamp); return rowCount;