make trace count a property of DB not build file

Author: fhackett

omnilink/createTables.sql

@@ -1,40 +1,49 @@
+CREATE TABLE IF NOT EXISTS config (
+    id VARCHAR PRIMARY KEY,
+    expected_experiment_count INTEGER,
+);
+
 CREATE TABLE IF NOT EXISTS experiment (
-    id VARCHAR,
+    config_id VARCHAR,
+    idx INTEGER,
     github VARCHAR,
     branch VARCHAR,
     spec_path VARCHAR,
     mc_spec_path VARCHAR,
     mc_config_path VARCHAR,
     start_time TIMESTAMP,
     end_time TIMESTAMP,
-    PRIMARY KEY (id),
+    PRIMARY KEY (config_id, idx),
 );
 
 CREATE TABLE IF NOT EXISTS trace (
-    experiment_id VARCHAR,
+    config_id VARCHAR,
+    experiment_idx INTEGER,
     id integer,
     trace BYTEA,
-    PRIMARY KEY (experiment_id, id),
-    FOREIGN KEY (experiment_id) REFERENCES experiment(id),
+    PRIMARY KEY (config_id, experiment_idx, id),
+    FOREIGN KEY (config_id, experiment_idx) REFERENCES experiment(config_id, idx),
 );
 
 CREATE TABLE IF NOT EXISTS gather_log (
-    experiment_id VARCHAR,
+    config_id VARCHAR,
+    experiment_idx INTEGER,
     name VARCHAR,
     text VARCHAR,
-    PRIMARY KEY (experiment_id, name),
-    FOREIGN KEY (experiment_id) REFERENCES experiment(id),
+    PRIMARY KEY (config_id, experiment_idx, name),
+    FOREIGN KEY (config_id, experiment_idx) REFERENCES experiment(config_id, idx),
 );
 
 CREATE TABLE IF NOT EXISTS validation (
-    experiment_id VARCHAR,
+    config_id VARCHAR,
+    experiment_idx INTEGER,
     log_txt VARCHAR,
     start_time TIMESTAMP,
     end_time TIMESTAMP,
     success BOOLEAN,
     counter_example_bin BYTEA,
-    PRIMARY KEY (experiment_id),
-    FOREIGN KEY (experiment_id) REFERENCES experiment(id),
+    PRIMARY KEY (config_id, experiment_idx),
+    FOREIGN KEY (config_id, experiment_idx) REFERENCES experiment(config_id, idx),
     CONSTRAINT fail_has_counterexample CHECK (
         CASE
             WHEN success THEN counter_example_bin IS NULL

omnilink/package.mill

@@ -11,7 +11,7 @@ object evalDB extends build.omnilink.EvalDB:
   def dbPath = os.sub / "omnilink" / "eval.duckdb"
 end evalDB
 
-trait TConfig extends TracingConfig:
+trait TConfig extends TracingConfigModule:
   def evalDB = ModuleRef(build.omnilink.evalDB)
 end TConfig
 
@@ -53,13 +53,11 @@ object wiredtiger extends TraceEvalSpecModule:
       Task.Source(wiredtiger.moduleDir / "MCStorageValidate.tla")
     def specToValidateMCConfig =
       Task.Source(wiredtiger.moduleDir / "MCStorageValidate.cfg")
-    def configs = Seq(
-      Config(
-        threadCount = 5,
-        operationCount = 100,
-        tracesNeeded = 800,
-      ),
-    )
+
+    object `defaultConfig` extends ConfigModule:
+      def threadCount = 5
+      def operationCount = 100
+    end `defaultConfig`
   end release_11_3_1
 
   trait TracingConfig extends TConfig:
@@ -147,13 +145,11 @@ object setbench extends TraceEvalSpecModule:
   object brown_ext_chromatic_augment_lf extends TracingConfig:
     def dsSubFolder = os.sub / "ds" / "brown_ext_chromatic_augment_lf"
     def commitHash = ModuleRef(repo.paper1)
-    def configs = Seq(
-      Config(
-        threadCount = 5,
-        operationCount = 100,
-        tracesNeeded = 30,
-      ),
-    )
+
+    object `defaultConfig` extends ConfigModule:
+      def threadCount = 5
+      def operationCount = 100
+    end `defaultConfig`
   end brown_ext_chromatic_augment_lf
 
   trait TracingConfig extends TConfig: