You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2017/02/11 22:00:14 UTC
[07/10] incubator-predictionio git commit: Merge branch
'elasticsearch5-support' of https://github.com/haginot/incubator-predictionio
into es5
Merge branch 'elasticsearch5-support' of https://github.com/haginot/incubator-predictionio into es5
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/d039dda5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/d039dda5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/d039dda5
Branch: refs/heads/feature/es5
Commit: d039dda52a9dd550015016f41ee33a33851e3edd
Parents: 9b62980 89c9d26
Author: Donald Szeto <do...@apache.org>
Authored: Sat Feb 11 08:56:44 2017 -0800
Committer: Donald Szeto <do...@apache.org>
Committed: Sat Feb 11 08:56:44 2017 -0800
----------------------------------------------------------------------
.travis.yml | 4 +-
bin/install.sh | 8 +-
bin/pio-start-all | 99 ++++---
bin/pio-stop-all | 50 ++--
build.sbt | 6 +-
conf/pio-env.sh.template | 14 +-
core/build.sbt | 41 +--
data/build.sbt | 50 ++--
.../storage/elasticsearch/ESAccessKeys.scala | 154 ++++++----
.../data/storage/elasticsearch/ESApps.scala | 176 ++++++++----
.../data/storage/elasticsearch/ESChannels.scala | 144 ++++++----
.../elasticsearch/ESEngineInstances.scala | 246 +++++++++++-----
.../elasticsearch/ESEvaluationInstances.scala | 186 +++++++-----
.../storage/elasticsearch/ESEventsUtil.scala | 125 ++++++++
.../data/storage/elasticsearch/ESLEvents.scala | 286 +++++++++++++++++++
.../data/storage/elasticsearch/ESPEvents.scala | 145 ++++++++++
.../storage/elasticsearch/ESSequences.scala | 71 +++--
.../data/storage/elasticsearch/ESUtils.scala | 157 ++++++++--
.../storage/elasticsearch/StorageClient.scala | 40 ++-
.../storage/elasticsearch1/ESAccessKeys.scala | 119 ++++++++
.../data/storage/elasticsearch1/ESApps.scala | 130 +++++++++
.../storage/elasticsearch1/ESChannels.scala | 117 ++++++++
.../elasticsearch1/ESEngineInstances.scala | 158 ++++++++++
.../elasticsearch1/ESEngineManifests.scala | 84 ++++++
.../elasticsearch1/ESEvaluationInstances.scala | 136 +++++++++
.../storage/elasticsearch1/ESSequences.scala | 64 +++++
.../data/storage/elasticsearch1/ESUtils.scala | 48 ++++
.../storage/elasticsearch1/StorageClient.scala | 50 ++++
.../data/storage/elasticsearch1/package.scala | 25 ++
project/Build.scala | 3 +
tests/Dockerfile | 6 +-
tests/docker-files/env-conf/pio-env.sh | 16 +-
tests/run_docker.sh | 6 +-
tools/build.sbt | 3 +-
34 files changed, 2474 insertions(+), 493 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d039dda5/bin/install.sh
----------------------------------------------------------------------
diff --cc bin/install.sh
index e485df9,2f7c162..ae1a7eb
--- a/bin/install.sh
+++ b/bin/install.sh
@@@ -18,9 -18,11 +18,10 @@@
#
OS=`uname`
- SPARK_VERSION=1.6.2
-PIO_VERSION=0.11.0-SNAPSHOT
+ SPARK_VERSION=1.6.3
# Looks like support for Elasticsearch 2.0 will require 2.0 so deferring
- ELASTICSEARCH_VERSION=1.7.5
+ #ELASTICSEARCH_VERSION=1.7.6
+ ELASTICSEARCH_VERSION=5.1.2
HBASE_VERSION=1.2.2
POSTGRES_VERSION=9.4-1204.jdbc41
MYSQL_VERSION=5.1.37
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d039dda5/build.sbt
----------------------------------------------------------------------
diff --cc build.sbt
index fc09ee5,776b2ad..ce626ce
--- a/build.sbt
+++ b/build.sbt
@@@ -38,9 -40,9 +40,9 @@@ elasticsearch1Version in ThisBuild := "
json4sVersion in ThisBuild := "3.2.10"
- sparkVersion in ThisBuild := "1.4.0"
+ sparkVersion in ThisBuild := "1.6.3"
-lazy val pioBuildInfoSettings = buildInfoSettings ++ Seq(
+val pioBuildInfoSettings = buildInfoSettings ++ Seq(
sourceGenerators in Compile <+= buildInfo,
buildInfoKeys := Seq[BuildInfoKey](
name,
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d039dda5/tests/Dockerfile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/d039dda5/tools/build.sbt
----------------------------------------------------------------------