Skip to content

Fix nondeterministic constant ordering causing possible incorrect in-memory evaluation #1803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
velo merged 3 commits into from
Jun 17, 2026
Merged

Fix nondeterministic constant ordering causing possible incorrect in-memory evaluation #1803

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eacfcc2
Fix nondeterministic constant ordering causing incorrect in-memory ev…
plalx Jun 15, 2026
ddfbca5
Apply code formatting to DefaultEvaluatorFactory
velo Jun 17, 2026
7ebe871
Add regression test for deterministic constant ordering
velo Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions .../querydsl-collections/src/main/java/com/querydsl/collections/DefaultEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import com.querydsl.core.util.PrimitiveUtils;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.tools.JavaCompiler;
Expand Down Expand Up @@ -112,8 +112,7 @@ public <T> Evaluator<T> create(
}
serializer.append(";");

var constantToLabel = serializer.getConstantToLabel();
var constants = getConstants(metadata, constantToLabel);
var constants = getConstants(metadata, serializer.getConstants(), serializer.getConstantToLabel());
var types = new Class<?>[sources.size()];
var names = new String[sources.size()];
for (var i = 0; i < sources.size(); i++) {
Expand Down Expand Up @@ -155,8 +154,7 @@ public <T> Evaluator<List<T>> createEvaluator(
ser.append("}\n");
ser.append("return rv;");

var constantToLabel = ser.getConstantToLabel();
var constants = getConstants(metadata, constantToLabel);
var constants = getConstants(metadata, ser.getConstants(), ser.getConstantToLabel());

Type sourceType = new ClassType(TypeCategory.SIMPLE, source.getType());
var sourceListType = new ClassType(TypeCategory.SIMPLE, Iterable.class, sourceType);
Expand Down Expand Up @@ -269,8 +267,7 @@ public Evaluator<List<Object[]>> createEvaluator(
}
ser.append("return rv;");

var constantToLabel = ser.getConstantToLabel();
var constants = getConstants(metadata, constantToLabel);
var constants = getConstants(metadata, ser.getConstants(), ser.getConstantToLabel());

var projectionType = new ClassType(TypeCategory.LIST, List.class, Types.OBJECTS);
return factory.createEvaluator(
Expand All @@ -282,20 +279,26 @@ public Evaluator<List<Object[]>> createEvaluator(
constants);
}

private Map<String, Object> getConstants(
QueryMetadata metadata, Map<Object, String> constantToLabel) {
Map<String, Object> constants = new HashMap<>();
for (Map.Entry<Object, String> entry : constantToLabel.entrySet()) {
if (entry.getKey() instanceof ParamExpression<?>) {
var value = metadata.getParams().get(entry.getKey());
private Map<String, Object> getConstants(QueryMetadata metadata, List<Object> constants,
Map<Object, String> constantToLabel) {
var result = new LinkedHashMap<String, Object>();

for (var constant : constants) {
var paramName = constantToLabel.get(constant);

if (constant instanceof ParamExpression<?>) {
var value = metadata.getParams().get(constant);
if (value == null) {
throw new ParamNotSetException((ParamExpression<?>) entry.getKey());
throw new ParamNotSetException((ParamExpression<?>) constant);
}
constants.put(entry.getValue(), value);
} else {
constants.put(entry.getValue(), entry.getKey());

result.put(paramName, value);
continue;
}

result.put(paramName, constant);
}
return constants;

return result;
}
}
Loading