Revert "Add support for VERSION field type in SQL and EQL (#85502)"

This reverts commit 79b0078.

Author: luigidellaquila

docs/changelog/85502.yaml

@@ -28,7 +28,6 @@ s|SQL precision
 | <<binary, `binary`>>                     | binary          | VARBINARY   | 2,147,483,647
 | <<date, `date`>>                         | datetime        | TIMESTAMP   | 29
 | <<ip, `ip`>>                             | ip              | VARCHAR     | 39
-| <<version, `version`>>                   | version         | VARCHAR     | 32,766
 
 4+h| Complex types
 

docs/reference/sql/language/data-types.asciidoc

@@ -112,7 +112,6 @@
   "transID": 2,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "1.5.0",
   "sequence": 18
  },
  {
@@ -121,7 +120,6 @@
   "transID": 0,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "1.5.0",
   "sequence": 19
  },
  {
@@ -130,7 +128,6 @@
   "transID": 0,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "1.2.4",
   "sequence": 20
  },
  {
@@ -139,7 +136,6 @@
   "transID": 0,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "1.11.3",
   "sequence": 21
  },
  {
@@ -148,7 +144,6 @@
   "transID": 0,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "bad",
   "sequence": 22
  },
  {
@@ -157,7 +152,6 @@
   "transID": 0,
   "process.entity_id": 512,
   "process.pid": 123,
-  "version": "1.2.4-SNAPSHOT",
   "sequence": 23
  }
 ]

x-pack/plugin/eql/qa/common/src/main/resources/data/extra.data

@@ -27,9 +27,6 @@
     "optional_field_default_null": {
       "type": "keyword",
       "null_value": "NULL"
-    },
-    "version": {
-        "type": "version"
     }
   }
 }

x-pack/plugin/eql/qa/common/src/main/resources/data/extra.mapping

@@ -76,7 +76,7 @@ expected_event_ids  = []
 [[queries]]
 name = "sequenceOptionalFieldAsKeyAndFirstFilter"
 query = '''
-sequence by ?x
+sequence by ?x 
   [OPTIONAL where ?x == null]
   [OPTIONAL where true]
 '''
