Change how extraction of IP from BytesRef is performed

Author: MattAlp

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

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.expression.function.scalar.ip;
 
+import org.apache.lucene.document.InetAddressPoint;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -26,6 +27,7 @@
 import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
 import org.elasticsearch.xpack.esql.expression.function.Param;
 import org.elasticsearch.xpack.esql.expression.function.scalar.EsqlScalarFunction;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.In;
 import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
 
 import java.io.IOException;
@@ -118,7 +120,7 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
         var internalNetworksEvaluatorSupplier = toEvaluator.apply(internalNetworks);
         return new NetworkDirectionEvaluator.Factory(
             source(),
-            context -> new BytesRef(),
+            context -> new BytesRef(16),
             sourceIpEvaluatorSupplier,
             destinationIpEvaluatorSupplier,
             internalNetworksEvaluatorSupplier
@@ -127,9 +129,11 @@ public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvalua
 
     @Evaluator
     static BytesRef process(@Fixed(includeInToString=false, scope=THREAD_LOCAL) BytesRef scratch, BytesRef sourceIp, BytesRef destinationIp, @Position int position, BytesRefBlock networks) {
-        // Pulling the bytes out directly using InetAddress.getByAddress() requires error handling TODO
-        InetAddress sourceIpAddress = InetAddresses.forString(sourceIp.utf8ToString());
-        InetAddress destinationIpAddress = InetAddresses.forString(destinationIp.utf8ToString());
+        System.arraycopy(sourceIp.bytes, sourceIp.offset, scratch.bytes, 0, sourceIp.length);
+        InetAddress sourceIpAddress = InetAddressPoint.decode(scratch.bytes);
+        System.arraycopy(destinationIp.bytes, destinationIp.offset, scratch.bytes, 0, destinationIp.length);
+        InetAddress destinationIpAddress = InetAddressPoint.decode(scratch.bytes);
+
         boolean sourceInternal = false;
         boolean destinationInternal = false;
 

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

@@ -24,11 +24,34 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.hamcrest.core.IsEqual.equalTo;
+
 public class NetworkDirectionTests extends AbstractScalarFunctionTestCase {
     public NetworkDirectionTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
         this.testCase = testCaseSupplier.get();
     }
 
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() {
+        var suppliers = List.of(
+            new TestCaseSupplier(
+                List.of(DataType.IP, DataType.IP, DataType.KEYWORD),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(
+                        new TestCaseSupplier.TypedData(EsqlDataTypeConverter.stringToIP("10.0.1.1"), DataType.IP, "source_ip"),
+                        new TestCaseSupplier.TypedData(EsqlDataTypeConverter.stringToIP("192.168.1.2"), DataType.IP, "destination_ip"),
+                        new TestCaseSupplier.TypedData(List.of("10.0.0.0/8"), DataType.KEYWORD, "internal_networks")
+                    ),
+                    "NetworkDirectionEvaluator[sourceIp=Attribute[channel=0], destinationIp=Attribute[channel=1], networks=Attribute[channel=2]]",
+                    DataType.KEYWORD,
+                    equalTo(new BytesRef(NetworkDirectionUtils.DIRECTION_INBOUND))
+                )
+            )
+        );
+
+        return parameterSuppliersFromTypedDataWithDefaultChecksNoErrors(true, suppliers);
+    }
+
     @Override
     protected Expression build(Source source, List<Expression> args) {
         return new NetworkDirection(source, args.get(0), args.get(1), args.get(2));