modified: benchmark/runbench.jl

Author: abcdvvvv

benchmark/runbench.jl

@@ -162,7 +162,7 @@ end
 function parse_object_env(name::AbstractString)
     raw = strip(get(ENV, name, ""))
     isempty(raw) && return Dict{String,Any}()
-    value = JSON.parse(raw)
+    value = JSON.parse(raw; dicttype=Dict{String,Any})
     value isa AbstractDict || error("$(name) must contain a JSON object.")
     Dict{String,Any}(String(key) => item for (key, item) in pairs(value))
 end
@@ -470,18 +470,19 @@ function validate_table_columns(db::SQLite.DB, path::AbstractString, table::Abst
 end
 
 function read_schema_version(db::SQLite.DB, path::AbstractString)
-    metadata_table = DBInterface.execute(db, "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'benchledger_metadata' LIMIT 1") do result
-        iterate(result)
+    metadata_table_found = DBInterface.execute(db, "SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'benchledger_metadata' LIMIT 1") do result
+        iterate(result) !== nothing
     end
-    metadata_table === nothing && error("Unsupported BenchLedger database in $(path): missing benchledger_metadata.")
+    metadata_table_found || error("Unsupported BenchLedger database in $(path): missing benchledger_metadata.")
 
     # Avoid collect(...) here: SQLite.jl can materialize this single-column result as missing.
-    # Use the callback form so the statement is closed after taking the single required row.
-    schema_iter = DBInterface.execute(db, "SELECT value FROM benchledger_metadata WHERE key = 'schema_version' LIMIT 1") do result
-        iterate(result)
+    # Materialize the scalar inside the callback before the statement is closed.
+    schema_version = DBInterface.execute(db, "SELECT value FROM benchledger_metadata WHERE key = 'schema_version' LIMIT 1") do result
+        row_iter = iterate(result)
+        row_iter === nothing ? nothing : String(row_iter[1].value)
     end
-    schema_iter === nothing && error("Unsupported BenchLedger database in $(path): missing benchledger_metadata.schema_version.")
-    String(schema_iter[1].value)
+    schema_version === nothing && error("Unsupported BenchLedger database in $(path): missing benchledger_metadata.schema_version.")
+    schema_version
 end
 
 function validate_schema_version!(db::SQLite.DB, path::AbstractString)
@@ -603,7 +604,7 @@ function migrate_v4_to_v5!(db::SQLite.DB, path::AbstractString)
         for row in DBInterface.execute(db, "SELECT code_state_id, label, code_date, metadata FROM benchmark_code_states_v4")
             old_id = String(row.code_state_id)
             new_id = migrate_v4_code_state_id(old_id)
-            parsed_metadata = JSON.parse(String(row.metadata))
+            parsed_metadata = JSON.parse(String(row.metadata); dicttype=Dict{String,Any})
             identity, metadata = split_v4_code_state_metadata(parsed_metadata)
             persist_labeled_entity!(db, "benchmark_code_states", new_id, canonical_json(identity), canonical_json(metadata), String(row.label); code_date=String(row.code_date))
             code_state_id_map[old_id] = new_id
@@ -612,7 +613,7 @@ function migrate_v4_to_v5!(db::SQLite.DB, path::AbstractString)
         environment_id_map = Dict{String,String}()
         for row in DBInterface.execute(db, "SELECT environment_id, label, metadata FROM benchmark_environments_v4")
             old_id = String(row.environment_id)
-            parsed_metadata = JSON.parse(String(row.metadata))
+            parsed_metadata = JSON.parse(String(row.metadata); dicttype=Dict{String,Any})
             identity, metadata = split_v4_environment_metadata(parsed_metadata)
             identity_json = canonical_json(identity)
             new_id = string("env-", bytes2hex(sha256(codeunits(identity_json))))
@@ -630,11 +631,12 @@ function migrate_v4_to_v5!(db::SQLite.DB, path::AbstractString)
                 (String(row.run_id), code_state_id_map[old_code_state_id], environment_id_map[old_environment_id], String(row.measured_at), String(row.notes), String(row.metadata)))
         end
 
-        SQLite.execute(db, """
-INSERT INTO benchmark_results (run_id, benchmark_id, benchmark_path, benchmark_label, metric_name, statistic, unit, value, better)
-SELECT run_id, benchmark_id, benchmark_path, benchmark_label, metric_name, statistic, unit, value, better
-FROM benchmark_results_v4
-""")
+        SQLite.execute(db,
+            """
+            INSERT INTO benchmark_results (run_id, benchmark_id, benchmark_path, benchmark_label, metric_name, statistic, unit, value, better)
+            SELECT run_id, benchmark_id, benchmark_path, benchmark_label, metric_name, statistic, unit, value, better
+            FROM benchmark_results_v4
+            """)
 
         SQLite.execute(db, "DROP TABLE benchmark_results_v4")
         SQLite.execute(db, "DROP TABLE benchmark_runs_v4")
