You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2018/06/18 06:48:06 UTC
phoenix git commit: Fix ALTER TABLE ... SET TRANSACTION_PROVIDER and
remove dumpTable calls
Repository: phoenix
Updated Branches:
refs/heads/omid2 54edd2fab -> e62c6fc0e
Fix ALTER TABLE ... SET TRANSACTION_PROVIDER and remove dumpTable calls
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e62c6fc0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e62c6fc0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e62c6fc0
Branch: refs/heads/omid2
Commit: e62c6fc0ec3f5cdd859808f80fd2a52abefa5c46
Parents: 54edd2f
Author: James Taylor <ja...@apache.org>
Authored: Mon Jun 18 08:47:53 2018 +0200
Committer: James Taylor <ja...@apache.org>
Committed: Mon Jun 18 08:47:53 2018 +0200
----------------------------------------------------------------------
.../org/apache/phoenix/end2end/index/MutableIndexFailureIT.java | 2 --
.../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62c6fc0/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
index c99a685..7efe17e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexFailureIT.java
@@ -423,7 +423,6 @@ public class MutableIndexFailureIT extends BaseTest {
String explainPlan = QueryUtil.getExplainPlan(conn.createStatement().executeQuery("EXPLAIN " + query));
assertTrue(explainPlan, explainPlan.contains(expectedPlan));
if (transactional) { // failed commit does not get retried
- TestUtil.dumpTable(conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(fullIndexName)));
assertTrue(rs.next());
assertEquals("a", rs.getString(1));
assertEquals("x", rs.getString(2));
@@ -470,7 +469,6 @@ public class MutableIndexFailureIT extends BaseTest {
stmt = conn.prepareStatement("DELETE FROM " + fullTableName + " WHERE k=?");
stmt.setString(1, "b");
stmt.execute();
- TestUtil.dumpTable(conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes(fullIndexName)));
// Set to fail after the DELETE, since transactional tables will write
// uncommitted data when the DELETE is executed.
FailingRegionObserver.FAIL_WRITE = true;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e62c6fc0/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 a8a8dd7..c673a63 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
@@ -2114,7 +2114,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
willBeTransactional = isOrWillBeTransactional = true;
tableProps.put(PhoenixTransactionContext.READ_NON_TX_DATA, propValue);
} else if (propName.equals(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER) && propValue != null) {
- txProvider = (Provider)propValue;
+ txProvider = (Provider)TableProperty.TRANSACTION_PROVIDER.getValue(propValue);
tableProps.put(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER, tableProp.getValue(propValue));
}
} else {