phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: Ensure TransactionProcessor added to index table
Date Wed, 13 May 2015 14:27:31 GMT
Repository: phoenix
Updated Branches:
  refs/heads/txn 631450e65 -> 16dd8ca15


Ensure TransactionProcessor added to index table


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

Branch: refs/heads/txn
Commit: 16dd8ca15f95cd3fc2439fdde183f2a896fc3532
Parents: 631450e
Author: James Taylor <jtaylor@salesforce.com>
Authored: Wed May 13 07:27:20 2015 -0700
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Wed May 13 07:27:20 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/phoenix/schema/MetaDataClient.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/16dd8ca1/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 f7d5af5..a224ee7 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
@@ -1352,11 +1352,12 @@ public class MetaDataClient {
                     transactional = connection.getQueryServices().getProps().getBoolean(
                                     QueryServices.DEFAULT_TRANSACTIONAL_ATTRIB,
                                     QueryServicesOptions.DEFAULT_TRANSACTIONAL);
-                    tableProps.put(PhoenixDatabaseMetaData.TRANSACTIONAL, Boolean.valueOf(transactional));
                 } else {
                     transactional = transactionalProp;
                 }
             }
+            tableProps.put(PhoenixDatabaseMetaData.TRANSACTIONAL, Boolean.valueOf(transactional));
+            
             if (transactional) { // FIXME: remove once Tephra handles storing multiple versions
of a cell value, 
             	// and allows ignoring empty key values for an operation
             	if (Boolean.FALSE.equals(storeNullsProp)) {


Mime
View raw message