From 4ad7f106af8cbe7b6a73d1eea8f37a7371adf4c8 Mon Sep 17 00:00:00 2001 From: "P. Oscar Boykin" Date: Fri, 3 Apr 2015 13:53:05 -1000 Subject: [PATCH] Move graph processing into a zero dependency library (usable from say scalding) --- project/Build.scala | 52 +++++++++---------- .../summingbird/graph/DependantGraph.scala | 0 .../com/twitter/summingbird/graph/Expr.scala | 0 .../summingbird/graph/ExpressionDag.scala | 0 .../com/twitter/summingbird/graph/HMap.scala | 0 .../twitter/summingbird/graph/package.scala | 0 .../graph/ExpressionDagTests.scala | 0 .../twitter/summingbird/graph/HMapTests.scala | 0 .../summingbird/graph/LiteralTests.scala | 0 9 files changed, 26 insertions(+), 26 deletions(-) rename {summingbird-core => summingbird-graph}/src/main/scala/com/twitter/summingbird/graph/DependantGraph.scala (100%) rename {summingbird-core => summingbird-graph}/src/main/scala/com/twitter/summingbird/graph/Expr.scala (100%) rename {summingbird-core => summingbird-graph}/src/main/scala/com/twitter/summingbird/graph/ExpressionDag.scala (100%) rename {summingbird-core => summingbird-graph}/src/main/scala/com/twitter/summingbird/graph/HMap.scala (100%) rename {summingbird-core => summingbird-graph}/src/main/scala/com/twitter/summingbird/graph/package.scala (100%) rename {summingbird-core => summingbird-graph}/src/test/scala/com/twitter/summingbird/graph/ExpressionDagTests.scala (100%) rename {summingbird-core => summingbird-graph}/src/test/scala/com/twitter/summingbird/graph/HMapTests.scala (100%) rename {summingbird-core => summingbird-graph}/src/test/scala/com/twitter/summingbird/graph/LiteralTests.scala (100%) diff --git a/project/Build.scala b/project/Build.scala index 646415940..aa449bc78 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -19,30 +19,27 @@ object SummingbirdBuild extends Build { def isScala210x(scalaVersion: String) = scalaBinaryVersion(scalaVersion) == "2.10" - val scalaCheckVersion = "1.11.5" - val hadoopVersion = "1.2.1" val algebirdVersion = "0.9.0" val bijectionVersion = "0.7.2" val chillVersion = "0.5.2" - val slf4jVersion = "1.6.6" - val parquetVersion = "1.6.0rc4" - + val commonsHttpClientVersion = "3.1" + val commonsLangVersion = "2.6" val dfsDatastoresVersion = "1.3.6" - val scaldingVersion = "0.13.1" - val storehausVersion = "0.10.0" - val utilVersion = "6.3.8" - val finagleVersion = "6.12.2" - val tormentaVersion = "0.9.0" + val hadoopVersion = "1.2.1" val junitVersion = "4.11" val log4jVersion = "1.2.16" - val stormVersion = "0.9.0-wip15" - val commonsLangVersion = "2.6" val novocodeJunitVersion = "0.10" - val specs2Version = "1.13" - + val parquetVersion = "1.6.0rc4" + val scalaCheckVersion = "1.11.5" + val scaldingVersion = "0.13.1" + val slf4jVersion = "1.6.6" val sparkCoreVersion ="1.2.0" - val commonsHttpClientVersion = "3.1" + val specs2Version = "1.13" + val storehausVersion = "0.10.0" + val stormVersion = "0.9.0-wip15" + val tormentaVersion = "0.9.0" + val utilVersion = "6.3.8" val extraSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalariformSettings @@ -154,22 +151,23 @@ object SummingbirdBuild extends Build { publish := { }, // skip publishing for this root project. publishLocal := { } ).aggregate( - summingbirdCore, - summingbirdCoreJava, summingbirdBatch, summingbirdBatchHadoop, - summingbirdOnline, + summingbirdBuilder, + summingbirdChill, summingbirdClient, - summingbirdStorm, - summingbirdStormTest, - summingbirdStormJava, + summingbirdCore, + summingbirdCoreJava, + summingbirdCoreTest, + summingbirdExample, + summingbirdGraph, + summingbirdOnline, summingbirdScalding, summingbirdScaldingTest, summingbirdSpark, - summingbirdBuilder, - summingbirdChill, - summingbirdExample, - summingbirdCoreTest + summingbirdStorm, + summingbirdStormJava, + summingbirdStormTest ) /** @@ -224,12 +222,14 @@ object SummingbirdBuild extends Build { lazy val summingbirdCore = module("core").settings( libraryDependencies += "com.twitter" %% "algebird-core" % algebirdVersion - ) + ).dependsOn(summingbirdGraph) lazy val summingbirdCoreJava = module("core-java").dependsOn( summingbirdCore % "test->test;compile->compile" ) + lazy val summingbirdGraph = module("graph") + lazy val summingbirdOnline = module("online").settings( libraryDependencies ++= Seq( "com.twitter" %% "algebird-core" % algebirdVersion, diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/graph/DependantGraph.scala b/summingbird-graph/src/main/scala/com/twitter/summingbird/graph/DependantGraph.scala similarity index 100% rename from summingbird-core/src/main/scala/com/twitter/summingbird/graph/DependantGraph.scala rename to summingbird-graph/src/main/scala/com/twitter/summingbird/graph/DependantGraph.scala diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/graph/Expr.scala b/summingbird-graph/src/main/scala/com/twitter/summingbird/graph/Expr.scala similarity index 100% rename from summingbird-core/src/main/scala/com/twitter/summingbird/graph/Expr.scala rename to summingbird-graph/src/main/scala/com/twitter/summingbird/graph/Expr.scala diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/graph/ExpressionDag.scala b/summingbird-graph/src/main/scala/com/twitter/summingbird/graph/ExpressionDag.scala similarity index 100% rename from summingbird-core/src/main/scala/com/twitter/summingbird/graph/ExpressionDag.scala rename to summingbird-graph/src/main/scala/com/twitter/summingbird/graph/ExpressionDag.scala diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/graph/HMap.scala b/summingbird-graph/src/main/scala/com/twitter/summingbird/graph/HMap.scala similarity index 100% rename from summingbird-core/src/main/scala/com/twitter/summingbird/graph/HMap.scala rename to summingbird-graph/src/main/scala/com/twitter/summingbird/graph/HMap.scala diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/graph/package.scala b/summingbird-graph/src/main/scala/com/twitter/summingbird/graph/package.scala similarity index 100% rename from summingbird-core/src/main/scala/com/twitter/summingbird/graph/package.scala rename to summingbird-graph/src/main/scala/com/twitter/summingbird/graph/package.scala diff --git a/summingbird-core/src/test/scala/com/twitter/summingbird/graph/ExpressionDagTests.scala b/summingbird-graph/src/test/scala/com/twitter/summingbird/graph/ExpressionDagTests.scala similarity index 100% rename from summingbird-core/src/test/scala/com/twitter/summingbird/graph/ExpressionDagTests.scala rename to summingbird-graph/src/test/scala/com/twitter/summingbird/graph/ExpressionDagTests.scala diff --git a/summingbird-core/src/test/scala/com/twitter/summingbird/graph/HMapTests.scala b/summingbird-graph/src/test/scala/com/twitter/summingbird/graph/HMapTests.scala similarity index 100% rename from summingbird-core/src/test/scala/com/twitter/summingbird/graph/HMapTests.scala rename to summingbird-graph/src/test/scala/com/twitter/summingbird/graph/HMapTests.scala diff --git a/summingbird-core/src/test/scala/com/twitter/summingbird/graph/LiteralTests.scala b/summingbird-graph/src/test/scala/com/twitter/summingbird/graph/LiteralTests.scala similarity index 100% rename from summingbird-core/src/test/scala/com/twitter/summingbird/graph/LiteralTests.scala rename to summingbird-graph/src/test/scala/com/twitter/summingbird/graph/LiteralTests.scala