You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/05/05 00:32:31 UTC
phoenix git commit: Update tephra version to 0.4.2-SNAPSHOT,
use txn provider in BaseTest
Repository: phoenix
Updated Branches:
refs/heads/txn 929ea1cb2 -> f90ee1a5c
Update tephra version to 0.4.2-SNAPSHOT, use txn provider in BaseTest
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f90ee1a5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f90ee1a5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f90ee1a5
Branch: refs/heads/txn
Commit: f90ee1a5c113a37ee174c708194fcb17a69607cc
Parents: 929ea1c
Author: Thomas <td...@salesforce.com>
Authored: Mon May 4 15:32:10 2015 -0700
Committer: Thomas <td...@salesforce.com>
Committed: Mon May 4 15:32:10 2015 -0700
----------------------------------------------------------------------
phoenix-core/pom.xml | 8 ++++----
.../src/test/java/org/apache/phoenix/query/BaseTest.java | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f90ee1a5/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 2ba92b6..3fcf339 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -224,24 +224,24 @@
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-api</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-core</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-hbase-compat-0.98</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2-SNAPSHOT</version>
</dependency>
<!-- Make sure we have all the antlr dependencies -->
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f90ee1a5/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index ed8c29b..3d6cb0c 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -160,6 +160,7 @@ import co.cask.tephra.persist.InMemoryTransactionStateStorage;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import com.google.inject.util.Providers;
/**
*
@@ -518,7 +519,7 @@ public abstract class BaseTest {
DiscoveryService discovery = new ZKDiscoveryService(zkClient);
TransactionManager txManager = new TransactionManager(config, new InMemoryTransactionStateStorage(), new TxMetricsCollector());
- txService = new TransactionService(config, zkClient, discovery, txManager);
+ txService = new TransactionService(config, zkClient, discovery, Providers.of(txManager));
txService.startAndWait();
}