Skip to content

Optimized allocations for collection filter functions #8896

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
merged 1 commit into from
May 30, 2025
Merged

Optimized allocations for collection filter functions #8896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ...er/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/CapturedContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,14 @@ public ValueReferenceResolver withExtensions(Map<String, Object> extensions) {
return new CapturedContext(this, extensions);
}

public void removeExtension(String name) {
extensions.remove(name);
@Override
public void addExtension(String name, Object value) {
extensions.put(name, value);
}

private void addExtension(String name, Object value) {
extensions.put(name, value);
@Override
public void removeExtension(String name) {
extensions.remove(name);
}

public void addArguments(CapturedValue[] values) {
Expand Down
4 changes: 4 additions & 0 deletions ...r-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/el/ValueReferenceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ public interface ValueReferenceResolver {

Object getMember(Object target, String name);

default void addExtension(String name, Object value) {}

default void removeExtension(String name) {}

default ValueReferenceResolver withExtensions(Map<String, Object> extensions) {
return this;
}
Expand Down
52 changes: 31 additions & 21 deletions ...gger-el/src/main/java/com/datadog/debugger/el/expressions/FilterCollectionExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import datadog.trace.bootstrap.debugger.el.ValueReferences;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Expand Down Expand Up @@ -48,41 +47,52 @@ public CollectionValue<?> evaluate(ValueReferenceResolver valueRefResolver) {
checkSupportedList(materialized, this);
Collection<Object> filtered = new ArrayList<>();
int len = materialized.count();
for (int i = 0; i < len; i++) {
Object value = materialized.get(i).getValue();
if (filterExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(ValueReferences.ITERATOR_EXTENSION_NAME, value)))) {
filtered.add(value);
try {
for (int i = 0; i < len; i++) {
Object value = materialized.get(i).getValue();
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, value);
if (filterExpression.evaluate(valueRefResolver)) {
filtered.add(value);
}
}
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return new ListValue(filtered);
} else if (collectionValue instanceof MapValue) {
MapValue materialized = (MapValue) collectionValue;
checkSupportedMap(materialized, this);
Map<Object, Object> filtered = new HashMap<>();
for (Value<?> key : materialized.getKeys()) {
Value<?> value = key.isUndefined() ? Value.undefinedValue() : materialized.get(key);
Map<String, Object> valueRefExtensions = new HashMap<>();
valueRefExtensions.put(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefExtensions.put(ValueReferences.VALUE_EXTENSION_NAME, value);
valueRefExtensions.put(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, value));
if (filterExpression.evaluate(valueRefResolver.withExtensions(valueRefExtensions))) {
filtered.put(key.getValue(), value.getValue());
try {
for (Value<?> key : materialized.getKeys()) {
Value<?> value = key.isUndefined() ? Value.undefinedValue() : materialized.get(key);
valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, value);
valueRefResolver.addExtension(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, value));
if (filterExpression.evaluate(valueRefResolver)) {
filtered.put(key.getValue(), value.getValue());
}
}
} finally {
valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return new MapValue(filtered);
} else if (collectionValue instanceof SetValue) {
SetValue materialized = (SetValue) collectionValue;
Collection<Object> filtered = new HashSet<>();
Set<?> setHolder = checkSupportedSet(materialized, this);
for (Object value : setHolder) {
if (filterExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(ValueReferences.ITERATOR_EXTENSION_NAME, value)))) {
filtered.add(value);
try {
for (Object value : setHolder) {
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, value);
if (filterExpression.evaluate(valueRefResolver)) {
filtered.add(value);
}
}
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return new SetValue(filtered);
}
Expand Down
60 changes: 33 additions & 27 deletions ...ugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAllExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
import com.datadog.debugger.el.values.SetValue;
import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
import datadog.trace.bootstrap.debugger.el.ValueReferences;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

/**
Expand All @@ -42,15 +39,17 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
return Boolean.TRUE;
}
int len = collection.count();
for (int i = 0; i < len; i++) {
Value<?> val = collection.get(i);
if (!filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(ValueReferences.ITERATOR_EXTENSION_NAME, val)))) {
return Boolean.FALSE;
try {
for (int i = 0; i < len; i++) {
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, collection.get(i));
if (!filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.FALSE;
}
}
return Boolean.TRUE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return Boolean.TRUE;
}
if (value instanceof MapValue) {
MapValue map = (MapValue) value;
Expand All @@ -59,19 +58,23 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
// always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
return Boolean.TRUE;
}
for (Value<?> key : map.getKeys()) {
Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
Map<String, Object> valueRefExtensions = new HashMap<>();
valueRefExtensions.put(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefExtensions.put(ValueReferences.VALUE_EXTENSION_NAME, val);
valueRefExtensions.put(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, val));
if (!filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(valueRefExtensions))) {
return Boolean.FALSE;
try {
for (Value<?> key : map.getKeys()) {
Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, val);
valueRefResolver.addExtension(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, val));
if (!filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.FALSE;
}
}
return Boolean.TRUE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
}
return Boolean.TRUE;
}
if (value instanceof SetValue) {
SetValue set = (SetValue) value;
Expand All @@ -80,14 +83,17 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
// always return TRUE for empty values (cf vacuous truth, see also Stream::allMatch)
return Boolean.TRUE;
}
for (Object val : setHolder) {
if (!filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(ValueReferences.ITERATOR_EXTENSION_NAME, val)))) {
return Boolean.FALSE;
try {
for (Object val : setHolder) {
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, val);
if (!filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.FALSE;
}
}
return Boolean.TRUE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return Boolean.TRUE;
}
throw new EvaluationException(
"Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
Expand Down
61 changes: 33 additions & 28 deletions ...ugger/debugger-el/src/main/java/com/datadog/debugger/el/expressions/HasAnyExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
import com.datadog.debugger.el.values.SetValue;
import datadog.trace.bootstrap.debugger.el.ValueReferenceResolver;
import datadog.trace.bootstrap.debugger.el.ValueReferences;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

/**
Expand All @@ -43,51 +40,59 @@ public Boolean evaluate(ValueReferenceResolver valueRefResolver) {
return Boolean.FALSE;
}
int len = collection.count();
for (int i = 0; i < len; i++) {
Value<?> val = collection.get(i);
if (filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(ValueReferences.ITERATOR_EXTENSION_NAME, val)))) {
return Boolean.TRUE;
try {
for (int i = 0; i < len; i++) {
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, collection.get(i));
if (filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.TRUE;
}
}
return Boolean.FALSE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return Boolean.FALSE;
}
if (value instanceof MapValue) {
MapValue map = (MapValue) value;
checkSupportedMap(map, this);
if (map.isEmpty()) {
return Boolean.FALSE;
}
for (Value<?> key : map.getKeys()) {
Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
Map<String, Object> valueRefExtensions = new HashMap<>();
valueRefExtensions.put(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefExtensions.put(ValueReferences.VALUE_EXTENSION_NAME, val);
valueRefExtensions.put(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, val));
if (filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(valueRefExtensions))) {
return Boolean.TRUE;
try {
for (Value<?> key : map.getKeys()) {
Value<?> val = key.isUndefined() ? Value.undefinedValue() : map.get(key);
valueRefResolver.addExtension(ValueReferences.KEY_EXTENSION_NAME, key);
valueRefResolver.addExtension(ValueReferences.VALUE_EXTENSION_NAME, val);
valueRefResolver.addExtension(
ValueReferences.ITERATOR_EXTENSION_NAME, new MapValue.Entry(key, val));
if (filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.TRUE;
}
}
return Boolean.FALSE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.KEY_EXTENSION_NAME);
valueRefResolver.removeExtension(ValueReferences.VALUE_EXTENSION_NAME);
}
return Boolean.FALSE;
}
if (value instanceof SetValue) {
SetValue set = (SetValue) value;
Set<?> setHolder = checkSupportedSet(set, this);
if (set.isEmpty()) {
return Boolean.FALSE;
}
for (Object val : setHolder) {
if (filterPredicateExpression.evaluate(
valueRefResolver.withExtensions(
Collections.singletonMap(
ValueReferences.ITERATOR_EXTENSION_NAME, Value.of(val))))) {
return Boolean.TRUE;
try {
for (Object val : setHolder) {
valueRefResolver.addExtension(ValueReferences.ITERATOR_EXTENSION_NAME, Value.of(val));
if (filterPredicateExpression.evaluate(valueRefResolver)) {
return Boolean.TRUE;
}
}
return Boolean.FALSE;
} finally {
valueRefResolver.removeExtension(ValueReferences.ITERATOR_EXTENSION_NAME);
}
return Boolean.FALSE;
}
throw new EvaluationException(
"Unsupported collection class: " + value.getValue().getClass().getTypeName(), print(this));
Expand Down
Loading