phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-2616 Indexes over immutable tables not marked as immutable
Date Thu, 21 Jan 2016 05:45:50 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 51bf3139c -> 930644b0a


PHOENIX-2616 Indexes over immutable tables not marked as immutable


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/930644b0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/930644b0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/930644b0

Branch: refs/heads/4.x-HBase-1.0
Commit: 930644b0a9fc909ea4040e0de0ded478841bd6ae
Parents: 51bf313
Author: James Taylor <jtaylor@salesforce.com>
Authored: Wed Jan 20 21:40:00 2016 -0800
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Wed Jan 20 21:45:35 2016 -0800

----------------------------------------------------------------------
 .../phoenix/query/ConnectionQueryServicesImpl.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/930644b0/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 ec3aa30..226320a 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
@@ -187,12 +187,6 @@ import org.apache.twill.zookeeper.ZKClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.distributed.PooledClientProvider;
-import co.cask.tephra.distributed.TransactionServiceClient;
-import co.cask.tephra.hbase10.coprocessor.TransactionProcessor;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Throwables;
@@ -205,6 +199,12 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
+import co.cask.tephra.TransactionSystemClient;
+import co.cask.tephra.TxConstants;
+import co.cask.tephra.distributed.PooledClientProvider;
+import co.cask.tephra.distributed.TransactionServiceClient;
+import co.cask.tephra.hbase10.coprocessor.TransactionProcessor;
+
 
 public class ConnectionQueryServicesImpl extends DelegateQueryServices implements ConnectionQueryServices
{
     private static final Logger logger = LoggerFactory.getLogger(ConnectionQueryServicesImpl.class);
@@ -2259,6 +2259,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
implement
         SQLException sqlE = null;
         try {
             metaConnection.createStatement().executeUpdate("ALTER TABLE " + tableName + "
ADD " + (addIfNotExists ? " IF NOT EXISTS " : "") + columns );
+        } catch (NewerTableAlreadyExistsException e) {
+            logger.warn("Table already modified at this timestamp, so assuming add of these
columns already done: " + columns);
         } catch (SQLException e) {
             logger.warn("Add column failed due to:" + e);
             sqlE = e;
@@ -2566,7 +2568,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
implement
                     ")\n" + 
                     "WHERE A.COLUMN_FAMILY IS NULL AND\n" + 
                     " B.COLUMN_FAMILY IS NOT NULL AND\n" + 
-                    " A.IMMUTABLE_ROWS = TRUE;");
+                    " A.IMMUTABLE_ROWS = TRUE");
         } finally {
             metaConnection.setAutoCommit(autoCommit);
         }


Mime
View raw message