Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 74a7fc61d -> 2c3b2dc02
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/2c3b2dc0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2c3b2dc0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2c3b2dc0 Branch: refs/heads/4.x-HBase-1.0 Commit: 2c3b2dc02799f71ba788c2aa0d1ce81e1490e9ed Parents: 74a7fc6 Author: James Taylor <[email protected]> Authored: Thu May 19 22:33:06 2016 -0700 Committer: James Taylor <[email protected]> Committed: Thu May 19 22:56:24 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 | 11 +++++----- .../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 | 22 ++++++++++---------- .../apache/phoenix/index/IndexMaintainer.java | 2 +- .../index/IndexMetaDataCacheFactory.java | 2 +- .../phoenix/index/PhoenixIndexMetaData.java | 2 +- .../index/PhoenixTransactionalIndexer.java | 12 ++++------- .../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 | 8 +++---- .../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, 75 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 1267767..73b0ad9 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.0</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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 334ad39..aa2088d 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 @@ -26,13 +26,13 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.Date; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.sql.DatabaseMetaData; import java.util.List; import java.util.Map; import java.util.Properties; @@ -62,16 +62,15 @@ import org.apache.phoenix.util.ByteUtil; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; +import org.apache.tephra.TransactionContext; +import org.apache.tephra.TransactionSystemClient; +import org.apache.tephra.TxConstants; +import org.apache.tephra.hbase.TransactionAwareHTable; import org.junit.Before; 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.hbase10.TransactionAwareHTable; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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 629fa7a..ba7357e 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 @@ -61,7 +61,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/2c3b2dc0/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 30df42f..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.hbase10.coprocessor.TransactionProcessor; +import org.apache.tephra.hbase.coprocessor.TransactionProcessor; public class PhoenixTransactionalProcessor extends DelegateRegionObserver { http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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 72f6d09..65d60e4 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/2c3b2dc0/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 a8482d1..b617838 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/2c3b2dc0/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 6b78218..52d2f64 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 @@ -89,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; @@ -98,17 +109,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -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.hbase10.TransactionAwareHTable; -import co.cask.tephra.visibility.FenceWait; -import co.cask.tephra.visibility.VisibilityFence; /** * http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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 b3606f6..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,14 +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; -import co.cask.tephra.Transaction.VisibilityLevel; -import co.cask.tephra.Transaction.VisibilityLevel; -import co.cask.tephra.TxConstants; -import co.cask.tephra.TxConstants; -import co.cask.tephra.hbase10.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/2c3b2dc0/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 4ab0866..4d01d08 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/2c3b2dc0/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/2c3b2dc0/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 5adafa7..7e3cbba 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 @@ -195,11 +195,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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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/2c3b2dc0/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 0d75951..ed08a82 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/2c3b2dc0/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 7a425f2..e0014e1 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/2c3b2dc0/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 47a6b15..a477842 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 @@ -26,11 +26,11 @@ 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; -import co.cask.tephra.TransactionConflictException; -import co.cask.tephra.TransactionFailureException; -import co.cask.tephra.TxConstants; -import co.cask.tephra.hbase10.TransactionAwareHTable; public class TransactionUtil { private TransactionUtil() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/2c3b2dc0/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/2c3b2dc0/phoenix-flume/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index b33bedd..576a1ba 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -170,7 +170,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/2c3b2dc0/phoenix-pherf/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 968b390..78dcaeb 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/2c3b2dc0/phoenix-pig/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 7d26e1f..ec2d9b9 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -148,7 +148,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/2c3b2dc0/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 2b1ce72..ef007d7 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/2c3b2dc0/phoenix-spark/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml index 497b9c8..c0ba9c1 100644 --- a/phoenix-spark/pom.xml +++ b/phoenix-spark/pom.xml @@ -469,7 +469,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/2c3b2dc0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9addd26..a3eae9f 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> @@ -641,12 +645,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> @@ -661,7 +665,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> @@ -678,7 +682,7 @@ </exclusions> </dependency> <dependency> - <groupId>co.cask.tephra</groupId> + <groupId>org.apache.tephra</groupId> <artifactId>tephra-hbase-compat-1.0</artifactId> <version>${tephra.version}</version> </dependency>
