From 30d3fbbd98c3ea0e867bfffe365431d424cd3ba0 Mon Sep 17 00:00:00 2001 From: SJ <48863181+skjindal93@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:34:10 +0530 Subject: [PATCH 1/2] fix(entities): enum map throws exception for empty maps --- .../gateway/service/entity/query/ExecutionTreeBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java index fc043828..29bbcccf 100644 --- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java +++ b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java @@ -11,6 +11,7 @@ import java.util.Collection; import java.util.Collections; import java.util.EnumMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -330,7 +331,7 @@ QueryNode buildAndFilterTree(EntitiesRequest entitiesRequest) { } Map sourceToAndFilterMap = - new EnumMap<>(buildSourceToAndFilterMap(entitiesRequest.getFilter())); + new HashMap<>(buildSourceToAndFilterMap(entitiesRequest.getFilter())); // qs node as the pivot node to fetch time range data QueryNode qsNode = From b10eb217246f5e4d68c98a1c75095924906c387c Mon Sep 17 00:00:00 2001 From: SJ <48863181+skjindal93@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:34:10 +0530 Subject: [PATCH 2/2] fix(entities): enum map throws exception for empty maps --- .../gateway/service/entity/query/ExecutionTreeBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java index fc043828..23c9dfe5 100644 --- a/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java +++ b/gateway-service-impl/src/main/java/org/hypertrace/gateway/service/entity/query/ExecutionTreeBuilder.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.EnumMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -330,7 +330,7 @@ QueryNode buildAndFilterTree(EntitiesRequest entitiesRequest) { } Map sourceToAndFilterMap = - new EnumMap<>(buildSourceToAndFilterMap(entitiesRequest.getFilter())); + new HashMap<>(buildSourceToAndFilterMap(entitiesRequest.getFilter())); // qs node as the pivot node to fetch time range data QueryNode qsNode =