fix serialization

Author: jan-elastic

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/Options.java

@@ -65,8 +65,9 @@ public static void populateMap(
         for (EntryExpression entry : options.entryExpressions()) {
             Expression optionExpr = entry.key();
             Expression valueExpr = entry.value();
-            Expression.TypeResolution resolution =
-                isFoldable(optionExpr, source.text(), paramOrdinal).and(isFoldable(valueExpr, source.text(), paramOrdinal));
+            Expression.TypeResolution resolution = isFoldable(optionExpr, source.text(), paramOrdinal).and(
+                isFoldable(valueExpr, source.text(), paramOrdinal)
+            );
             if (resolution.unresolved()) {
                 throw new InvalidArgumentException(resolution.message());
             }
@@ -77,24 +78,16 @@ public static void populateMap(
             // validate the optionExpr is supported
             DataType dataType = allowedOptions.get(optionName);
             if (dataType == null) {
-                throw new InvalidArgumentException(format(
-                    null,
-                    "Invalid option [{}] in [{}], expected one of {}",
-                    optionName,
-                    source.text(),
-                    allowedOptions.keySet()
-                ));
+                throw new InvalidArgumentException(
+                    format(null, "Invalid option [{}] in [{}], expected one of {}", optionName, source.text(), allowedOptions.keySet())
+                );
             }
             try {
                 optionsMap.put(optionName, DataTypeConverter.convert(optionValue, dataType));
             } catch (InvalidArgumentException e) {
-                throw new InvalidArgumentException(format(
-                    null,
-                    "Invalid option [{}] in [{}], {}",
-                    optionName,
-                    source.text(),
-                    e.getMessage()
-                ));
+                throw new InvalidArgumentException(
+                    format(null, "Invalid option [{}] in [{}], {}", optionName, source.text(), e.getMessage())
+                );
             }
         }
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Match.java

@@ -298,8 +298,7 @@ public final void writeTo(StreamOutput out) throws IOException {
 
     @Override
     protected TypeResolution resolveParams() {
-        return resolveField()
-            .and(resolveQuery())
+        return resolveField().and(resolveQuery())
             .and(Options.resolve(options(), source(), THIRD, ALLOWED_OPTIONS))
             .and(checkParamCompatibility());
     }
@@ -354,7 +353,6 @@ private Map<String, Object> matchQueryOptions() throws InvalidArgumentException
         // Match is lenient by default to avoid failing on incompatible types
         matchOptions.put(LENIENT_FIELD.getPreferredName(), true);
 
-
         Options.populateMap((MapExpression) options(), matchOptions, source(), SECOND, ALLOWED_OPTIONS);
         return matchOptions;
     }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/grouping/Categorize.java

@@ -130,7 +130,9 @@ private Categorize(StreamInput in) throws IOException {
         this(
             Source.readFrom((PlanStreamInput) in),
             in.readNamedWriteable(Expression.class),
-            in.readOptionalNamedWriteable(Expression.class)
+            in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CATEGORIZE_OPTIONS)
+                ? in.readOptionalNamedWriteable(Expression.class)
+                : null
         );
     }