fixes #726 for real

Hyperfoil · Oct 7, 2023 · 5d96c79 · 5d96c79
1 parent 7f18be0
commit 5d96c79
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ExperimentServiceImpl.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ExperimentServiceImpl.java
@@ -248,7 +248,7 @@ private void runExperiments(DataSet.Info info, Consumer<ExperimentResult> result
          ExperimentProfileDAO profile = ExperimentProfileDAO.findById(entry.getKey());
          Map<Integer, List<DataPointDAO>> byVar = new HashMap<>();
          List<Integer> variableIds = profile.comparisons.stream().map(ExperimentComparisonDAO::getVariableId).collect(Collectors.toList());
-         DataPointDAO.<DataPointDAO>find("dataset.id IN ?1 AND variable.id IN ?2", Sort.descending("timestamp", "dataset_id"), entry.getValue(), variableIds)
+         DataPointDAO.<DataPointDAO>find("dataset.id IN ?1 AND variable.id IN ?2", Sort.descending("timestamp", "dataset.id"), entry.getValue(), variableIds)
                .stream().forEach(dp -> byVar.computeIfAbsent(dp.variable.id, v -> new ArrayList<>()).add(dp));
          Map<ExperimentComparison, ComparisonResult> results = new HashMap<>();
          for (var comparison : profile.comparisons) {

diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/RunServiceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/RunServiceTest.java
@@ -778,13 +778,13 @@ public void runExperiment() throws InterruptedException {
 
          Label lblBuildID = new Label();
          lblBuildID.name = "build-id";
-         Extractor buildIDExtractor = new Extractor("build-id", "$.build-id", false);
+         Extractor buildIDExtractor = new Extractor("build-id", "$.\"build-id\"", false);
          lblBuildID.extractors = List.of(buildIDExtractor);
          lblBuildID.access = Access.PUBLIC;
          lblBuildID.owner = test.owner;
          lblBuildID.metrics = false;
          lblBuildID.filtering = true;
-         //lblBuildID.id = addOrUpdateLabel(schema.id, lblBuildID);
+         lblBuildID.id = addOrUpdateLabel(schema.id, lblBuildID);
 
          //3. Config change detection variables
          Variable variable = new Variable();

diff --git a/horreum-integration-tests/src/test/java/io/hyperfoil/tools/horreum/it/HorreumClientIT.java b/horreum-integration-tests/src/test/java/io/hyperfoil/tools/horreum/it/HorreumClientIT.java
@@ -175,7 +175,7 @@ public void runExperiment() throws InterruptedException {
 
             Label lblBuildID = new Label();
             lblBuildID.name = "build-id";
-            Extractor buildIDExtractor = new Extractor("build-id", "$.build-id", false);
+            Extractor buildIDExtractor = new Extractor("build-id", "$.\"build-id\"", false);
             lblBuildID.extractors = List.of(buildIDExtractor);
             lblBuildID.access = Access.PUBLIC;
             lblBuildID.owner = dummyTest.owner;