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 2016/05/20 05:30:27 UTC
phoenix git commit: PHOENIX-2906 Use org.apache.tephra instead of
co.cask.tephra
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.1 238b2bd83 -> ff13a9e81
PHOENIX-2906 Use org.apache.tephra instead of co.cask.tephra
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ff13a9e8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ff13a9e8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ff13a9e8
Branch: refs/heads/4.x-HBase-1.1
Commit: ff13a9e814a78e27fd28c062feb25afa9b6fd299
Parents: 238b2bd
Author: James Taylor <ja...@apache.org>
Authored: Thu May 19 22:33:06 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Thu May 19 22:33:06 2016 -0700
----------------------------------------------------------------------
bin/tephra | 2 +-
phoenix-assembly/src/build/client-spark.xml | 2 +-
phoenix-assembly/src/build/client.xml | 2 +-
phoenix-assembly/src/build/server.xml | 2 +-
phoenix-core/pom.xml | 8 +++----
.../org/apache/phoenix/tx/TransactionIT.java | 8 +++----
.../org/apache/phoenix/tx/TxCheckpointIT.java | 2 +-
.../phoenix/cache/IndexMetaDataCache.java | 2 +-
.../coprocessor/BaseScannerRegionObserver.java | 2 +-
.../PhoenixTransactionalProcessor.java | 2 +-
.../phoenix/coprocessor/ScanRegionObserver.java | 2 +-
.../UngroupedAggregateRegionObserver.java | 2 +-
.../apache/phoenix/execute/MutationState.java | 23 ++++++++++----------
.../apache/phoenix/index/IndexMaintainer.java | 2 +-
.../index/IndexMetaDataCacheFactory.java | 2 +-
.../phoenix/index/PhoenixIndexMetaData.java | 2 +-
.../index/PhoenixTransactionalIndexer.java | 9 ++++----
.../apache/phoenix/jdbc/PhoenixConnection.java | 2 +-
.../phoenix/query/ConnectionQueryServices.java | 2 +-
.../query/ConnectionQueryServicesImpl.java | 10 ++++-----
.../query/ConnectionlessQueryServicesImpl.java | 6 ++---
.../query/DelegateConnectionQueryServices.java | 2 +-
.../apache/phoenix/schema/MetaDataClient.java | 2 +-
.../org/apache/phoenix/schema/PTableImpl.java | 2 +-
.../java/org/apache/phoenix/util/IndexUtil.java | 2 +-
.../org/apache/phoenix/util/PhoenixRuntime.java | 2 +-
.../apache/phoenix/util/TransactionUtil.java | 9 ++++----
.../java/org/apache/phoenix/query/BaseTest.java | 10 ++++-----
phoenix-flume/pom.xml | 2 +-
phoenix-pherf/pom.xml | 2 +-
phoenix-pig/pom.xml | 2 +-
phoenix-server/pom.xml | 2 +-
phoenix-spark/pom.xml | 2 +-
pom.xml | 14 +++++++-----
34 files changed, 74 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/bin/tephra
----------------------------------------------------------------------
diff --git a/bin/tephra b/bin/tephra
index 54fe301..e71ffd7 100755
--- a/bin/tephra
+++ b/bin/tephra
@@ -167,7 +167,7 @@ start() {
echo "`date` Starting $APP service on `hostname`" >> $loglog
echo "`ulimit -a`" >> $loglog 2>&1
- export MAIN_CLASS="co.cask.tephra.TransactionServiceMain"
+ export MAIN_CLASS="org.apache.tephra.TransactionServiceMain"
echo "Running class $MAIN_CLASS"
echo "Command: " "$JAVA" $OPTS -cp $CLASSPATH $JAVA_HEAPMAX $MAIN_CLASS >>$loglog
nohup nice -n $NICENESS "$JAVA" $OPTS -cp $CLASSPATH $JAVA_HEAPMAX ${MAIN_CLASS} </dev/null >>$loglog 2>&1 &
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-assembly/src/build/client-spark.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/client-spark.xml b/phoenix-assembly/src/build/client-spark.xml
index 10b9163..93d02ff 100644
--- a/phoenix-assembly/src/build/client-spark.xml
+++ b/phoenix-assembly/src/build/client-spark.xml
@@ -47,7 +47,7 @@
<include>org.apache.htrace:htrace-core</include>
<include>io.netty:netty-all</include>
<include>commons-codec:commons-codec</include>
- <include>co.cask.tephra:tephra*</include>
+ <include>org.apache.tephra:tephra*</include>
<include>org.apache.twill:twill*</include>
<include>com.google.code.gson:gson*</include>
<!-- We use a newer version of guava than HBase - this might be an issue? -->
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-assembly/src/build/client.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/client.xml b/phoenix-assembly/src/build/client.xml
index c1fe861..f9c2415 100644
--- a/phoenix-assembly/src/build/client.xml
+++ b/phoenix-assembly/src/build/client.xml
@@ -59,7 +59,7 @@
<include>org.apache.htrace:htrace-core</include>
<include>io.netty:netty-all</include>
<include>commons-codec:commons-codec</include>
- <include>co.cask.tephra:tephra*</include>
+ <include>org.apache.tephra:tephra*</include>
<include>org.apache.twill:twill*</include>
<include>org.apache.thrift:*</include>
<include>com.google.code.gson:gson*</include>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-assembly/src/build/server.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/server.xml b/phoenix-assembly/src/build/server.xml
index e8f9bfb..fe784e9 100644
--- a/phoenix-assembly/src/build/server.xml
+++ b/phoenix-assembly/src/build/server.xml
@@ -37,7 +37,7 @@
<include>org.apache.phoenix:phoenix-core</include>
<include>org.iq80.snappy:snappy</include>
<include>org.antlr:antlr*</include>
- <include>co.cask.tephra:tephra*</include>
+ <include>org.apache.tephra:tephra*</include>
<include>com.google.code.gson:gson</include>
<include>org.jruby.joni:joni</include>
<include>org.jruby.jcodings:jcodings</include>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 30a4875..e183d11 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -224,21 +224,21 @@
<dependencies>
<!-- Transaction dependencies -->
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-api</artifactId>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-hbase-compat-1.1</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index a06ca85..6628d14 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -67,10 +67,10 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import co.cask.tephra.TransactionContext;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase11.TransactionAwareHTable;
+import org.apache.tephra.TransactionContext;
+import org.apache.tephra.TransactionSystemClient;
+import org.apache.tephra.TxConstants;
+import org.apache.tephra.hbase.TransactionAwareHTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
index 11b587a..df9a195 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
@@ -48,7 +48,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import co.cask.tephra.Transaction.VisibilityLevel;
+import org.apache.tephra.Transaction.VisibilityLevel;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/cache/IndexMetaDataCache.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/IndexMetaDataCache.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/IndexMetaDataCache.java
index 359e08f..d22993c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/IndexMetaDataCache.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/IndexMetaDataCache.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import co.cask.tephra.Transaction;
+import org.apache.tephra.Transaction;
import org.apache.phoenix.index.IndexMaintainer;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index 4c6b960..fa4343a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -62,7 +62,7 @@ import org.apache.phoenix.util.ServerUtil;
import com.google.common.collect.ImmutableList;
-import co.cask.tephra.Transaction;
+import org.apache.tephra.Transaction;
abstract public class BaseScannerRegionObserver extends BaseRegionObserver {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
index f67b6f1..8693681 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
@@ -17,7 +17,7 @@
*/
package org.apache.phoenix.coprocessor;
-import co.cask.tephra.hbase11.coprocessor.TransactionProcessor;
+import org.apache.tephra.hbase.coprocessor.TransactionProcessor;
public class PhoenixTransactionalProcessor extends DelegateRegionObserver {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
index 5feb3e9..35be54d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
@@ -68,7 +68,7 @@ import org.apache.phoenix.util.ServerUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import co.cask.tephra.Transaction;
+import org.apache.tephra.Transaction;
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 8616b6b..f817772 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -115,7 +115,7 @@ import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import co.cask.tephra.TxConstants;
+import org.apache.tephra.TxConstants;
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 6095089..57d9b68 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -37,18 +37,6 @@ import java.util.concurrent.TimeoutException;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.Immutable;
-import co.cask.tephra.Transaction;
-import co.cask.tephra.Transaction.VisibilityLevel;
-import co.cask.tephra.TransactionAware;
-import co.cask.tephra.TransactionCodec;
-import co.cask.tephra.TransactionConflictException;
-import co.cask.tephra.TransactionContext;
-import co.cask.tephra.TransactionFailureException;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.hbase11.TransactionAwareHTable;
-import co.cask.tephra.visibility.FenceWait;
-import co.cask.tephra.visibility.VisibilityFence;
-
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.HTableInterface;
@@ -101,6 +89,17 @@ import org.apache.phoenix.util.SQLCloseable;
import org.apache.phoenix.util.SQLCloseables;
import org.apache.phoenix.util.ServerUtil;
import org.apache.phoenix.util.TransactionUtil;
+import org.apache.tephra.Transaction;
+import org.apache.tephra.Transaction.VisibilityLevel;
+import org.apache.tephra.TransactionAware;
+import org.apache.tephra.TransactionCodec;
+import org.apache.tephra.TransactionConflictException;
+import org.apache.tephra.TransactionContext;
+import org.apache.tephra.TransactionFailureException;
+import org.apache.tephra.TransactionSystemClient;
+import org.apache.tephra.hbase.TransactionAwareHTable;
+import org.apache.tephra.visibility.FenceWait;
+import org.apache.tephra.visibility.VisibilityFence;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
index 57616cb..1725b11 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
@@ -95,7 +95,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import co.cask.tephra.TxConstants;
+import org.apache.tephra.TxConstants;
/**
*
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMetaDataCacheFactory.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMetaDataCacheFactory.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMetaDataCacheFactory.java
index 7ced2f8..56849fe 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMetaDataCacheFactory.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMetaDataCacheFactory.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
-import co.cask.tephra.Transaction;
+import org.apache.tephra.Transaction;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.phoenix.cache.IndexMetaDataCache;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java
index 4fab674..7a67b9c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java
@@ -37,7 +37,7 @@ import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.ServerUtil;
-import co.cask.tephra.Transaction;
+import org.apache.tephra.Transaction;
public class PhoenixIndexMetaData implements IndexMetaData {
private final Map<String, byte[]> attributes;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java
index d42e468..5d8879c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java
@@ -72,11 +72,10 @@ import org.apache.phoenix.trace.util.NullSpan;
import org.apache.phoenix.util.ScanUtil;
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.ServerUtil;
-
-import co.cask.tephra.Transaction;
-import co.cask.tephra.Transaction.VisibilityLevel;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase11.TransactionAwareHTable;
+import org.apache.tephra.Transaction;
+import org.apache.tephra.Transaction.VisibilityLevel;
+import org.apache.tephra.TxConstants;
+import org.apache.tephra.hbase.TransactionAwareHTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/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 160b99c..fd6aa12 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
@@ -113,7 +113,7 @@ import org.apache.phoenix.util.SQLCloseable;
import org.apache.phoenix.util.SQLCloseables;
import org.apache.phoenix.util.SchemaUtil;
-import co.cask.tephra.TransactionContext;
+import org.apache.tephra.TransactionContext;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java
index 44e9322..408b144 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServices.java
@@ -44,7 +44,7 @@ import org.apache.phoenix.schema.SequenceAllocation;
import org.apache.phoenix.schema.SequenceKey;
import org.apache.phoenix.schema.stats.PTableStats;
-import co.cask.tephra.TransactionSystemClient;
+import org.apache.tephra.TransactionSystemClient;
public interface ConnectionQueryServices extends QueryServices, MetaDataMutated {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/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 b8d9762..f593dd0 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
@@ -196,11 +196,11 @@ 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.zookeeper.TephraZKClientService;
+import org.apache.tephra.TransactionSystemClient;
+import org.apache.tephra.TxConstants;
+import org.apache.tephra.distributed.PooledClientProvider;
+import org.apache.tephra.distributed.TransactionServiceClient;
+import org.apache.tephra.zookeeper.TephraZKClientService;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
index ab70300..b92c358 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionlessQueryServicesImpl.java
@@ -88,9 +88,9 @@ import org.apache.phoenix.util.SequenceUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import co.cask.tephra.TransactionManager;
-import co.cask.tephra.TransactionSystemClient;
-import co.cask.tephra.inmemory.InMemoryTxSystemClient;
+import org.apache.tephra.TransactionManager;
+import org.apache.tephra.TransactionSystemClient;
+import org.apache.tephra.inmemory.InMemoryTxSystemClient;
/**
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
index f3ee3c1..bc6148b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/DelegateConnectionQueryServices.java
@@ -47,7 +47,7 @@ import org.apache.phoenix.schema.SequenceAllocation;
import org.apache.phoenix.schema.SequenceKey;
import org.apache.phoenix.schema.stats.PTableStats;
-import co.cask.tephra.TransactionSystemClient;
+import org.apache.tephra.TransactionSystemClient;
public class DelegateConnectionQueryServices extends DelegateQueryServices implements ConnectionQueryServices {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/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 2658174..34cedce 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
@@ -214,7 +214,7 @@ import org.apache.phoenix.util.UpgradeUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import co.cask.tephra.TxConstants;
+import org.apache.tephra.TxConstants;
import com.google.common.base.Objects;
import com.google.common.collect.Iterators;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index bd23ab8..acb61a3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -77,7 +77,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.sun.istack.NotNull;
-import co.cask.tephra.TxConstants;
+import org.apache.tephra.TxConstants;
/**
*
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
index 0b1e8a0..1f87774 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
@@ -89,7 +89,7 @@ import org.apache.phoenix.schema.types.PVarchar;
import com.google.common.collect.Lists;
-import co.cask.tephra.TxConstants;
+import org.apache.tephra.TxConstants;
public class IndexUtil {
public static final String INDEX_COLUMN_NAME_SEP = ":";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index c5c04b6..a8981a4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -91,7 +91,7 @@ import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-import co.cask.tephra.util.TxUtils;
+import org.apache.tephra.util.TxUtils;
/**
*
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java
index 041c12e..1dcf9d3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java
@@ -19,11 +19,6 @@ package org.apache.phoenix.util;
import java.sql.SQLException;
-import co.cask.tephra.TransactionConflictException;
-import co.cask.tephra.TransactionFailureException;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.hbase11.TransactionAwareHTable;
-
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.exception.SQLExceptionCode;
@@ -31,6 +26,10 @@ import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.execute.MutationState;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.schema.PTable;
+import org.apache.tephra.TransactionConflictException;
+import org.apache.tephra.TransactionFailureException;
+import org.apache.tephra.TxConstants;
+import org.apache.tephra.hbase.TransactionAwareHTable;
public class TransactionUtil {
private TransactionUtil() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/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 1f49cbe..294c82f 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
@@ -179,11 +179,11 @@ import com.google.common.collect.Sets;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.util.Providers;
-import co.cask.tephra.TransactionManager;
-import co.cask.tephra.TxConstants;
-import co.cask.tephra.distributed.TransactionService;
-import co.cask.tephra.metrics.TxMetricsCollector;
-import co.cask.tephra.persist.InMemoryTransactionStateStorage;
+import org.apache.tephra.TransactionManager;
+import org.apache.tephra.TxConstants;
+import org.apache.tephra.distributed.TransactionService;
+import org.apache.tephra.metrics.TxMetricsCollector;
+import org.apache.tephra.persist.InMemoryTransactionStateStorage;
/**
*
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-flume/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml
index 73a10da..bf84f10 100644
--- a/phoenix-flume/pom.xml
+++ b/phoenix-flume/pom.xml
@@ -161,7 +161,7 @@
<artifactId>hadoop-minicluster</artifactId>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-pherf/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 3daf001..d9dc064 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -100,7 +100,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-pig/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml
index c5f3cf0..16434fe 100644
--- a/phoenix-pig/pom.xml
+++ b/phoenix-pig/pom.xml
@@ -161,7 +161,7 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-server/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index eda1653..b1dcad5 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -113,7 +113,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/phoenix-spark/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 219798b..48c9896 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -476,7 +476,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ff13a9e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32d3101..aad318b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,10 @@
<repositories>
<repository>
+ <id>apache tephra staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapachetephra-1001</url>
+ </repository>
+ <repository>
<id>apache release</id>
<url>https://repository.apache.org/content/repositories/releases/</url>
</repository>
@@ -95,7 +99,7 @@
<joni.version>2.1.2</joni.version>
<avatica.version>1.7.1</avatica.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
- <tephra.version>0.7.0</tephra.version>
+ <tephra.version>0.8.0-incubating</tephra.version>
<spark.version>1.5.2</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
@@ -680,12 +684,12 @@
<!-- Transaction dependencies -->
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-api</artifactId>
<version>${tephra.version}</version>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<version>${tephra.version}</version>
<exclusions>
@@ -700,7 +704,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-core</artifactId>
<type>test-jar</type>
<version>${tephra.version}</version>
@@ -717,7 +721,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>co.cask.tephra</groupId>
+ <groupId>org.apache.tephra</groupId>
<artifactId>tephra-hbase-compat-1.1</artifactId>
<version>${tephra.version}</version>
</dependency>