Repository: phoenix Updated Branches: refs/heads/txn a22b4c073 -> 00976e81b
Update pom dependencies to include tephra Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/00976e81 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/00976e81 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/00976e81 Branch: refs/heads/txn Commit: 00976e81be1e543e9055b996ad76c09bd8f39b12 Parents: a22b4c0 Author: Thomas D'Silva <twdsi...@gmail.com> Authored: Mon Mar 9 21:33:27 2015 -0700 Committer: Thomas D'Silva <twdsi...@gmail.com> Committed: Mon Mar 9 21:33:27 2015 -0700 ---------------------------------------------------------------------- phoenix-core/pom.xml | 17 +++++++++++++++++ .../org/apache/phoenix/jdbc/PhoenixConnection.java | 14 ++++++++++++++ pom.xml | 16 ---------------- 3 files changed, 31 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/00976e81/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 26cc666..14bd033 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -220,6 +220,23 @@ </build> <dependencies> + <!-- Transaction dependencies --> + <dependency> + <groupId>co.cask.tephra</groupId> + <artifactId>tephra-api</artifactId> + <version>0.3.5-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>co.cask.tephra</groupId> + <artifactId>tephra-core</artifactId> + <version>0.3.5-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>co.cask.tephra</groupId> + <artifactId>tephra-hbase-compat-0.98</artifactId> + <version>0.3.5-SNAPSHOT</version> + </dependency> + <!-- Make sure we have all the antlr dependencies --> <dependency> <groupId>org.antlr</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/00976e81/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java index 630c8f5..3f6b1b2 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java @@ -95,6 +95,9 @@ import org.apache.phoenix.util.SQLCloseables; import org.cloudera.htrace.Sampler; import org.cloudera.htrace.TraceScope; +//import co.cask.tephra.TransactionContext; +//import co.cask.tephra.TransactionFailureException; + import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; @@ -123,6 +126,7 @@ public class PhoenixConnection implements Connection, org.apache.phoenix.jdbc.Jd private List<SQLCloseable> statements = new ArrayList<SQLCloseable>(); private final Map<PDataType<?>, Format> formatters = new HashMap<>(); private final MutationState mutationState; +// private TransactionContext transactionContext; private final int mutateBatchSize; private final Long scn; private boolean isAutoCommit = false; @@ -432,6 +436,11 @@ public class PhoenixConnection implements Connection, org.apache.phoenix.jdbc.Jd @Override public Void call() throws SQLException { mutationState.commit(); +// try { +// transactionContext.finish(); +// } catch (TransactionFailureException e) { +// throw new SQLException(e); +// } return null; } }, Tracing.withTracing(this, "committing mutations")); @@ -635,6 +644,11 @@ public class PhoenixConnection implements Connection, org.apache.phoenix.jdbc.Jd @Override public void rollback() throws SQLException { mutationState.rollback(this); +// try { +// transactionContext.abort(); +// } catch (TransactionFailureException e) { +// throw new SQLException(e); +// } } @Override http://git-wip-us.apache.org/repos/asf/phoenix/blob/00976e81/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 67092ee..6dbe125 100644 --- a/pom.xml +++ b/pom.xml @@ -400,22 +400,6 @@ <dependencyManagement> <dependencies> - <!-- Transaction dependencies --> - <dependency> - <groupId>co.cask.tephra</groupId> - <artifactId>tephra-api</artifactId> - <version>0.3.5-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>co.cask.tephra</groupId> - <artifactId>tephra-core</artifactId> - <version>0.3.5-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>co.cask.tephra</groupId> - <artifactId>tephra-hbase-compat-0.98</artifactId> - <version>0.3.5-SNAPSHOT</version> - </dependency> <!-- Intra-project dependencies --> <dependency> <groupId>org.apache.phoenix</groupId>
