BIGTOP-2327. Bump up Phoenix to 4.7.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/374cf9b7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/374cf9b7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/374cf9b7 Branch: refs/heads/BIGTOP-2320 Commit: 374cf9b7431b2268e429d406e422586bea93ae7c Parents: 2805e17 Author: Youngwoo Kim <[email protected]> Authored: Sun Mar 13 23:18:24 2016 +0900 Committer: Youngwoo Kim <[email protected]> Committed: Mon Mar 14 20:44:12 2016 +0900 ---------------------------------------------------------------------- .../src/common/phoenix/do-component-build | 4 +- .../src/common/phoenix/install_phoenix.sh | 56 +++----------------- bigtop-packages/src/deb/phoenix/control | 5 -- .../src/deb/phoenix/phoenix-pherf.install | 1 - .../src/rpm/phoenix/SPECS/phoenix.spec | 13 ----- bigtop.bom | 2 +- pom.xml | 2 +- 7 files changed, 12 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/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 9eaf3bd..1f71864 100644 --- a/bigtop-packages/src/common/phoenix/do-component-build +++ b/bigtop-packages/src/common/phoenix/do-component-build @@ -24,7 +24,9 @@ mvn -DskipTests \ -Dpig.version=$PIG_VERSION \ -Dflume.version=$FLUME_VERSION \ -Dspark.version=${SPARK_VERSION} \ - clean install package "$@" + clean install "$@" rm -rf build mkdir build tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz +cp -ra dev/release_files/* build/ +cp -ra phoenix-pherf/config build/bin/ http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/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 a6ab9f7..b1b25b7 100755 --- a/bigtop-packages/src/common/phoenix/install_phoenix.sh +++ b/bigtop-packages/src/common/phoenix/install_phoenix.sh @@ -100,7 +100,6 @@ MAN_DIR=${MAN_DIR:-/usr/share/man/man1} DOC_DIR=${DOC_DIR:-/usr/share/doc/phoenix} LIB_DIR=${LIB_DIR:-/usr/lib/phoenix} BIN_DIR=${BIN_DIR:-/usr/lib/phoenix/bin} -PHERF_DIR=${PHERF_DIR:-/usr/lib/phoenix/pherf} ETC_DIR=${ETC_DIR:-/etc/phoenix} CONF_DIR=${CONF_DIR:-${ETC_DIR}/conf.dist} @@ -111,18 +110,22 @@ install -d -m 0755 $PREFIX/$DOC_DIR install -d -m 0755 $PREFIX/$MAN_DIR install -d -m 0755 $PREFIX/$ETC_DIR install -d -m 0755 $PREFIX/$CONF_DIR -install -d -m 0755 $PREFIX/$PHERF_DIR install -d -m 0755 $PREFIX/var/lib/phoenix install -d -m 0755 $PREFIX/var/log/phoenix cp -ra $BUILD_DIR/{bin,lib} $PREFIX/$LIB_DIR/ rm $PREFIX/$LIB_DIR/lib/phoenix-*.jar -chmod 755 $PREFIX/$BIN_DIR/*.py cp -a $BUILD_DIR/*.jar $PREFIX/$LIB_DIR/ cp -a $BUILD_DIR/lib/phoenix-*.jar $PREFIX/$LIB_DIR/ + +chmod 755 $PREFIX/$BIN_DIR/*.py +chmod 755 $PREFIX/$BIN_DIR/*.sh + # Remove sources jar rm $PREFIX/$LIB_DIR/phoenix-*-sources.jar -cp -a $BUILD_DIR/examples $PREFIX/$DOC_DIR + +cp -a $BUILD_DIR/{LICENSE,NOTICE} $PREFIX/$DOC_DIR/ +cp -ra $BUILD_DIR/examples $PREFIX/$DOC_DIR # Remove the executable bit from jars to avoid lintian warnings find $PREFIX/$LIB_DIR -name '*.jar' -exec chmod a-x {} \; @@ -137,48 +140,3 @@ ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix*-thin-client.jar` $PREFIX/$LIB_DIR/phoen # phoenix-server for placing on the HBase regionserver classpath ln -s `cd $PREFIX/$LIB_DIR ; ls phoenix*-server.jar` $PREFIX/$LIB_DIR/phoenix-server.jar -# Pherf -unzip $BUILD_DIR/phoenix-pherf/phoenix-pherf-*-cluster.zip -d $BUILD_DIR/phoenix-pherf/ -mv $BUILD_DIR/phoenix-pherf/phoenix-pherf-*-cluster/* $PREFIX/$PHERF_DIR/ -rm -rf $PREFIX/$PHERF_DIR/config/env.sh - -cat >>$PREFIX/$PHERF_DIR/config/env.sh <<EOF -#!/bin/sh - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Required variable to point to Java installation -#JAVA_HOME= - -# Autodetect JAVA_HOME if not defined -if [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then - . /usr/lib/bigtop-utils/bigtop-detect-javahome -fi - -# Absolute path the the unzipped directory of the HBase installation -# This is required if you build using the default or cluster profile -# Cluster profile assumes you want to pick up dependencies from HBase classpath -# Not required in standalone. -HBASE_PATH=/usr/lib/hbase - -# Add a space seperated list of -D environment args. "-Dkey1-val1 -Dkey2=val2" -ENV_PROPS="" - -# Uncomment if you would like to remotely debug -#REMOTE_DEBUG="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=6666" -EOF - http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/bigtop-packages/src/deb/phoenix/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/control b/bigtop-packages/src/deb/phoenix/control index 5b0ed7f..4e1208a 100644 --- a/bigtop-packages/src/deb/phoenix/control +++ b/bigtop-packages/src/deb/phoenix/control @@ -40,8 +40,3 @@ Description: The Phoenix Query Server provides an alternative means for interaction with Phoenix and HBase. Soon this will enable access from environments other than the JVM. -Package: phoenix-pherf -Architecture: all -Depends: phoenix (= ${source:Version}) -Description: Pherf is a standalone tool that can perform performance and functional testing - through Phoenix http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/bigtop-packages/src/deb/phoenix/phoenix-pherf.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/phoenix/phoenix-pherf.install b/bigtop-packages/src/deb/phoenix/phoenix-pherf.install deleted file mode 100644 index 1d98a76..0000000 --- a/bigtop-packages/src/deb/phoenix/phoenix-pherf.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/phoenix/pherf http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/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 c6c1273..c52d0c0 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -73,7 +73,6 @@ %endif - Name: phoenix Version: %{phoenix_version} Release: %{phoenix_release} @@ -117,15 +116,6 @@ The Phoenix Query Server provides an alternative means for interaction with Phoenix and HBase. Soon this will enable access from environments other than the JVM. -%package pherf -Summary: Phoenix and HBase SQL Performance Test Framework -Group: Development/Libraries -Requires: phoenix = %{version}-%{release} - -%description pherf -Pherf is a standalone tool that can perform performance and functional testing -through Phoenix - %prep %setup -n %{name}-%{phoenix_base_version}-src @@ -191,9 +181,6 @@ fi %config(noreplace) %{etc_phoenix_conf_dist} %config(noreplace) %{_sysconfdir}/default/phoenix -%files pherf -%{phoenix_home}/pherf - %define service_macro() \ %files %1 \ %attr(0755,root,root)/%{initd_dir}/%{name}-%1 \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index e3808a5..2a709bf 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -301,7 +301,7 @@ bigtop { * HBase version in the BOM. */ phoenix.hbase ='HBase-0.98' - version { base = "4.6.0-${phoenix.hbase}"; pkg = '4.6.0'; release = 1 } + version { base = "4.7.0-${phoenix.hbase}"; pkg = '4.7.0'; release = 1 } tarball { destination = "$name-${version.base}-src.tar.gz" source = destination } url { download_path = "/$name/$name-${version.base}/src" http://git-wip-us.apache.org/repos/asf/bigtop/blob/374cf9b7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c08530..1e3ef63 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.3.1</phoenix.version> + <phoenix.version>4.7.0</phoenix.version> <kite.version>1.1.0</kite.version> <spark-smoke.version>${project.version}</spark-smoke.version>
