Merge branch 'deephaven:main' into handle-per-operation-logging

src/main/resources/io/deephaven/benchmark/run/profile/queries/publish.py

@@ -15,22 +15,25 @@
 # Used to provide platform (e.g. hardware, jvm version) for SVG footer during publish
 platform_details = bench_platforms.sort_descending(['run_id']).group_by(['run_id']).first_by().ungroup()
 
-# Ensure that deleted benchmarks are not included in the scores
-latest_benchmark_names = bench_results.view([
-    'epoch_day=(int)(timestamp/1000/60/60/24)','benchmark_name'
-]).group_by(['epoch_day']).sort_descending(['epoch_day']).first_by().ungroup()
+# Return a table containing only non-obsolete benchmarks having at least two of the most recent versions
+# Candidate for pulling up into deephaven_tables.py
+def latest_comparable_benchmarks(results_tbl):
+    latest_benchmark_names = results_tbl.view([
+        'epoch_day=(int)(Duration.ofMillis(timestamp).toDays() / 2)','benchmark_name'
+    ]).group_by(['epoch_day']).sort_descending(['epoch_day']).first_by().ungroup()
 
-# Ensure the newest benchmarks, which have no past data, are not included in scores
-new_benchmark_names = bench_results.where_in(
-    latest_benchmark_names,['benchmark_name=benchmark_name']
-).group_by(['benchmark_name']).where(['len(op_rate) < 2']).ungroup()
+    new_benchmark_names = results_tbl.where_in(
+        latest_benchmark_names,['benchmark_name=benchmark_name']
+    ).group_by(['benchmark_name']).where(['len(op_rate) < 2']).ungroup()
 
-# Get benchmarks that have enough data to compare multiple days
-bench_results = bench_results.where_in(
-    latest_benchmark_names,['benchmark_name']
-).where_not_in(
-    new_benchmark_names,['benchmark_name']
-)
+    results_tbl = results_tbl.where_in(
+        latest_benchmark_names,['benchmark_name']  # Exclude obsolete benchmarks
+    ).where_not_in(
+        new_benchmark_names,['benchmark_name']  # Exclude single-version benchmarks
+    )
+    return results_tbl
+
+bench_results = latest_comparable_benchmarks(bench_results)
 
 # Get static benchmarks and compare to last 5 days and previous release
 nightly_score = bench_results.where([

src/main/resources/io/deephaven/benchmark/run/profile/queries/release.py

@@ -14,11 +14,11 @@
     benchmark_max_runs_arg = 5  # Latest X runs to include   
     exec(r.read().decode(), globals(), locals())
 
-# Return a table containing only non-obsolete benchmarks that have at least two versions
+# Return a table containing only non-obsolete benchmarks having at least two of the most recent versions
 # Candidate for pulling up into deephaven_tables.py
 def latest_comparable_benchmarks(results_tbl):
     latest_benchmark_names = results_tbl.view([
-        'epoch_day=(int)(timestamp/1000/60/60/24)','benchmark_name'
+        'epoch_day=(int)(Duration.ofMillis(timestamp).toDays() / 2)','benchmark_name'
     ]).group_by(['epoch_day']).sort_descending(['epoch_day']).first_by().ungroup()
 
     new_benchmark_names = results_tbl.where_in(
@@ -29,10 +29,10 @@ def latest_comparable_benchmarks(results_tbl):
         latest_benchmark_names,['benchmark_name']  # Exclude obsolete benchmarks
     ).where_not_in(
         new_benchmark_names,['benchmark_name']  # Exclude single-version benchmarks
-    ).sort_descending(['timestamp']).first_by(['benchmark_name'])
+    )
     return results_tbl
 
-newest_benchmarks = latest_comparable_benchmarks(bench_results_change)
+newest_benchmarks = latest_comparable_benchmarks(bench_results_change).sort_descending(['timestamp']).first_by(['benchmark_name'])
 
 from deephaven import numpy as dhnp