@@ -649,8 +651,10 @@ FROM benchmark_results_v4
         SQLite.execute(db, "PRAGMA foreign_keys=ON")
     end
 
-    fk_violation = iterate(DBInterface.execute(db, "PRAGMA foreign_key_check"))
-    fk_violation === nothing || error("Foreign-key validation failed after migrating $(path) from schema v4 to v5.")
+    fk_violation = DBInterface.execute(db, "PRAGMA foreign_key_check") do result
+        iterate(result) !== nothing
+    end
+    fk_violation && error("Foreign-key validation failed after migrating $(path) from schema v4 to v5.")
     validate_schema_version!(db, path)
     println("BenchLedger schema migration v4 -> v5 completed.")
 end
@@ -788,24 +792,27 @@ function benchmark_result_row(run_id::AbstractString, row::BenchmarkMetricRow)
 end
 
 function persist_labeled_entity!(db::SQLite.DB, table::AbstractString, id_value::AbstractString, identity::AbstractString, metadata::AbstractString, label::AbstractString; code_date::Union{Nothing,AbstractString}=nothing)
-    code_date === nothing ?
-    DBInterface.execute(db, "INSERT INTO $(table) (id, label, identity, metadata) VALUES (?, ?, ?, ?) ON CONFLICT (id) DO NOTHING", (id_value, label, identity, metadata)) :
+    code_date === nothing ? DBInterface.execute(db, "INSERT INTO $(table) (id, label, identity, metadata) VALUES (?, ?, ?, ?) ON CONFLICT (id) DO NOTHING", (id_value, label, identity, metadata)) :
     DBInterface.execute(db, "INSERT INTO $(table) (id, label, code_date, identity, metadata) VALUES (?, ?, ?, ?, ?) ON CONFLICT (id) DO NOTHING", (id_value, label, code_date, identity, metadata))
 
-    row_iter = DBInterface.execute(db, code_date === nothing ? "SELECT label, identity, metadata FROM $(table) WHERE id = ? LIMIT 1" : "SELECT label, code_date, identity, metadata FROM $(table) WHERE id = ? LIMIT 1", (id_value,)) do result
-        iterate(result)
+    row = DBInterface.execute(db, code_date === nothing ? "SELECT label, identity, metadata FROM $(table) WHERE id = ? LIMIT 1" : "SELECT label, code_date, identity, metadata FROM $(table) WHERE id = ? LIMIT 1", (id_value,)) do result
+        row_iter = iterate(result)
+        row_iter === nothing && return nothing
+        value = row_iter[1]
+        code_date === nothing ?
+            (label=String(value.label), identity=String(value.identity), metadata=String(value.metadata)) :
+            (label=String(value.label), code_date=String(value.code_date), identity=String(value.identity), metadata=String(value.metadata))
     end
-    row_iter === nothing && error("Failed to persist $(table) $(id_value).")
-    row = row_iter[1]
-    code_date === nothing || String(row.code_date) == code_date || error("Conflicting code_date for id=$(id_value) in $(table).")
-    String(row.identity) == identity || error("Conflicting identity for id=$(id_value) in $(table).")
+    row === nothing && error("Failed to persist $(table) $(id_value).")
+    code_date === nothing || row.code_date == code_date || error("Conflicting code_date for id=$(id_value) in $(table).")
+    row.identity == identity || error("Conflicting identity for id=$(id_value) in $(table).")
 
     # Identity is immutable. Metadata is descriptive/extensible, so merge new values
     # into the stored object instead of making metadata part of entity identity.
-    merged_metadata = JSON.parse(String(row.metadata))
-    merge_metadata!(merged_metadata, JSON.parse(metadata))
+    merged_metadata = JSON.parse(row.metadata; dicttype=Dict{String,Any})
+    merge_metadata!(merged_metadata, JSON.parse(metadata; dicttype=Dict{String,Any}))
     merged_metadata_json = canonical_json(merged_metadata)
-    if String(row.label) != label || String(row.metadata) != merged_metadata_json
+    if row.label != label || row.metadata != merged_metadata_json
         DBInterface.execute(db, "UPDATE $(table) SET label = ?, metadata = ? WHERE id = ?", (label, merged_metadata_json, id_value))
     end
 end