Merge branch 'master' into add_count_filter

Conflicts: systemtest/edu/washington/escience/myria/systemtest/ConnectedComponentTest.java systemtest/edu/washington/escience/myria/systemtest/JsonQuerySubmitTest.java
uwescience · Jul 11, 2016 · ed6f6c1 · ed6f6c1
2 parents baa35db + 41b59a8
commit ed6f6c1
Show file tree

Hide file tree

Showing 91 changed files with 539 additions and 8,135 deletions.
diff --git a/myriadeploy/deployment.cfg.local b/myriadeploy/deployment.cfg.local
@@ -3,6 +3,7 @@
 path = /tmp/myria
 name = twoNodeLocalParallel
 dbms = sqlite
+database_name = myria
 rest_port = 8753
 # Uncomment if need to set a specific username; does not work for localhost
 #username = dhalperi

diff --git a/myriadeploy/kill_all_java_processes.py b/myriadeploy/kill_all_java_processes.py
diff --git a/myriadeploy/launch_cluster.sh b/myriadeploy/launch_cluster.sh
diff --git a/myriadeploy/launch_local_cluster b/myriadeploy/launch_local_cluster
@@ -0,0 +1,4 @@
+#!/bin/bash
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cp -n "$REPO_ROOT/myriadeploy/deployment.cfg.local" "$REPO_ROOT/myriadeploy/deployment.cfg"
+$JAVA_HOME/bin/java -cp "$REPO_ROOT/build/libs/myria-0.1-all.jar" edu.washington.escience.myria.daemon.MyriaDriverLauncher -runtimeClass org.apache.reef.runtime.local.client.LocalRuntimeConfiguration -configPath "$REPO_ROOT/myriadeploy" -javaLibPath "$REPO_ROOT/build/libs" -nativeLibPath "$REPO_ROOT/lib"
diff --git a/myriadeploy/relaunch_updated_myria.sh b/myriadeploy/relaunch_updated_myria.sh
diff --git a/myriadeploy/setup_cluster.py b/myriadeploy/setup_cluster.py
diff --git a/myriadeploy/start_master.py b/myriadeploy/start_master.py
diff --git a/myriadeploy/start_workers.py b/myriadeploy/start_workers.py
diff --git a/myriadeploy/stop_all_by_force.py b/myriadeploy/stop_all_by_force.py
diff --git a/myriadeploy/using_deployment_utils.sh b/myriadeploy/using_deployment_utils.sh