Skip to content

Commit

Permalink
Automated Squall installation, and tested it on another machine.
Browse files Browse the repository at this point in the history
  • Loading branch information
avitorovic committed Mar 23, 2016
1 parent ebf84c1 commit 17529eb
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# Paths
.idea
cbin
dbtoaster
eclipse
resources
experiments
Expand Down
2 changes: 1 addition & 1 deletion bin/squall_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
# Reading input paramters
MODE=$1
if [[ "$MODE" != "PLAN_RUNNER" && "$MODE" != "SQL" ]]; then
MODE=SQL
MODE=SQL
else
shift
fi
Expand Down
3 changes: 2 additions & 1 deletion bin/storm_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
STORMNAME=apache-storm-0.9.4

# DBTOASTER installation folder. Only required if QueryPlan uses DBToasterJoinComponent
DBTOASTER_HOME=/tmp/dbtoaster
#DBTOASTER_HOME=/tmp/dbtoaster
DBTOASTER_HOME=../dbtoaster
export DBTOASTER_HOME=$DBTOASTER_HOME
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ lazy val squall = (project in file("squall-core")).
"net.sf.opencsv" % "opencsv" % "2.3",
// bdb-je: 5.0.84 -> 5.0.73
"com.sleepycat" % "je" % "5.0.73",
// storm-core: 0.9.2-incubating -> 0.9.3
"org.apache.storm" % "storm-core" % "0.9.3" % "provided",
// storm-core: 0.9.2-incubating -> 0.9.4
"org.apache.storm" % "storm-core" % "0.9.4" % "provided",
"org.slf4j" % "log4j-over-slf4j" % "1.7.12",
//"io.dropwizard" % "dropwizard-metrics" % "0.8.1",
//"org.apache.storm" % "storm-starter" % "0.9.3",
//"org.apache.storm" % "storm-starter" % "0.9.4",
"junit" % "junit" % "4.12" % Test,
"com.novocode" % "junit-interface" % "0.11" % Test,
"org.apache.hadoop" % "hadoop-client" % "2.2.0" exclude("org.slf4j", "slf4j-log4j12"),
Expand Down Expand Up @@ -183,7 +183,7 @@ lazy val functional = (project in file("squall-functional")).
(test in Test).value
},
name := "squall-frontend",
libraryDependencies += "org.apache.storm" % "storm-core" % "0.9.3" % "provided",
libraryDependencies += "org.apache.storm" % "storm-core" % "0.9.4" % "provided",
libraryDependencies <+= (scalaVersion)("org.scala-lang" % "scala-reflect" % _),
libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.4" % Test,
// Interactive mode
Expand Down

0 comments on commit 17529eb

Please sign in to comment.