Merge branch 'pub-master'
Conflicts:
bigtop.mk
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6adc1d95
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6adc1d95
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6adc1d95
Branch: refs/heads/master
Commit: 6adc1d95a085816b88a2237f2d7568bd30aee358
Parents: 5fc8a3d 080fa9d
Author: Konstantin Boudnik <[email protected]>
Authored: Wed Apr 23 10:37:50 2014 -0700
Committer: Konstantin Boudnik <[email protected]>
Committed: Wed Apr 23 10:37:50 2014 -0700
----------------------------------------------------------------------
bigtop-bigpetstore/BPS_analytics.pig | 77 ++
bigtop-bigpetstore/README.md | 140 ++++
bigtop-bigpetstore/arch.dot | 44 +
bigtop-bigpetstore/pom.xml | 797 +++++++++++++++++++
bigtop-bigpetstore/setuphive.sh | 22 +
.../bigtop/bigpetstore/BigPetStoreHiveIT.java | 108 +++
.../bigtop/bigpetstore/BigPetStoreMahoutIT.java | 88 ++
.../bigtop/bigpetstore/BigPetStorePigIT.java | 165 ++++
.../org/apache/bigtop/bigpetstore/ITUtils.java | 145 ++++
.../bigpetstore/clustering/BPSRecommnder.java | 83 ++
.../contract/PetStoreStatistics.java | 34 +
.../bigtop/bigpetstore/etl/CrunchETL.java | 142 ++++
.../bigtop/bigpetstore/etl/HiveViewCreator.java | 157 ++++
.../apache/bigtop/bigpetstore/etl/LineItem.java | 112 +++
.../bigtop/bigpetstore/etl/PigCSVCleaner.java | 171 ++++
.../bigpetstore/generator/BPSGenerator.java | 116 +++
...GeneratePetStoreTransactionsInputFormat.java | 134 ++++
.../generator/PetStoreTransaction.java | 32 +
.../PetStoreTransactionInputSplit.java | 67 ++
.../generator/TransactionIteratorFactory.java | 468 +++++++++++
.../bigpetstore/util/BigPetStoreConstants.java | 36 +
.../bigtop/bigpetstore/util/DeveloperTools.java | 58 ++
.../bigpetstore/util/NumericalIdUtils.java | 50 ++
.../apache/bigtop/bigpetstore/util/Pair.java | 125 +++
.../util/PetStoreParseFunctions.java | 55 ++
.../bigtop/bigpetstore/util/StringUtils.java | 53 ++
.../src/main/resources/hive-log4j.properties | 84 ++
.../src/main/resources/hive-site.xml | 36 +
.../bigtop/bigpetstore/docs/TestDocs.java | 46 ++
.../generator/TestNumericalIdUtils.java | 36 +
.../TestPetStoreTransactionGeneratorJob.java | 106 +++
.../src/test/resources/log4j.properties | 47 ++
bigtop-deploy/puppet/manifests/cluster.pp | 2 +-
.../puppet/modules/spark/manifests/init.pp | 20 +-
bigtop-deploy/vm/vagrant-puppet/README | 16 -
bigtop-deploy/vm/vagrant-puppet/README.md | 52 ++
bigtop-deploy/vm/vagrant-puppet/Vagrantfile | 105 ++-
bigtop-deploy/vm/vagrant-puppet/hbase-test.sh | 17 +-
bigtop-deploy/vm/vagrant-puppet/provision.sh | 21 +
bigtop-deploy/vm/vagrant-puppet/startup.sh | 40 +
.../src/common/mahout/do-component-build | 2 +-
bigtop.mk | 115 ++-
42 files changed, 4175 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6adc1d95/bigtop.mk
----------------------------------------------------------------------
diff --cc bigtop.mk
index 8bb0ae0,efd5a1b..77dd74b
--- a/bigtop.mk
+++ b/bigtop.mk
@@@ -183,6 -112,34 +168,34 @@@ OOZIE_SITE=$(APACHE_MIRROR)$(OOZIE_DOWN
OOZIE_ARCHIVE=$(APACHE_ARCHIVE)$(OOZIE_DOWNLOAD_PATH)
$(eval $(call PACKAGE,oozie,OOZIE))
+ # Whirr
+ WHIRR_NAME=whirr
+ WHIRR_RELNOTES_NAME=Apache Whirr
+ WHIRR_PKG_NAME=whirr
+ WHIRR_BASE_VERSION=0.8.2
+ WHIRR_PKG_VERSION=0.8.2
+ WHIRR_RELEASE_VERSION=1
+ WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION)-src.tar.gz
+ WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST)
+ WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION)
+ WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH)
+ WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH)
+ $(eval $(call PACKAGE,whirr,WHIRR))
+
+ # Mahout
+ MAHOUT_NAME=mahout
+ MAHOUT_RELNOTES_NAME=Apache Mahout
+ MAHOUT_PKG_NAME=mahout
-MAHOUT_BASE_VERSION=0.9
-MAHOUT_PKG_VERSION=0.9
++MAHOUT_BASE_VERSION=0.7
++MAHOUT_PKG_VERSION=0.7
+ MAHOUT_RELEASE_VERSION=1
+ MAHOUT_TARBALL_DST=mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
+ MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)
+ MAHOUT_DOWNLOAD_PATH=/mahout/$(MAHOUT_BASE_VERSION)
+ MAHOUT_SITE=$(APACHE_MIRROR)$(MAHOUT_DOWNLOAD_PATH)
+ MAHOUT_ARCHIVE=$(APACHE_ARCHIVE)$(MAHOUT_DOWNLOAD_PATH)
+ $(eval $(call PACKAGE,mahout,MAHOUT))
+
# Flume
FLUME_NAME=flume
FLUME_RELNOTES_NAME=Flume
@@@ -210,6 -194,34 +250,34 @@@ DATAFU_SITE=https://github.com/linkedin
DATAFU_ARCHIVE=$(DATAFU_SITE)
$(eval $(call PACKAGE,datafu,DATAFU))
+ # Solr
+ SOLR_NAME=solr
+ SOLR_RELNOTES_NAME=Search engine server
+ SOLR_PKG_NAME=solr
-SOLR_BASE_VERSION=4.6.0
-SOLR_PKG_VERSION=$(SOLR_BASE_VERSION)
++SOLR_BASE_VERSION=4.5.0
++SOLR_PKG_VERSION=4.5.0
+ SOLR_RELEASE_VERSION=1
+ SOLR_TARBALL_DST=solr-$(SOLR_BASE_VERSION)-src.tgz
+ SOLR_TARBALL_SRC=$(SOLR_TARBALL_DST)
+ SOLR_DOWNLOAD_PATH=/lucene/solr/$(SOLR_BASE_VERSION)
+ SOLR_SITE=$(APACHE_MIRROR)$(SOLR_DOWNLOAD_PATH)
+ SOLR_ARCHIVE=$(APACHE_ARCHIVE)$(SOLR_DOWNLOAD_PATH)
+ $(eval $(call PACKAGE,solr,SOLR))
+
+ # Crunch
+ CRUNCH_NAME=crunch
+ CRUNCH_RELNOTES_NAME=Java library for MapReduce pipelines
+ CRUNCH_PKG_NAME=crunch
+ CRUNCH_BASE_VERSION=0.7.0
+ CRUNCH_PKG_VERSION=0.7.0
+ CRUNCH_RELEASE_VERSION=1
+ CRUNCH_TARBALL_DST=apache-crunch-$(CRUNCH_BASE_VERSION)-src.tar.gz
+ CRUNCH_TARBALL_SRC=$(CRUNCH_TARBALL_DST)
+ CRUNCH_DOWNLOAD_PATH=/crunch/crunch-$(CRUNCH_BASE_VERSION)
+ CRUNCH_SITE=$(APACHE_MIRROR)$(CRUNCH_DOWNLOAD_PATH)
+ CRUNCH_ARCHIVE=$(APACHE_ARCHIVE)$(CRUNCH_DOWNLOAD_PATH)
+ $(eval $(call PACKAGE,crunch,CRUNCH))
+
# Spark
SPARK_NAME=spark
SPARK_RELNOTES_NAME=Spark
@@@ -251,8 -276,8 +332,8 @@@ $(eval $(call PACKAGE,bigtop-utils,BIGT
BIGTOP_JSVC_NAME=bigtop-jsvc
BIGTOP_JSVC_RELNOTES_NAME=Apache Commons Daemon (jsvc)
BIGTOP_JSVC_PKG_NAME=bigtop-jsvc
- BIGTOP_JSVC_BASE_VERSION=1.0.10
- BIGTOP_JSVC_PKG_VERSION=1.0.10+WANdisco
+ BIGTOP_JSVC_BASE_VERSION=1.0.15
-BIGTOP_JSVC_PKG_VERSION=$(BIGTOP_JSVC_BASE_VERSION)
++BIGTOP_JSVC_PKG_VERSION=$(BIGTOP_JSVC_BASE_VERSION)+WANdisco
BIGTOP_JSVC_RELEASE_VERSION=1
BIGTOP_JSVC_TARBALL_SRC=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION)-native-src.tar.gz
BIGTOP_JSVC_TARBALL_DST=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION).tar.gz
