From 890ce4f355eb3eb900bde0834a34c7498199e3e4 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Fri, 19 Jul 2024 16:25:12 +0200
Subject: syz-covermerger: factor out db init code

---
 tools/syz-bq.sh                  | 33 ---------------------------------
 tools/syz-covermerger/init_db.sh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 33 deletions(-)
 create mode 100644 tools/syz-covermerger/init_db.sh

diff --git a/tools/syz-bq.sh b/tools/syz-bq.sh
index 4bdf0ccd8..491f1a400 100755
--- a/tools/syz-bq.sh
+++ b/tools/syz-bq.sh
@@ -49,39 +49,6 @@ then
   exit
 fi
 
-db="coverage"
-
-# it also allows to early check gcloud credentials
-echo "making sure spanner table 'files' exists"
-create_table=$( echo -n '
-CREATE TABLE IF NOT EXISTS
-  files (
-    "session" text,
-    "filepath" text,
-    "instrumented" bigint,
-    "covered" bigint,
-  PRIMARY KEY
-    (session, filepath) );')
-gcloud spanner databases ddl update $db --instance=syzbot --project=syzkaller \
- --ddl="$create_table"
-
-echo "making sure spanner table 'merge_history' exists"
-create_table=$( echo -n '
-CREATE TABLE IF NOT EXISTS
-  merge_history (
-    "namespace" text,
-    "repo" text,
-    "duration" bigint,
-    "dateto" date,
-    "session" text,
-    "time" timestamptz,
-    "commit" text,
-    "totalrows" bigint,
-  PRIMARY KEY
-    (namespace, repo, duration, dateto) );')
-gcloud spanner databases ddl update $db --instance=syzbot --project=syzkaller \
- --ddl="$create_table"
-
 echo "Workdir: $workdir"
 base_dir="${workdir}repos/linux_kernels"
 if [ ! -d $base_dir ]; then
diff --git a/tools/syz-covermerger/init_db.sh b/tools/syz-covermerger/init_db.sh
new file mode 100644
index 000000000..f7e185221
--- /dev/null
+++ b/tools/syz-covermerger/init_db.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Copyright 2024 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+set -e # exit on any problem
+set -o pipefail
+
+db="coverage"
+echo "making sure spanner table 'files' exists"
+create_table=$( echo -n '
+CREATE TABLE IF NOT EXISTS
+  files (
+    "session" text,
+    "filepath" text,
+    "instrumented" bigint,
+    "covered" bigint,
+  PRIMARY KEY
+    (session, filepath) );')
+gcloud spanner databases ddl update $db --instance=syzbot --project=syzkaller \
+ --ddl="$create_table"
+
+echo "making sure spanner table 'merge_history' exists"
+create_table=$( echo -n '
+CREATE TABLE IF NOT EXISTS
+  merge_history (
+    "namespace" text,
+    "repo" text,
+    "duration" bigint,
+    "dateto" date,
+    "session" text,
+    "time" timestamptz,
+    "commit" text,
+    "totalrows" bigint,
+  PRIMARY KEY
+    (namespace, repo, duration, dateto) );')
+gcloud spanner databases ddl update $db --instance=syzbot --project=syzkaller \
+ --ddl="$create_table"
-- 
cgit mrf-deployment