More cleanup, remove rule

Author: luigidellaquila

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Literal.java

@@ -53,11 +53,11 @@ public Literal(Source source, Object value, DataType dataType) {
         super(source);
         assert noPlainStrings(value, dataType);
         this.dataType = dataType;
-        this.value = stringsToBytesRef(dataType, value);
+        this.value = value;
     }
 
     private boolean noPlainStrings(Object value, DataType dataType) {
-        if (dataType == KEYWORD || dataType == TEXT) {
+        if (dataType == KEYWORD || dataType == TEXT || dataType == VERSION) {
             if (value instanceof String) {
                 return false;
             }
@@ -68,19 +68,6 @@ private boolean noPlainStrings(Object value, DataType dataType) {
         return true;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private static Object stringsToBytesRef(DataType dataType, Object value) {
-        // we should do it for IPs as well, but there is a problem for CIDR_MATCH, see CombineDisjunctions
-        if (value instanceof String s && dataType == VERSION) {
-            return new Version(s).toBytesRef();
-        }
-
-        if (value instanceof List l) {
-            return l.stream().map(x -> stringsToBytesRef(dataType, x)).toList();
-        }
-        return value;
-    }
-
     private static Literal readFrom(StreamInput in) throws IOException {
         Source source = Source.readFrom((StreamInput & PlanStreamInput) in);
         Object value = in.readGenericValue();
@@ -196,9 +183,7 @@ public static Literal of(FoldContext ctx, Expression foldable) {
     }
 
     public static Literal of(Expression source, Object value) {
-        DataType type = source.dataType();
-        value = stringsToBytesRef(type, value);
-        return new Literal(source.source(), value, type);
+        return new Literal(source.source(), value, source.dataType());
     }
 
     /**

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizer.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.CombineEvals;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.CombineProjections;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.ConstantFolding;
-import org.elasticsearch.xpack.esql.optimizer.rules.logical.ConvertStringToByteRef;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.ExtractAggregateCommonFilter;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.FoldNull;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.LiteralsOnTheRight;
@@ -167,7 +166,6 @@ protected static Batch<LogicalPlan> operators() {
             new CombineEvals(),
             new PruneEmptyPlans(),
             new PropagateEmptyRelation(),
-            new ConvertStringToByteRef(),
             new FoldNull(),
             new SplitInWithFoldableValue(),
             new PropagateEvalFoldables(),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ConvertStringToByteRef.java

@@ -797,7 +797,7 @@ public PlanFactory visitSampleCommand(EsqlBaseParser.SampleCommandContext ctx) {
         } else {
             throw new ParsingException(
                 source(ctx),
-                "invalid value for SAMPLE probability [" + val + "], expecting a number between 0 and 1, exclusive"
+                "invalid value for SAMPLE probability [" + BytesRefs.toString(val) + "], expecting a number between 0 and 1, exclusive"
             );
         }
     }