Remove machine_id from group by (#62)

conbench · May 17, 2021 · b877de6 · b877de6
1 parent 4db84c8
commit b877de6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/conbench/entities/distribution.py b/conbench/entities/distribution.py
@@ -100,7 +100,6 @@ def get_distribution(repository, sha, case_id, context_id, machine_hash, limit):
         .group_by(
             Summary.case_id,
             Summary.context_id,
-            Summary.machine_id,
             Machine.name,
             Machine.cpu_core_count,
             Machine.cpu_thread_count,

diff --git a/conbench/tests/entities/test_distribution.py b/conbench/tests/entities/test_distribution.py
@@ -63,7 +63,7 @@
 FROM ordered_commits) AS commit_index 
 WHERE commit_index.sha = :sha_1)
  LIMIT :param_1) AS commits_up ON commits_up.id = run.commit_id 
-WHERE run.name LIKE :name_1 AND summary.case_id = :case_id_1 AND summary.context_id = :context_id_1 AND concat(machine.name, :concat_4, machine.cpu_core_count, :concat_5, machine.cpu_thread_count, :concat_6, machine.memory_bytes) = :param_2 GROUP BY summary.case_id, summary.context_id, summary.machine_id, machine.name, machine.cpu_core_count, machine.cpu_thread_count, machine.memory_bytes"""  # noqa
+WHERE run.name LIKE :name_1 AND summary.case_id = :case_id_1 AND summary.context_id = :context_id_1 AND concat(machine.name, :concat_4, machine.cpu_core_count, :concat_5, machine.cpu_thread_count, :concat_6, machine.memory_bytes) = :param_2 GROUP BY summary.case_id, summary.context_id, machine.name, machine.cpu_core_count, machine.cpu_thread_count, machine.memory_bytes"""  # noqa
 
 
 def create_benchmark_summary(conbench, results, benchmark_name=None):

diff --git a/migrations/versions/0d4e564b1876_backfill_distribution.py b/migrations/versions/0d4e564b1876_backfill_distribution.py
@@ -75,7 +75,6 @@ def get_distribution(
         .group_by(
             summary_table.c.case_id,
             summary_table.c.context_id,
-            summary_table.c.machine_id,
             machine_table.c.name,
             machine_table.c.cpu_core_count,
             machine_table.c.cpu_thread_count,