Fixup start_manager.sh script.

ryzhyk · ryzhyk · commit 68f65e42f3e9 · 2023-05-18T10:57:05.000-07:00
- Support running with a regular Postgres server instead of `pg-embed`
- Don't run `git submodule update` -- use whatever version of the SQL
  compiler the user has checked out.
diff --git a/scripts/start_manager.sh b/scripts/start_manager.sh
@@ -10,13 +10,8 @@ MANAGER_DIR="${ROOT_DIR}/crates/pipeline_manager"
 #    exit 1
 # fi
 
-if [[ ! -e ${SQL_COMPILER_DIR}/.git || -z $(cd ${SQL_COMPILER_DIR} && git branch --show-current) ]]
-then
-    git submodule update --init
-fi
 cd "${SQL_COMPILER_DIR}/SQL-compiler" && mvn -DskipTests package
 
-
 WORKING_DIR="${1:-${HOME}/.dbsp}"
 
 # This is the most portable way to get an absolute path since
@@ -31,13 +26,22 @@ pkill dbsp_pipeline_
 # Wait for manager process to exit.
 while ps -p $(pgrep dbsp_pipeline_) > /dev/null; do sleep 1; done
 
-set -e
+set -ex
+
+# If $WITH_POSTGRES is defined, manager should use a real Postgres server
+# instead of pg-embed.
+if [ -z "$WITH_POSTGRES" ]; then
+    PG_EMBED="--features pg-embed"
+    DB_CONNECTION_STRING="--db-connection-string=postgres-embed"
+else
+    DB_CONNECTION_STRING="--db-connection-string=postgresql://${PGUSER}@localhost"
+fi
 
-cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo build --release --features pg-embed
-cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo run --release --features pg-embed -- \
+cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo build --release $PG_EMBED
+cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo run --release $PG_EMBED -- \
     --bind-address="${BIND_ADDRESS}" \
     --working-directory="${WORKING_DIR_ABS}" \
     --sql-compiler-home="${SQL_COMPILER_DIR}" \
     --dbsp-override-path="${ROOT_DIR}" \
     --unix-daemon \
-    --db-connection-string="postgres-embed"
+    ${DB_CONNECTION_STRING}
