Fix RSQL G2 visitor OR optimizaton when one table with different attr…

…ibutes Signed-off-by: Marinov Avgustin <[email protected]>
eclipse-hawkbit · Dec 10, 2024 · fe96cf5 · fe96cf5
1 parent d3eeb71
commit fe96cf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...tory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java b/...tory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
@@ -71,7 +71,7 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
     private final boolean ensureIgnoreCase;
 
     private final SimpleTypeConverter simpleTypeConverter = new SimpleTypeConverter();
-    private final Map<Class<?>, Path<?>> javaTypeToPath = new HashMap<>();
+    private final Map<String, Path<?>> attributeToPath = new HashMap<>();
     private boolean inOr;
 
     public JpaQueryRsqlVisitorG2(final Class<A> enumType,
@@ -100,7 +100,7 @@ public List<Predicate> visit(final OrNode node, final String param) {
             return Collections.singletonList(children.isEmpty() ? cb.conjunction() : cb.or(children.toArray(new Predicate[0])));
         } finally {
             inOr = false;
-            javaTypeToPath.clear();
+            attributeToPath.clear();
         }
     }
 
@@ -303,7 +303,7 @@ private Path<?> getPath(final Root<?> root, final String fieldNameSplit) {
             }
         } // if a collection - it is a join
         if (inOr && root == this.root) { // try to reuse join of the same "or" level and no subquery
-            return javaTypeToPath.computeIfAbsent(attribute.getJavaType(), k -> root.join(fieldNameSplit, JoinType.LEFT));
+            return attributeToPath.computeIfAbsent(attribute.getName(), k -> root.join(fieldNameSplit, JoinType.LEFT));
         } else {
             return root.join(fieldNameSplit, JoinType.LEFT);
         }

diff --git a/...t-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java b/...t-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
@@ -36,20 +36,25 @@
 @ContextConfiguration(classes = { RepositoryApplicationConfiguration.class, TestConfiguration.class })
 @Import(TestChannelBinderConfiguration.class)
 @Disabled("For manual run only, while playing around with RSQL to SQL")
-public class RSQLToSQLTest {
+class RSQLToSQLTest {
 
     private RSQLToSQL rsqlToSQL;
 
     @Test
-    public void print() {
+    void print() {
         print(JpaTarget.class, TargetFields.class, "tag==tag1 and tag==tag2");
         print(JpaTarget.class, TargetFields.class, "tag==tag1 or tag==tag2 or tag==tag3");
         print(JpaTarget.class, TargetFields.class, "targettype.key==type1 and metadata.key1==target1-value1");
         print(JpaTarget.class, TargetFields.class, "(tag!=TAG1 or tag !=TAG2)");
     }
 
     @Test
-    public void printPG() {
+    void printSameTableMultiJoin() {
+        print(JpaTarget.class, TargetFields.class, "installedds.version==1.0.0 or assignedds.version==2.0.0");
+    }
+
+    @Test
+    void printPG() {
         printFrom(JpaTarget.class, TargetFields.class, "tag!=TAG1 and tag==TAG2");
         printFrom(JpaTarget.class, TargetFields.class, "tag==TAG1 and tag!=TAG2");
     }