Skip to content

Commit 3129e57

Browse files
committed
Fixed codegen bug, completed first pass of Network Direction ESQL function (no tests)
1 parent 9637798 commit 3129e57

File tree

3 files changed

+22
-27
lines changed

3 files changed

+22
-27
lines changed

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/argument/BlockArgument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public TypeName dataType(boolean blockStyle) {
2626

2727
@Override
2828
public String paramName(boolean blockStyle) {
29-
return name + (blockStyle ? "Block" : "Vector");
29+
return name + "Block";
3030
}
3131

3232
@Override

x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/ip/NetworkDirectionEvaluator.java

Lines changed: 18 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/ip/NetworkDirection.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.elasticsearch.compute.ann.Fixed;
1818
import org.elasticsearch.compute.ann.Position;
1919
import org.elasticsearch.compute.data.BytesRefBlock;
20-
import org.elasticsearch.compute.operator.BreakingBytesRefBuilder;
2120
import org.elasticsearch.compute.operator.EvalOperator;
2221
import org.elasticsearch.xpack.esql.core.expression.Expression;
2322
import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
@@ -31,10 +30,8 @@
3130

3231
import java.io.IOException;
3332
import java.net.InetAddress;
34-
import java.util.ArrayList;
3533
import java.util.Arrays;
3634
import java.util.List;
37-
import java.util.stream.Collectors;
3835

3936
import static org.elasticsearch.compute.ann.Fixed.Scope.THREAD_LOCAL;
4037

@@ -121,15 +118,15 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
121118
var internalNetworksEvaluatorSupplier = toEvaluator.apply(internalNetworks);
122119
return new NetworkDirectionEvaluator.Factory(
123120
source(),
121+
context -> new BytesRef(),
124122
sourceIpEvaluatorSupplier,
125123
destinationIpEvaluatorSupplier,
126-
internalNetworksEvaluatorSupplier,
127-
context -> new BreakingBytesRefBuilder(context.breaker(), "network_direction")
124+
internalNetworksEvaluatorSupplier
128125
);
129126
}
130127

131128
@Evaluator
132-
static boolean process(BytesRef sourceIp, BytesRef destinationIp, @Position int position, BytesRefBlock internalNetworks, @Fixed(includeInToString=false, scope=THREAD_LOCAL) BreakingBytesRefBuilder scratch) {
129+
static boolean process(@Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef scratch, BytesRef sourceIp, BytesRef destinationIp, @Position int position, BytesRefBlock internalNetworks) {
133130
// Pulling the bytes out directly using InetAddress.getByAddress() requires error handling TODO
134131
InetAddress sourceIpAddress = InetAddresses.forString(sourceIp.utf8ToString());
135132
InetAddress destinationIpAddress = InetAddresses.forString(destinationIp.utf8ToString());

0 commit comments

Comments
 (0)