You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by ta...@apache.org on 2018/09/20 19:47:44 UTC
[1/3] incubator-spot git commit: Version updated of sbt assembly
Repository: incubator-spot
Updated Branches:
refs/heads/master bcda92ea3 -> 546139f5a
Version updated of sbt assembly
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/bf5b9302
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/bf5b9302
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/bf5b9302
Branch: refs/heads/master
Commit: bf5b9302011c1f11f3ccab11182269d4ca44a546
Parents: 9215d81
Author: Sun Hao <29...@qq.com>
Authored: Sat Jan 27 15:02:51 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Sat Jan 27 15:02:51 2018 +0800
----------------------------------------------------------------------
spot-ml/project/plugins.sbt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/bf5b9302/spot-ml/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/spot-ml/project/plugins.sbt b/spot-ml/project/plugins.sbt
index 55de9d9..30d2f56 100644
--- a/spot-ml/project/plugins.sbt
+++ b/spot-ml/project/plugins.sbt
@@ -15,4 +15,4 @@
* limitations under the License.
*/
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
[3/3] incubator-spot git commit: Merge branch 'master' into pr-137
Posted by ta...@apache.org.
Merge branch 'master' into pr-137
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/546139f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/546139f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/546139f5
Branch: refs/heads/master
Commit: 546139f5ae8d4c11821dea7cae45462a61e2e81c
Parents: 5957e22 bcda92e
Author: Tadd Wood <ta...@arcadiadata.com>
Authored: Thu Sep 20 12:46:36 2018 -0700
Committer: Tadd Wood <ta...@arcadiadata.com>
Committed: Thu Sep 20 12:46:36 2018 -0700
----------------------------------------------------------------------
README.md | 19 +-
issues-subscribe@spot.incubator.apache.org | 0
spot-ingest/README.md | 6 +
spot-ingest/common/configurator.py | 119 ++++++++++
spot-ingest/common/hdfs_client.py | 233 +++++++++++++++++++
spot-ingest/common/hive_engine.py | 73 ++++++
spot-ingest/common/kafka_client.py | 193 ++++++++++++----
spot-ingest/common/kerberos.py | 42 ++--
spot-ingest/kerberos-requirements.txt | 4 +
spot-ingest/master_collector.py | 21 +-
spot-ingest/pipelines/dns/collector.py | 133 +++++++----
spot-ingest/pipelines/dns/worker.py | 141 +++++++++---
spot-ingest/pipelines/flow/collector.py | 111 +++++----
spot-ingest/pipelines/flow/worker.py | 193 ++++++++++++----
spot-ingest/pipelines/proxy/bluecoat.py | 177 +++++++++-----
spot-ingest/pipelines/proxy/collector.py | 6 +-
spot-ingest/requirements.txt | 5 +-
spot-ingest/start_ingest_standalone.sh | 2 +-
spot-ingest/worker.py | 6 +-
spot-oa/api/resources/configurator.py | 69 +++++-
spot-oa/api/resources/hdfs_client.py | 201 ++++++++++++++--
spot-oa/api/resources/impala_engine.py | 29 ++-
spot-oa/kerberos-requirements.txt | 3 +
spot-oa/oa/components/data/hive.py | 1 +
spot-oa/oa/components/data/impala.py | 25 +-
spot-oa/oa/utils.py | 282 +++++++++++------------
spot-oa/requirements.txt | 2 +
spot-setup/KERBEROS.md | 50 ++++
spot-setup/README.md | 7 +
spot-setup/beeline/create_dns_parquet.hql | 162 +++++++++++++
spot-setup/beeline/create_flow_parquet.hql | 194 ++++++++++++++++
spot-setup/beeline/create_proxy_parquet.hql | 179 ++++++++++++++
spot-setup/create_dns_parquet.hql | 163 -------------
spot-setup/create_flow_parquet.hql | 195 ----------------
spot-setup/create_proxy_parquet.hql | 177 --------------
spot-setup/hdfs_setup.sh | 120 ++++++++--
spot-setup/hive/create_dns_parquet.hql | 165 +++++++++++++
spot-setup/hive/create_flow_parquet.hql | 197 ++++++++++++++++
spot-setup/hive/create_proxy_parquet.hql | 179 ++++++++++++++
spot-setup/impala/create_dns_parquet.hql | 163 +++++++++++++
spot-setup/impala/create_flow_parquet.hql | 195 ++++++++++++++++
spot-setup/impala/create_proxy_parquet.hql | 177 ++++++++++++++
spot-setup/spot.conf | 28 ++-
43 files changed, 3407 insertions(+), 1040 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-spot git commit: Usage of assembly changed
Posted by ta...@apache.org.
Usage of assembly changed
Because the version of assembly updated, the usage has changed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/5957e228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/5957e228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/5957e228
Branch: refs/heads/master
Commit: 5957e2287cafd5947dbe614bf428ae14d614fbe2
Parents: bf5b930
Author: Sun Hao <29...@qq.com>
Authored: Sat Jan 27 15:05:17 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Sat Jan 27 15:05:17 2018 +0800
----------------------------------------------------------------------
spot-ml/build.sbt | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5957e228/spot-ml/build.sbt
----------------------------------------------------------------------
diff --git a/spot-ml/build.sbt b/spot-ml/build.sbt
index 5ffc520..cc83ed0 100644
--- a/spot-ml/build.sbt
+++ b/spot-ml/build.sbt
@@ -23,9 +23,7 @@ scalaVersion := "2.11.8"
val sparkVersion = "2.1.0"
-import sbtassembly.Plugin.AssemblyKeys._
-
-assemblySettings
+baseAssemblySettings
libraryDependencies += "org.apache.spark" %% "spark-core" % sparkVersion % "provided"
libraryDependencies += "org.apache.spark" %% "spark-mllib" % sparkVersion
@@ -37,7 +35,7 @@ resolvers += Resolver.sonatypeRepo("public")
val meta = """META.INF(.)*""".r
-mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => {
+assemblyMergeStrategy in assembly := {
case PathList("org", "apache", "commons", xs@_*) => MergeStrategy.last
case PathList("com", "esotericsoftware", "minlog", xs@_*) => MergeStrategy.last
case PathList("com", "google", xs@_*) => MergeStrategy.last
@@ -50,7 +48,6 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => {
case meta(_) => MergeStrategy.discard
case x => MergeStrategy.first
}
-}
// super important with multiple tests running spark Contexts
parallelExecution in Test := false
@@ -69,4 +66,4 @@ getTop1MFileFromAlexa := {
}
}
-resourceGenerators in Compile <+= getTop1MFileFromAlexa
\ No newline at end of file
+resourceGenerators in Compile += getTop1MFileFromAlexa