lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix RSQL G2 visitor OR optimizaton when one table with different attributes (#2135)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-12-10 16:37:46 +02:00
committed by GitHub
parent d3eeb71826
commit 13fef83e53
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitorG2.java
View File

@@ -71,7 +71,7 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
private final boolean ensureIgnoreCase; private final boolean ensureIgnoreCase;
private final SimpleTypeConverter simpleTypeConverter = new SimpleTypeConverter(); 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; private boolean inOr;
public JpaQueryRsqlVisitorG2(final Class<A> enumType, public JpaQueryRsqlVisitorG2(final Class<A> enumType,
@@ -100,7 +100,7 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
return Collections.singletonList(children.isEmpty() ? cb.conjunction() : cb.or(children.toArray(new Predicate[0]))); return Collections.singletonList(children.isEmpty() ? cb.conjunction() : cb.or(children.toArray(new Predicate[0])));
} finally { } finally {
inOr = false; inOr = false;
javaTypeToPath.clear(); attributeToPath.clear();
} }
} }
@@ -303,7 +303,7 @@ public class JpaQueryRsqlVisitorG2<A extends Enum<A> & RsqlQueryField, T>
} }
} // if a collection - it is a join } // if a collection - it is a join
if (inOr && root == this.root) { // try to reuse join of the same "or" level and no subquery 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 { } else {
return root.join(fieldNameSplit, JoinType.LEFT); return root.join(fieldNameSplit, JoinType.LEFT);
} }

11
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLToSQLTest.java
View File

@@ -36,12 +36,12 @@ import org.springframework.test.context.ContextConfiguration;
@ContextConfiguration(classes = { RepositoryApplicationConfiguration.class, TestConfiguration.class }) @ContextConfiguration(classes = { RepositoryApplicationConfiguration.class, TestConfiguration.class })
@Import(TestChannelBinderConfiguration.class) @Import(TestChannelBinderConfiguration.class)
@Disabled("For manual run only, while playing around with RSQL to SQL") @Disabled("For manual run only, while playing around with RSQL to SQL")
public class RSQLToSQLTest { class RSQLToSQLTest {
private RSQLToSQL rsqlToSQL; private RSQLToSQL rsqlToSQL;
@Test @Test
public void print() { void print() {
print(JpaTarget.class, TargetFields.class, "tag==tag1 and tag==tag2"); 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, "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, "targettype.key==type1 and metadata.key1==target1-value1");
@@ -49,7 +49,12 @@ public class RSQLToSQLTest {
} }
@Test @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");
printFrom(JpaTarget.class, TargetFields.class, "tag==TAG1 and tag!=TAG2"); printFrom(JpaTarget.class, TargetFields.class, "tag==TAG1 and tag!=TAG2");
} }