You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/06/23 07:19:19 UTC
git commit: BIGTOP-1285. Bump version of Phoenix to 4.0
Repository: bigtop
Updated Branches:
refs/heads/master fc0d0905f -> b163a794d
BIGTOP-1285. Bump version of Phoenix to 4.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b163a794
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b163a794
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b163a794
Branch: refs/heads/master
Commit: b163a794d95576bbb46a0f065429db568a154bf6
Parents: fc0d090
Author: YoungWoo Kim <br...@nexr.com>
Authored: Sat Jun 21 04:35:33 2014 +0000
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Sun Jun 22 22:19:02 2014 -0700
----------------------------------------------------------------------
.../src/common/phoenix/do-component-build | 9 +-
.../src/common/phoenix/install_phoenix.sh | 12 +-
bigtop-packages/src/deb/phoenix/copyright | 6 +-
bigtop-packages/src/deb/phoenix/rules | 8 +-
.../src/rpm/phoenix/SPECS/phoenix.spec | 17 +-
.../itest/phoenix/smoke/TestPhoenixSmoke.groovy | 250 ++++++++++++++-----
bigtop.mk | 13 +-
7 files changed, 224 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/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 8a7efdb..923fbaf 100644
--- a/bigtop-packages/src/common/phoenix/do-component-build
+++ b/bigtop-packages/src/common/phoenix/do-component-build
@@ -19,9 +19,12 @@ set -ex
. `dirname $0`/bigtop.bom
mvn -DskipTests -Dhadoop.profile=2 \
- -Dhadoop.version=$HADOOP_VERSION \
- -Dhbase.version=$HBASE_VERSION \
+ -Dhadoop-two.version=$HADOOP_VERSION \
+ -Dhbase-hadoop2.version=$HBASE_VERSION-hadoop2 \
+ -Dpig.version=$PIG_VERSION \
+ -Dflume.version=$FLUME_VERSION \
+ -Dsnappy.version=1.0.4.1 \
clean package "$@"
rm -rf build
mkdir build
-tar -C build --strip-components=1 -xzf target/phoenix*.tar.gz
+tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/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 07da426..98c6a69 100755
--- a/bigtop-packages/src/common/phoenix/install_phoenix.sh
+++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh
@@ -113,18 +113,14 @@ install -d -m 0755 $PREFIX/$CONF_DIR
cp -ra $BUILD_DIR/lib/* $PREFIX/$LIB_DIR/lib
cp -a $BUILD_DIR/phoenix*.jar $PREFIX/$LIB_DIR
-cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR
cp -a $BUILD_DIR/examples $PREFIX/$DOC_DIR
-cp -a $BUILD_DIR/*.txt $PREFIX/$DOC_DIR
+cp -a $BUILD_DIR/bin/*.txt $PREFIX/$DOC_DIR
-cp -a $BUILD_DIR/bin/sqlline.sh $PREFIX/$BIN_DIR
-# needed for sqlline.sh
-cp -a $BUILD_DIR/bin/log4j.properties $PREFIX/$CONF_DIR
-# Fix up sqlline.sh for Bigtop install layout
-sed -i -e s#target## -e s#\$current_dir/log4j.properties#$ETC_DIR/conf/log4j.properties# $PREFIX/$BIN_DIR/sqlline.sh
+cp -a $BUILD_DIR/bin/*.py $PREFIX/$BIN_DIR
+cp -a $BUILD_DIR/bin/log4j.properties $PREFIX/$BIN_DIR
# Remove sources jar
-rm $PREFIX/$LIB_DIR/phoenix-*-sources.jar
+rm $PREFIX/$LIB_DIR/lib/phoenix-*-sources.jar
# Remove the executable bit from jars to avoid lintian warnings
find $PREFIX/$LIB_DIR -name '*.jar' -exec chmod a-x {} \;
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/bigtop-packages/src/deb/phoenix/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/phoenix/copyright b/bigtop-packages/src/deb/phoenix/copyright
index c2b3681..3207dc1 100644
--- a/bigtop-packages/src/deb/phoenix/copyright
+++ b/bigtop-packages/src/deb/phoenix/copyright
@@ -1,12 +1,8 @@
Format: http://dep.debian.net/deps/dep5
-Source: https://github.com/forcedotcom/phoenix
+Source: http://phoenix.apache.org
Upstream-Name: Phoenix
Files: *
-Copyright: Copyright (c) 2013, Salesforce.com, Inc.
-License: BSD-3-clause
-
-Files debian/*
Copyright: 2013, The Apache Software Foundation
License: Apache-2.0
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/bigtop-packages/src/deb/phoenix/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/phoenix/rules b/bigtop-packages/src/deb/phoenix/rules
index 03ab333..976b957 100755
--- a/bigtop-packages/src/deb/phoenix/rules
+++ b/bigtop-packages/src/deb/phoenix/rules
@@ -27,6 +27,7 @@ phoenix_pkg_name=phoenix
zookeeper_home=/usr/lib/zookeeper
hadoop_home=/usr/lib/hadoop
hadoop_mapreduce_home=/usr/lib/hadoop-mapreduce
+hadoop_hdfs_home=/usr/lib/hadoop-hdfs
hadoop_yarn_home=/usr/lib/hadoop-yarn
hbase_home=/usr/lib/hbase
@@ -52,5 +53,10 @@ override_dh_auto_install:
ln -f -s ${hadoop_mapreduce_home}/hadoop-mapreduce-client-core.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
ln -f -s ${hadoop_yarn_home}/hadoop-yarn-api.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
ln -f -s ${hadoop_yarn_home}/hadoop-yarn-common.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hadoop_hdfs_home}/hadoop-hdfs.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
rm -f debian/tmp/usr/lib/${phoenix_pkg_name}/lib/hbase*.jar
- ln -f -s ${hbase_home}/hbase.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hbase_home}/hbase-testing-util.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hbase_home}/hbase-it.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hbase_home}/hbase-common.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hbase_home}/hbase-protocol.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
+ ln -f -s ${hbase_home}/hbase-client.jar debian/tmp/usr/lib/${phoenix_pkg_name}/lib/
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
index 533d2ef..862959e 100644
--- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
+++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec
@@ -22,6 +22,7 @@
%define hadoop_home /usr/lib/hadoop
%define hadoop_mapreduce_home /usr/lib/hadoop-mapreduce
%define hadoop_yarn_home /usr/lib/hadoop-yarn
+%define hadoop_hdfs_home /usr/lib/hadoop-hdfs
%define hbase_home /usr/lib/hbase
%if %{?suse_version:1}0
@@ -73,11 +74,11 @@ Name: phoenix
Version: %{phoenix_version}
Release: %{phoenix_release}
Summary: Phoenix is a SQL skin over HBase and client-embedded JDBC driver.
-URL: https://github.com/forcedotcom/phoenix
+URL: http://phoenix.apache.org
Group: Development/Libraries
Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
-License: BSD with advertising
-Source0: %{name}-%{phoenix_base_version}.tar.gz
+License: ASL 2.0
+Source0: %{name}-%{phoenix_base_version}-src.tar.gz
Source1: do-component-build
Source2: install_phoenix.sh
BuildArch: noarch
@@ -100,7 +101,7 @@ standard JDBC interface; all the usual interfaces are supported.
%prep
-%setup -n %{name}-%{phoenix_base_version}
+%setup -n %{name}-%{phoenix_base_version}-src
%build
bash %{SOURCE1}
@@ -119,11 +120,15 @@ ln -f -s %{hadoop_home}/hadoop-annotations.jar $RPM_BUILD_ROOT/%{lib_phoenix}
ln -f -s %{hadoop_home}/hadoop-auth.jar $RPM_BUILD_ROOT/%{lib_phoenix}
ln -f -s %{hadoop_home}/hadoop-common.jar $RPM_BUILD_ROOT/%{lib_phoenix}
ln -f -s %{hadoop_mapreduce_home}/hadoop-mapreduce-client-core.jar $RPM_BUILD_ROOT/%{lib_phoenix}
+ln -f -s %{hadoop_hdfs_home}/hadoop-hdfs.jar $RPM_BUILD_ROOT/%{lib_phoenix}
ln -f -s %{hadoop_yarn_home}/hadoop-yarn-api.jar $RPM_BUILD_ROOT/%{lib_phoenix}
ln -f -s %{hadoop_yarn_home}/hadoop-yarn-common.jar $RPM_BUILD_ROOT/%{lib_phoenix}
rm -f $RPM_BUILD_ROOT/%{lib_phoenix}/hbase*.jar
-ln -f -s %{hbase_home}/hbase.jar $RPM_BUILD_ROOT/%{lib_phoenix}
-
+ln -f -s %{hbase_home}/hbase-testing-util.jar $RPM_BUILD_ROOT/%{lib_phoenix}
+ln -f -s %{hbase_home}/hbase-it.jar $RPM_BUILD_ROOT/%{lib_phoenix}
+ln -f -s %{hbase_home}/hbase-common.jar $RPM_BUILD_ROOT/%{lib_phoenix}
+ln -f -s %{hbase_home}/hbase-protocol.jar $RPM_BUILD_ROOT/%{lib_phoenix}
+ln -f -s %{hbase_home}/hbase-client.jar $RPM_BUILD_ROOT/%{lib_phoenix}
%post
%{alternatives_cmd} --install %{etc_phoenix_conf} %{name}-conf %{etc_phoenix_conf_dist} 30
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/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 6f6480d..df53e5e 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
@@ -34,8 +34,10 @@ public class TestPhoenixSmoke {
}
static String phoenixClientJar = PHOENIX_HOME + "/" +
JarContent.getJarName(PHOENIX_HOME, "phoenix-.*client.jar");
- static String phoenixTestsJar = PHOENIX_HOME + "/" +
- JarContent.getJarName(PHOENIX_HOME, "phoenix-.*tests.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
@@ -44,253 +46,377 @@ public class TestPhoenixSmoke {
// running cluster as well.
static void runTest(String testName) {
- sh.exec("HBASE_CLASSPATH=" + phoenixClientJar + ":" + phoenixTestsJar +
+ sh.exec("HBASE_CLASSPATH=" + phoenixClientJar + ":" + phoenixCoreJar + ":" + phoenixCoreTestsJar +
" hbase org.junit.runner.JUnitCore " + testName);
assertTrue(testName + " failed", sh.getRet() == 0);
}
-
+
@Test
public void testAlterTable() {
- runTest("com.salesforce.phoenix.end2end.AlterTableTest")
+ runTest("org.apache.phoenix.end2end.AlterTableIT")
}
@Test
public void testArithmeticQuery() {
- runTest("com.salesforce.phoenix.end2end.ArithmeticQueryTest")
+ runTest("org.apache.phoenix.end2end.ArithmeticQueryIT")
+ }
+
+ @Test
+ public void testArray() {
+ runTest("org.apache.phoenix.end2end.ArrayIT")
}
@Test
public void testAutoCommit() {
- runTest("com.salesforce.phoenix.end2end.AutoCommitTest")
+ runTest("org.apache.phoenix.end2end.AutoCommitIT")
}
@Test
public void testBinaryRowKey() {
- runTest("com.salesforce.phoenix.end2end.BinaryRowKeyTest")
+ runTest("org.apache.phoenix.end2end.BinaryRowKeyIT")
}
@Test
public void testCoalesceFunction() {
- runTest("com.salesforce.phoenix.end2end.CoalesceFunctionTest")
+ runTest("org.apache.phoenix.end2end.CoalesceFunctionIT")
+ }
+
+ @Test
+ public void testColumnProjectionOptimization() {
+ runTest("org.apache.phoenix.end2end.ColumnProjectionOptimizationIT")
}
@Test
public void testCompareDecimalToLong() {
- runTest("com.salesforce.phoenix.end2end.CompareDecimalToLongTest")
+ runTest("org.apache.phoenix.end2end.CompareDecimalToLongIT")
}
@Test
public void testCreateTable() {
- runTest("com.salesforce.phoenix.end2end.CreateTableTest")
+ runTest("org.apache.phoenix.end2end.CreateTableIT")
}
@Test
- public void testCSVLoader() {
- runTest("com.salesforce.phoenix.end2end.CSVLoaderTest")
+ public void testCSVCommonsLoader() {
+ runTest("org.apache.phoenix.end2end.CSVCommonsLoaderIT")
}
@Test
public void testCustomEntityData() {
- runTest("com.salesforce.phoenix.end2end.CustomEntityDataTest")
+ runTest("org.apache.phoenix.end2end.CustomEntityDataIT")
}
@Test
public void testDefaultParallelIteratorsRegionSplitter() {
- runTest("com.salesforce.phoenix.end2end.DefaultParallelIteratorsRegionSplitterTest")
+ runTest("org.apache.phoenix.end2end.DefaultParallelIteratorsRegionSplitterIT")
}
@Test
- public void testDeleteRange() {
- runTest("com.salesforce.phoenix.end2end.DeleteRangeTest")
- }
-
- @Test
- public void testDescColumnSortOrder() {
- runTest("com.salesforce.phoenix.end2end.DescColumnSortOrderTest")
+ public void testDelete() {
+ runTest("org.apache.phoenix.end2end.DeleteIT")
}
@Test
public void testDistinctCount() {
- runTest("com.salesforce.phoenix.end2end.DistinctCountTest")
+ runTest("org.apache.phoenix.end2end.DistinctCountIT")
}
@Test
public void testDynamicColumn() {
- runTest("com.salesforce.phoenix.end2end.DynamicColumnTest")
+ runTest("org.apache.phoenix.end2end.DynamicColumnIT")
}
@Test
public void testDynamicFamily() {
- runTest("com.salesforce.phoenix.end2end.DynamicFamilyTest")
+ runTest("org.apache.phoenix.end2end.DynamicFamilyIT")
}
@Test
public void testDynamicUpsert() {
- runTest("com.salesforce.phoenix.end2end.DynamicUpsertTest")
+ runTest("org.apache.phoenix.end2end.DynamicUpsertIT")
}
@Test
public void testExecuteStatements() {
- runTest("com.salesforce.phoenix.end2end.ExecuteStatementsTest")
+ runTest("org.apache.phoenix.end2end.ExecuteStatementsIT")
}
@Test
public void testExtendedQueryExec() {
- runTest("com.salesforce.phoenix.end2end.ExtendedQueryExecTest")
+ runTest("org.apache.phoenix.end2end.ExtendedQueryExecIT")
}
@Test
public void testFunkyNames() {
- runTest("com.salesforce.phoenix.end2end.FunkyNamesTest")
+ runTest("org.apache.phoenix.end2end.FunkyNamesIT")
}
@Test
public void testGroupByCase() {
- runTest("com.salesforce.phoenix.end2end.GroupByCaseTest")
+ 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("com.salesforce.phoenix.end2end.IsNullTest")
+ runTest("org.apache.phoenix.end2end.IsNullIT")
}
@Test
public void testKeyOnly() {
- runTest("com.salesforce.phoenix.end2end.KeyOnlyTest")
+ runTest("org.apache.phoenix.end2end.KeyOnlyIT")
+ }
+
+ @Test
+ public void testMD5Function() {
+ runTest("org.apache.phoenix.end2end.MD5FunctionIT")
}
@Test
public void testMultiCfQueryExec() {
- runTest("com.salesforce.phoenix.end2end.MultiCfQueryExecTest")
+ runTest("org.apache.phoenix.end2end.MultiCfQueryExecIT")
}
@Test
public void testNativeHBaseTypes() {
- runTest("com.salesforce.phoenix.end2end.NativeHBaseTypesTest")
+ runTest("org.apache.phoenix.end2end.NativeHBaseTypesIT")
+ }
+
+ @Test
+ public void testOrderBy() {
+ runTest("org.apache.phoenix.end2end.OrderByIT")
}
@Test
public void testPercentile() {
- runTest("com.salesforce.phoenix.end2end.PercentileTest")
+ runTest("org.apache.phoenix.end2end.PercentileIT")
}
@Test
public void testProductMetrics() {
- runTest("com.salesforce.phoenix.end2end.ProductMetricsTest")
+ runTest("org.apache.phoenix.end2end.ProductMetricsIT")
}
@Test
public void testQueryDatabaseMetaData() {
- runTest("com.salesforce.phoenix.end2end.QueryDatabaseMetaDataTest")
+ runTest("org.apache.phoenix.end2end.QueryDatabaseMetaDataIT")
}
@Test
- public void testQueryExec() {
- runTest("com.salesforce.phoenix.end2end.QueryExecTest")
+ public void testQueryExecWithoutSCN() {
+ runTest("org.apache.phoenix.end2end.QueryExecWithoutSCNIT")
}
-
@Test
- public void testQueryExecWithoutSCN() {
- runTest("com.salesforce.phoenix.end2end.QueryExecWithoutSCNTest")
+ public void testQuery() {
+ runTest("org.apache.phoenix.end2end.QueryIT")
}
@Test
public void testQueryPlan() {
- runTest("com.salesforce.phoenix.end2end.QueryPlanTest")
+ runTest("org.apache.phoenix.end2end.QueryPlanIT")
}
@Test
public void testReadIsolationLevel() {
- runTest("com.salesforce.phoenix.end2end.ReadIsolationLevelTest")
+ runTest("org.apache.phoenix.end2end.ReadIsolationLevelIT")
}
@Test
public void testReverseFunction() {
- runTest("com.salesforce.phoenix.end2end.ReverseFunctionTest")
+ 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("com.salesforce.phoenix.end2end.ServerExceptionTest")
+ runTest("org.apache.phoenix.end2end.ServerExceptionIT")
}
@Test
public void testSkipRangeParallelIteratorRegionSplitter() {
- runTest("com.salesforce.phoenix.end2end.SkipRangeParallelIteratorRegionSplitterTest")
+ runTest("org.apache.phoenix.end2end.SkipRangeParallelIteratorRegionSplitterIT")
}
@Test
public void testSkipScanQuery() {
- runTest("com.salesforce.phoenix.end2end.SkipScanQueryTest")
+ 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("com.salesforce.phoenix.end2end.SpooledOrderByTest")
+ runTest("org.apache.phoenix.end2end.SpooledOrderByIT")
}
@Test
public void testStatementHints() {
- runTest("com.salesforce.phoenix.end2end.StatementHintsTest")
+ runTest("org.apache.phoenix.end2end.StatementHintsIT")
+ }
+
+ @Test
+ public void testStatsManager() {
+ runTest("org.apache.phoenix.end2end.StatsManagerIT")
}
@Test
public void testStddev() {
- runTest("com.salesforce.phoenix.end2end.StddevTest")
+ 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("com.salesforce.phoenix.end2end.TopNTest")
+ runTest("org.apache.phoenix.end2end.TopNIT")
+ }
+
+ @Test
+ public void testTruncateFunction() {
+ runTest("org.apache.phoenix.end2end.TruncateFunctionIT")
}
@Test
public void testUpsertBigValues() {
- runTest("com.salesforce.phoenix.end2end.UpsertBigValuesTest")
+ runTest("org.apache.phoenix.end2end.UpsertBigValuesIT")
+ }
+
+ @Test
+ public void testUpsertSelectAutoCommit() {
+ runTest("org.apache.phoenix.end2end.UpsertSelectAutoCommitIT")
}
@Test
public void testUpsertSelect() {
- runTest("com.salesforce.phoenix.end2end.UpsertSelectTest")
+ runTest("org.apache.phoenix.end2end.UpsertSelectIT")
}
@Test
public void testUpsertValues() {
- runTest("com.salesforce.phoenix.end2end.UpsertValuesTest")
+ runTest("org.apache.phoenix.end2end.UpsertValuesIT")
}
@Test
public void testVariableLengthPK() {
- runTest("com.salesforce.phoenix.end2end.VariableLengthPKTest")
+ runTest("org.apache.phoenix.end2end.VariableLengthPKIT")
+ }
+
+ @Test
+ public void testView() {
+ runTest("org.apache.phoenix.end2end.ViewIT")
}
// INDEX
@Test
- public void testIndex() {
- runTest("com.salesforce.phoenix.end2end.index.IndexTest")
+ 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("com.salesforce.phoenix.end2end.index.IndexMetadataTest")
+ 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("com.salesforce.phoenix.end2end.salted.SaltedTableTest")
+ runTest("org.apache.phoenix.end2end.salted.SaltedTableIT")
}
@Test
public void testSaltedTableUpsertSelect() {
- runTest("com.salesforce.phoenix.end2end.salted.SaltedTableUpsertSelectTest")
+ runTest("org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT")
}
@Test
public void testSaltedTableVarLengthRowKey() {
- runTest("com.salesforce.phoenix.end2end.salted.SaltedTableVarLengthRowKeyTest")
+ runTest("org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT")
}
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b163a794/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index b8f6fbf..201301b 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -240,13 +240,14 @@ $(eval $(call PACKAGE,spark,SPARK))
PHOENIX_NAME=phoenix
PHOENIX_RELNOTES_NAME=Phoenix: A SQL skin over HBase
PHOENIX_PKG_NAME=phoenix
-PHOENIX_BASE_VERSION=2.0.2
-PHOENIX_PKG_VERSION=2.0.2
+PHOENIX_BASE_VERSION=4.0.0-incubating
+PHOENIX_PKG_VERSION=4.0.0
PHOENIX_RELEASE_VERSION=1
-PHOENIX_TARBALL_DST=phoenix-$(PHOENIX_BASE_VERSION).tar.gz
-PHOENIX_TARBALL_SRC=$(PHOENIX_BASE_VERSION).tar.gz
-PHOENIX_SITE=https://github.com/forcedotcom/phoenix/archive
-PHOENIX_ARCHIVE=$(PHOENIX_SITE)
+PHOENIX_TARBALL_DST=phoenix-$(PHOENIX_BASE_VERSION)-src.tar.gz
+PHOENIX_TARBALL_SRC=$(PHOENIX_TARBALL_DST)
+PHOENIX_DOWNLOAD_PATH=/incubator/phoenix/phoenix-$(PHOENIX_BASE_VERSION)/src/
+PHOENIX_SITE=$(APACHE_MIRROR)$(PHOENIX_DOWNLOAD_PATH)
+PHOENIX_ARCHIVE=$(APACHE_ARCHIVE)$(PHOENIX_DOWNLOAD_PATH)
$(eval $(call PACKAGE,phoenix,PHOENIX))
# Groovy