You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2015/04/28 00:12:14 UTC
bigtop git commit: BIGTOP-1741: Upgrade to Apache Phoenix 4.3.1
Repository: bigtop
Updated Branches:
refs/heads/master 32f55d776 -> e4ff5ff6e
BIGTOP-1741: Upgrade to Apache Phoenix 4.3.1
Signed-off-by: Konstantin Boudnik <co...@wandisco.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e4ff5ff6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e4ff5ff6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e4ff5ff6
Branch: refs/heads/master
Commit: e4ff5ff6e37a8897051d241620b2979b8106ec51
Parents: 32f55d7
Author: YoungWoo Kim <yw...@apache.org>
Authored: Tue Mar 10 17:51:02 2015 +0900
Committer: Konstantin Boudnik <co...@wandisco.com>
Committed: Mon Apr 27 15:12:00 2015 -0700
----------------------------------------------------------------------
.../src/common/phoenix/do-component-build | 2 -
.../src/common/phoenix/install_phoenix.sh | 2 +-
.../itest/phoenix/smoke/TestPhoenixSmoke.groovy | 396 +------------------
bigtop.mk | 4 +-
pom.xml | 2 +-
5 files changed, 15 insertions(+), 391 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4ff5ff6/bigtop-packages/src/common/phoenix/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/phoenix/do-component-build b/bigtop-packages/src/common/phoenix/do-component-build
index dbc2508..bb12d44 100644
--- a/bigtop-packages/src/common/phoenix/do-component-build
+++ b/bigtop-packages/src/common/phoenix/do-component-build
@@ -27,5 +27,3 @@ mvn -DskipTests \
rm -rf build
mkdir build
tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz
-# workaround for PHOENIX-1532
-cp -a phoenix-assembly/target/phoenix-$PHOENIX_VERSION-server.jar build/
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4ff5ff6/bigtop-packages/src/common/phoenix/install_phoenix.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/phoenix/install_phoenix.sh b/bigtop-packages/src/common/phoenix/install_phoenix.sh
index 7dddb62..b45053f 100755
--- a/bigtop-packages/src/common/phoenix/install_phoenix.sh
+++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh
@@ -117,7 +117,7 @@ cp -a $BUILD_DIR/examples $PREFIX/$DOC_DIR
cp -a $BUILD_DIR/bin/*.txt $PREFIX/$DOC_DIR
cp -a $BUILD_DIR/bin/*.py $PREFIX/$BIN_DIR
-cp -a $BUILD_DIR/bin/log4j.properties $PREFIX/$BIN_DIR
+cp -a $BUILD_DIR/bin/*.properties $PREFIX/$BIN_DIR
# Remove sources jar
rm $PREFIX/$LIB_DIR/lib/phoenix-*-sources.jar
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4ff5ff6/bigtop-tests/test-artifacts/phoenix/src/main/groovy/org/apache/bigtop/itest/phoenix/smoke/TestPhoenixSmoke.groovy
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/phoenix/src/main/groovy/org/apache/bigtop/itest/phoenix/smoke/TestPhoenixSmoke.groovy b/bigtop-tests/test-artifacts/phoenix/src/main/groovy/org/apache/bigtop/itest/phoenix/smoke/TestPhoenixSmoke.groovy
index 68385e0..28f3c17 100644
--- a/bigtop-tests/test-artifacts/phoenix/src/main/groovy/org/apache/bigtop/itest/phoenix/smoke/TestPhoenixSmoke.groovy
+++ b/bigtop-tests/test-artifacts/phoenix/src/main/groovy/org/apache/bigtop/itest/phoenix/smoke/TestPhoenixSmoke.groovy
@@ -20,7 +20,6 @@ package org.apache.bigtop.itest.phoenix.smoke
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.apache.bigtop.itest.JarContent;
import org.apache.bigtop.itest.shell.Shell
import org.junit.Test
@@ -28,396 +27,23 @@ public class TestPhoenixSmoke {
static Shell sh = new Shell('/bin/bash -s');
+ static final String JAVA_HOME = System.getenv("JAVA_HOME");
static final String PHOENIX_HOME = System.getenv("PHOENIX_HOME");
+ static final String HBASE_HOME = System.getenv("HBASE_HOME");
+
static {
+ assertNotNull("JAVA_HOME has to be set to run this test", JAVA_HOME);
assertNotNull("PHOENIX_HOME has to be set to run this test", PHOENIX_HOME);
+ assertNotNull("HBASE_HOME has to be set to run this test", HBASE_HOME);
}
- static String phoenixClientJar = PHOENIX_HOME + "/" +
- JarContent.getJarName(PHOENIX_HOME, "phoenix-.*client.jar");
- static String phoenixCoreJar = PHOENIX_HOME + "/lib/" +
- JarContent.getJarName(PHOENIX_HOME + "/lib/", "phoenix-core.*.jar");
- static String phoenixCoreTestsJar = PHOENIX_HOME + "/lib/" +
- JarContent.getJarName(PHOENIX_HOME + "/lib/", "phoenix-core.*tests.jar");
-
- // Run a Phoenix end to end unit test using the hbase exec script.
- // This really simplifies the testing setup we would otherwise need
- // to accomplish with Maven and will be more amenable to change if
- // the Phoenix tests someday can be run as test drivers against a
- // running cluster as well.
-
- static void runTest(String testName) {
- sh.exec("HBASE_CLASSPATH=" + phoenixClientJar + ":" + phoenixCoreJar + ":" + phoenixCoreTestsJar +
- " hbase org.junit.runner.JUnitCore " + testName);
- assertTrue(testName + " failed", sh.getRet() == 0);
- }
-
- @Test
- public void testAlterTable() {
- runTest("org.apache.phoenix.end2end.AlterTableIT")
- }
-
- @Test
- public void testArithmeticQuery() {
- runTest("org.apache.phoenix.end2end.ArithmeticQueryIT")
- }
-
- @Test
- public void testArray() {
- runTest("org.apache.phoenix.end2end.ArrayIT")
- }
-
- @Test
- public void testAutoCommit() {
- runTest("org.apache.phoenix.end2end.AutoCommitIT")
- }
-
- @Test
- public void testBinaryRowKey() {
- runTest("org.apache.phoenix.end2end.BinaryRowKeyIT")
- }
-
- @Test
- public void testCoalesceFunction() {
- runTest("org.apache.phoenix.end2end.CoalesceFunctionIT")
- }
-
- @Test
- public void testColumnProjectionOptimization() {
- runTest("org.apache.phoenix.end2end.ColumnProjectionOptimizationIT")
- }
-
- @Test
- public void testCompareDecimalToLong() {
- runTest("org.apache.phoenix.end2end.CompareDecimalToLongIT")
- }
-
- @Test
- public void testCreateTable() {
- runTest("org.apache.phoenix.end2end.CreateTableIT")
- }
-
- @Test
- public void testCSVCommonsLoader() {
- runTest("org.apache.phoenix.end2end.CSVCommonsLoaderIT")
- }
-
- @Test
- public void testCustomEntityData() {
- runTest("org.apache.phoenix.end2end.CustomEntityDataIT")
- }
-
- @Test
- public void testDefaultParallelIteratorsRegionSplitter() {
- runTest("org.apache.phoenix.end2end.DefaultParallelIteratorsRegionSplitterIT")
- }
-
- @Test
- public void testDelete() {
- runTest("org.apache.phoenix.end2end.DeleteIT")
- }
-
- @Test
- public void testDistinctCount() {
- runTest("org.apache.phoenix.end2end.DistinctCountIT")
- }
-
- @Test
- public void testDynamicColumn() {
- runTest("org.apache.phoenix.end2end.DynamicColumnIT")
- }
-
- @Test
- public void testDynamicFamily() {
- runTest("org.apache.phoenix.end2end.DynamicFamilyIT")
- }
-
- @Test
- public void testDynamicUpsert() {
- runTest("org.apache.phoenix.end2end.DynamicUpsertIT")
- }
-
- @Test
- public void testExecuteStatements() {
- runTest("org.apache.phoenix.end2end.ExecuteStatementsIT")
- }
-
- @Test
- public void testExtendedQueryExec() {
- runTest("org.apache.phoenix.end2end.ExtendedQueryExecIT")
- }
-
- @Test
- public void testFunkyNames() {
- runTest("org.apache.phoenix.end2end.FunkyNamesIT")
- }
-
- @Test
- public void testGroupByCase() {
- runTest("org.apache.phoenix.end2end.GroupByCaseIT")
- }
-
- @Test
- public void testHashJoin() {
- runTest("org.apache.phoenix.end2end.HashJoinIT")
- }
-
- @Test
- public void testInMemoryOrderBy() {
- runTest("org.apache.phoenix.end2end.InMemoryOrderByIT")
- }
-
- @Test
- public void testIsNull() {
- runTest("org.apache.phoenix.end2end.IsNullIT")
- }
-
- @Test
- public void testKeyOnly() {
- runTest("org.apache.phoenix.end2end.KeyOnlyIT")
- }
-
- @Test
- public void testMD5Function() {
- runTest("org.apache.phoenix.end2end.MD5FunctionIT")
- }
-
- @Test
- public void testMultiCfQueryExec() {
- runTest("org.apache.phoenix.end2end.MultiCfQueryExecIT")
- }
-
- @Test
- public void testNativeHBaseTypes() {
- runTest("org.apache.phoenix.end2end.NativeHBaseTypesIT")
- }
-
- @Test
- public void testOrderBy() {
- runTest("org.apache.phoenix.end2end.OrderByIT")
- }
-
- @Test
- public void testPercentile() {
- runTest("org.apache.phoenix.end2end.PercentileIT")
- }
-
- @Test
- public void testProductMetrics() {
- runTest("org.apache.phoenix.end2end.ProductMetricsIT")
- }
-
- @Test
- public void testQueryDatabaseMetaData() {
- runTest("org.apache.phoenix.end2end.QueryDatabaseMetaDataIT")
- }
-
- @Test
- public void testQueryExecWithoutSCN() {
- runTest("org.apache.phoenix.end2end.QueryExecWithoutSCNIT")
- }
-
- @Test
- public void testQuery() {
- runTest("org.apache.phoenix.end2end.QueryIT")
- }
-
- @Test
- public void testQueryPlan() {
- runTest("org.apache.phoenix.end2end.QueryPlanIT")
- }
-
- @Test
- public void testReadIsolationLevel() {
- runTest("org.apache.phoenix.end2end.ReadIsolationLevelIT")
- }
-
- @Test
- public void testReverseFunction() {
- runTest("org.apache.phoenix.end2end.ReverseFunctionIT")
- }
-
- @Test
- public void testRoundFloorCeilFunctionsEnd2End() {
- runTest("org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT")
- }
-
- @Test
- public void testRowValueConstructor() {
- runTest("org.apache.phoenix.end2end.RowValueConstructorIT")
- }
-
- @Test
- public void testSaltedView() {
- runTest("org.apache.phoenix.end2end.SaltedViewIT")
- }
-
- @Test
- public void testSequence() {
- runTest("org.apache.phoenix.end2end.SequenceIT")
- }
-
- @Test
- public void testServerException() {
- runTest("org.apache.phoenix.end2end.ServerExceptionIT")
- }
-
- @Test
- public void testSkipRangeParallelIteratorRegionSplitter() {
- runTest("org.apache.phoenix.end2end.SkipRangeParallelIteratorRegionSplitterIT")
- }
-
- @Test
- public void testSkipScanQuery() {
- runTest("org.apache.phoenix.end2end.SkipScanQueryIT")
- }
-
- @Test
- public void testSortOrderF() {
- runTest("org.apache.phoenix.end2end.SortOrderFIT")
- }
-
- @Test
- public void testSpillableGroupBy() {
- runTest("org.apache.phoenix.end2end.SpillableGroupByIT")
- }
-
- @Test
- public void testSpooledOrderBy() {
- runTest("org.apache.phoenix.end2end.SpooledOrderByIT")
- }
-
- @Test
- public void testStatementHints() {
- runTest("org.apache.phoenix.end2end.StatementHintsIT")
- }
-
- @Test
- public void testStatsManager() {
- runTest("org.apache.phoenix.end2end.StatsManagerIT")
- }
-
- @Test
- public void testStddev() {
- runTest("org.apache.phoenix.end2end.StddevIT")
- }
-
- @Test
- public void testTenantSpecificTablesDDL() {
- runTest("org.apache.phoenix.end2end.TenantSpecificTablesDDLIT")
- }
-
- @Test
- public void testTenantSpecificTablesDML() {
- runTest("org.apache.phoenix.end2end.TenantSpecificTablesDMLIT")
- }
-
- @Test
- public void testTenantSpecificViewIndex() {
- runTest("org.apache.phoenix.end2end.TenantSpecificViewIndexIT")
- }
-
- @Test
- public void testTenantSpecificViewIndexSalted() {
- runTest("org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT")
- }
-
- @Test
- public void testToCharFunction() {
- runTest("org.apache.phoenix.end2end.ToCharFunctionIT")
- }
-
- @Test
- public void testToNumberFunction() {
- runTest("org.apache.phoenix.end2end.ToNumberFunctionIT")
- }
-
- @Test
- public void testTopN() {
- runTest("org.apache.phoenix.end2end.TopNIT")
- }
-
- @Test
- public void testTruncateFunction() {
- runTest("org.apache.phoenix.end2end.TruncateFunctionIT")
- }
-
- @Test
- public void testUpsertBigValues() {
- runTest("org.apache.phoenix.end2end.UpsertBigValuesIT")
- }
-
- @Test
- public void testUpsertSelectAutoCommit() {
- runTest("org.apache.phoenix.end2end.UpsertSelectAutoCommitIT")
- }
-
- @Test
- public void testUpsertSelect() {
- runTest("org.apache.phoenix.end2end.UpsertSelectIT")
- }
-
- @Test
- public void testUpsertValues() {
- runTest("org.apache.phoenix.end2end.UpsertValuesIT")
- }
-
- @Test
- public void testVariableLengthPK() {
- runTest("org.apache.phoenix.end2end.VariableLengthPKIT")
- }
-
- @Test
- public void testView() {
- runTest("org.apache.phoenix.end2end.ViewIT")
- }
-
- // INDEX
-
- @Test
- public void testDropView() {
- runTest("org.apache.phoenix.end2end.index.DropViewIT")
- }
-
- @Test
- public void testImmutableIndex() {
- runTest("org.apache.phoenix.end2end.index.ImmutableIndexIT")
- }
-
- @Test
- public void testIndexMetadata() {
- runTest("org.apache.phoenix.end2end.index.IndexMetadataIT")
- }
-
- @Test
- public void testMutableIndexFailure() {
- runTest("org.apache.phoenix.end2end.index.MutableIndexFailureIT")
- }
-
- @Test
- public void testMutableIndex() {
- runTest("org.apache.phoenix.end2end.index.MutableIndexIT")
- }
-
- @Test
- public void testSaltedIndex() {
- runTest("org.apache.phoenix.end2end.index.SaltedIndexIT")
- }
-
- // SALTED
-
- @Test
- public void testSaltedTable() {
- runTest("org.apache.phoenix.end2end.salted.SaltedTableIT")
- }
-
- @Test
- public void testSaltedTableUpsertSelect() {
- runTest("org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT")
- }
+ static String phoenixEnd2EndTestCommand = JAVA_HOME + "/bin/java -cp " +
+ HBASE_HOME + "/conf/*" + ":" + PHOENIX_HOME + "/lib/*" + ":" +
+ HBASE_HOME + "/lib/*" + " org.apache.phoenix.end2end.End2EndTestDriver";
@Test
- public void testSaltedTableVarLengthRowKey() {
- runTest("org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT")
+ public void testPhoenixEnd2End() {
+ sh.exec(phoenixEnd2EndTestCommand);
+ assertTrue("end2end test failed", sh.getRet() == 0);
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4ff5ff6/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 6071af0..b555504 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -276,8 +276,8 @@ $(eval $(call PACKAGE,spark,SPARK))
PHOENIX_NAME=phoenix
PHOENIX_RELNOTES_NAME=Phoenix: A SQL skin over HBase
PHOENIX_PKG_NAME=phoenix
-PHOENIX_BASE_VERSION=4.2.2
-PHOENIX_PKG_VERSION=4.2.2
+PHOENIX_BASE_VERSION=4.3.1
+PHOENIX_PKG_VERSION=$(PHOENIX_BASE_VERSION)
PHOENIX_RELEASE_VERSION=1
PHOENIX_TARBALL_DST=phoenix-$(PHOENIX_BASE_VERSION)-src.tar.gz
PHOENIX_TARBALL_SRC=$(PHOENIX_TARBALL_DST)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e4ff5ff6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35894ae..0b8daca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<solr.version>4.6.0</solr.version>
<spark.version>1.3.1</spark.version>
<kafka.version>0.8.1.1</kafka.version>
- <phoenix.version>4.2.2</phoenix.version>
+ <phoenix.version>4.3.1</phoenix.version>
<spark-smoke.version>${project.version}</spark-smoke.version>
<itest-common.version>${project.version}</itest-common.version>