@@ -137,7 +137,7 @@ expected_event_ids  = [12,13,14,
 join_keys = ["null","123",
              "null","null",
              "512","123"]
-
+             
 [[queries]]
 name = "sequenceOneKeyOptional_1"
 query = '''
@@ -159,7 +159,7 @@ expected_event_ids  = [12,13,14,
                        18,19,20]
 join_keys = ["null","123",
              "512","123"]
-
+             
 [[queries]]
 name = "sequenceNoOptionalKeys"
 query = '''
@@ -195,7 +195,7 @@ expected_event_ids  = [12,13,14,
 join_keys = ["null","123",
              "null","null",
              "512","123"]
-
+             
 [[queries]]
 name = "sequenceWithOptionalFieldsAndUntil_2"
 query = '''
@@ -209,65 +209,3 @@ expected_event_ids  = [12,13,14,
 join_keys = ["null","123",
              "null","null"]
 
-[[queries]]
-name = "sequenceWithVersionCheck"
-query = '''
-  sequence by transID
-    [ file where version == "1.2.4" ]
-    [ file where version == "1.11.3" ]
-'''
-expected_event_ids  = [20, 21]
-join_keys = ["0"]
-
-[[queries]]
-name = "sequenceWithVersionRangeCheck"
-query = '''
-  sequence by transID
-    [ file where version == "1.2.4" ]
-    [ file where version > "1.5.0" ]
-'''
-expected_event_ids  = [20, 21]
-join_keys = ["0"]
-
-[[queries]]
-name = "sequenceWithVersionRangeCheck2"
-query = '''
-  sequence by transID
-    [ file where version == "1.2.4" ]
-    [ file where version < "1.5.0" ]
-'''
-expected_event_ids  = [20, 23]
-join_keys = ["0"]
-
-
-[[queries]]
-name = "sequenceWithInvalidVersion"
-query = '''
-  sequence by transID
-    [ file where version == "1.2.4" ]
-    [ file where version == "bad" ]
-'''
-expected_event_ids  = [20, 22]
-join_keys = ["0"]
-
-
-[[queries]]
-name = "sequenceWithVersionConcat"
-query = '''
-  sequence by transID
-    [ file where CONCAT(version, "") == "1.2.4" ]
-    [ file where version == "bad" ]
-'''
-expected_event_ids  = [20, 22]
-join_keys = ["0"]
-
-
-[[queries]]
-name = "sequenceWithVersionJoinKey"
-query = '''
-  sequence by version
-    [ process where true ]
-    [ file where true ]
-'''
-expected_event_ids  = [18, 19]
-join_keys = ["1.5.0"]

x-pack/plugin/eql/qa/common/src/main/resources/test_extra.toml

@@ -11,6 +11,7 @@
 import org.elasticsearch.search.fetch.subphase.FieldAndFormat;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.NestedSortBuilder;
+import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.xpack.eql.querydsl.container.QueryContainer;
 import org.elasticsearch.xpack.ql.execution.search.QlSourceBuilder;
@@ -132,7 +133,10 @@ private static void sorting(QueryContainer container, SearchSourceBuilder source
                     }
                 }
             } else if (sortable instanceof ScriptSort ss) {
-                sortBuilder = scriptSort(ss.script().toPainless(), ss.script().outputType().scriptSortType());
+                sortBuilder = scriptSort(
+                    ss.script().toPainless(),
+                    ss.script().outputType().isNumeric() ? ScriptSortType.NUMBER : ScriptSortType.STRING
+                );
             }
 
             if (sortBuilder != null) {

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/execution/search/SourceGenerator.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.painless.spi.WhitelistLoader;
 import org.elasticsearch.script.AggregationScript;
 import org.elasticsearch.script.BucketAggregationSelectorScript;
-import org.elasticsearch.script.BytesRefSortScript;
 import org.elasticsearch.script.FieldScript;
 import org.elasticsearch.script.FilterScript;
 import org.elasticsearch.script.NumberSortScript;
@@ -37,7 +36,6 @@ public Map<ScriptContext<?>, List<Whitelist>> getContextWhitelists() {
         whitelist.put(FieldScript.CONTEXT, list);
         whitelist.put(NumberSortScript.CONTEXT, list);
         whitelist.put(StringSortScript.CONTEXT, list);
-        whitelist.put(BytesRefSortScript.CONTEXT, list);
         whitelist.put(BucketAggregationSelectorScript.CONTEXT, list);
         return whitelist;
     }

x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/plugin/EqlPainlessExtension.java

@@ -93,7 +93,6 @@ public void testQueryCondition() {
         assertEquals("1:11: Condition expression needs to be boolean, found [TEXT]", error("any where hostname"));
         assertEquals("1:11: Condition expression needs to be boolean, found [KEYWORD]", error("any where constant_keyword"));
         assertEquals("1:11: Condition expression needs to be boolean, found [IP]", error("any where source_address"));
-        assertEquals("1:11: Condition expression needs to be boolean, found [VERSION]", error("any where version"));
     }
 
     public void testQueryStartsWithNumber() {
@@ -364,11 +363,6 @@ public void testIP() {
         accept(idxr, "foo where ip_addr == 0");
     }
 
-    public void testVersion() {
-        final IndexResolution idxr = loadIndexResolution("mapping-version.json");
-        accept(idxr, "foo where version_number == \"2.1.4\"");
-    }
-
     public void testJoin() {
         final IndexResolution idxr = loadIndexResolution("mapping-join.json");
         accept(idxr, "foo where serial_event_id == 0");

x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/analysis/VerifierTests.java

@@ -90,9 +90,6 @@
         },
         "bool" : {
             "type" : "boolean"
-        },
-        "version" : {
-            "type" : "version"
         }
     }
 }

x-pack/plugin/eql/src/test/resources/mapping-default.json

@@ -901,17 +901,3 @@ process where pid > 100 and pid < 200
 // the "not" has an undefined location of where it should be used in the Painless script
 // disjunctionInsideFunctionWithNot
 // process where string(pid > 5 and pid != 10) == \"true\"
-
-
-versionFieldAutomaticConversion
-process where version > "2"
-;
-{"range":{"version":{"gt":"2"
-;
-
-versionFieldCast
-process where CONCAT(version, constant_keyword) > "2"
-;
-{"script":{"source":"InternalEqlScriptUtils.multiValueDocValues(doc,params.v0,X0->InternalEqlScriptUtils.multiValueDocValues(doc,params.v1,X1->InternalQlScriptUtils.nullSafeFilter(InternalQlScriptUtils.gt(InternalEqlScriptUtils.concat([X0,X1]),params.v2))))"
-"params":{"v0":"version","v1":"constant_keyword","v2":"2"}}
-;

x-pack/plugin/eql/src/test/resources/mapping-version.json

@@ -16,7 +16,6 @@ archivesBaseName = 'x-pack-ql'
 
 dependencies {
   api "org.antlr:antlr4-runtime:${antlrVersion}"
-  api project(path: xpackModule('mapper-version'))
   compileOnly project(path: xpackModule('core'))
   testApi(project(xpackModule('ql:test-fixtures'))) {
     exclude group: 'org.elasticsearch.plugin', module: 'ql'

x-pack/plugin/eql/src/test/resources/querytranslator_tests.txt

@@ -6,8 +6,6 @@
  */
 package org.elasticsearch.xpack.ql.expression.predicate.operator.comparison;
 
-import org.elasticsearch.xpack.versionfield.Version;
-
 import java.math.BigInteger;
 import java.util.Set;
 
@@ -73,21 +71,13 @@ static Integer compare(Object l, Object r) {
             return null;
         }
         // typical number comparison
-        if (l instanceof Number lN && r instanceof Number rN) {
-            return compare(lN, rN);
-        }
-
-        // automatic conversion for versions
-        if (l instanceof Version lV && r instanceof String rStr) {
-            return lV.compareTo(new Version(rStr));
-        }
-        if (l instanceof String lStr && r instanceof Version rV) {
-            return new Version(lStr).compareTo(rV);
+        if (l instanceof Number && r instanceof Number) {
+            return compare((Number) l, (Number) r);
         }
 
-        if (l instanceof Comparable lC && r instanceof Comparable) {
+        if (l instanceof Comparable && r instanceof Comparable) {
             try {
-                return Integer.valueOf(lC.compareTo(r));
+                return Integer.valueOf(((Comparable) l).compareTo(r));
             } catch (ClassCastException cce) {
                 // when types are not compatible, cce is thrown
                 // fall back to null

x-pack/plugin/ql/build.gradle

@@ -12,24 +12,18 @@
 import org.elasticsearch.xpack.ql.type.DataType;
 
 import static org.elasticsearch.Version.V_8_2_0;
-import static org.elasticsearch.Version.V_8_4_0;
 import static org.elasticsearch.xpack.ql.type.DataTypes.UNSIGNED_LONG;
-import static org.elasticsearch.xpack.ql.type.DataTypes.VERSION;
 
 public final class VersionCompatibilityChecks {
 
     public static final Version INTRODUCING_UNSIGNED_LONG = V_8_2_0;
-    public static final Version INTRODUCING_VERSION_FIELD_TYPE = V_8_4_0;
 
     private VersionCompatibilityChecks() {}
 
     public static boolean isTypeSupportedInVersion(DataType dataType, Version version) {
         if (dataType == UNSIGNED_LONG) {
             return supportsUnsignedLong(version);
         }
-        if (dataType == VERSION) {
-            return supportsVersionType(version);
-        }
         return true;
     }
 
@@ -40,20 +34,10 @@ public static boolean supportsUnsignedLong(Version version) {
         return INTRODUCING_UNSIGNED_LONG.compareTo(version) <= 0;
     }
 
-    /**
-     * Does the provided {@code version} support the version type (PR#85502)?
-     */
-    public static boolean supportsVersionType(Version version) {
-        return INTRODUCING_VERSION_FIELD_TYPE.compareTo(version) <= 0;
-    }
-
     public static @Nullable Version versionIntroducingType(DataType dataType) {
         if (dataType == UNSIGNED_LONG) {
             return INTRODUCING_UNSIGNED_LONG;
         }
-        if (dataType == VERSION) {
-            return INTRODUCING_VERSION_FIELD_TYPE;
-        }
 
         return null;
     }

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/predicate/operator/comparison/Comparisons.java

@@ -7,8 +7,6 @@
 
 package org.elasticsearch.xpack.ql.type;
 
-import org.elasticsearch.search.sort.ScriptSortBuilder;
-
 import java.util.Locale;
 import java.util.Objects;
 
@@ -64,12 +62,6 @@ public String esType() {
         return esType;
     }
 
-    public ScriptSortBuilder.ScriptSortType scriptSortType() {
-        return isNumeric() ? ScriptSortBuilder.ScriptSortType.NUMBER
-            : this == DataTypes.VERSION ? ScriptSortBuilder.ScriptSortType.VERSION
-            : ScriptSortBuilder.ScriptSortType.STRING;
-    }
-
     public boolean isInteger() {
         return isInteger;
     }