ESQL: Remove DataTypeRegistry (elastic#111464)

This removes the `DataTypeRegistry` interface, moving the only use ESQL has into a test class called `LoadMapping`. Previously, we were using this via a production class `Types` and `TypesTests`. We don't need either of those two, which are removed. ESQL has an implementation of `DataTypeRegistry` and this removes the `implements DataTypeRegistry` part and removes all unused methods. This also removes `DefaultDataTypeRegistry` which is unused.
carlosdelest · Jul 30, 2024 · d8df7e4 · d8df7e4
1 parent aeda46c
commit d8df7e4
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 424 deletions.
diff --git a/...ugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataTypeRegistry.java b/...ugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataTypeRegistry.java
diff --git a/...ql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DefaultDataTypeRegistry.java b/...ql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DefaultDataTypeRegistry.java
diff --git a/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/type/TypesTests.java b/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/type/TypesTests.java
diff --git a/...plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java b/...plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
@@ -39,7 +39,6 @@
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.type.DateUtils;
 import org.elasticsearch.xpack.esql.core.type.EsField;
-import org.elasticsearch.xpack.esql.core.type.TypesTests;
 import org.elasticsearch.xpack.esql.core.util.StringUtils;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThan;
@@ -57,7 +56,6 @@
 import org.elasticsearch.xpack.esql.session.EsqlConfiguration;
 import org.elasticsearch.xpack.esql.stats.Metrics;
 import org.elasticsearch.xpack.esql.stats.SearchStats;
-import org.elasticsearch.xpack.esql.type.EsqlDataTypeRegistry;
 import org.junit.Assert;
 
 import java.io.BufferedReader;
@@ -280,7 +278,7 @@ public static <T> T as(Object node, Class<T> type) {
     }
 
     public static Map<String, EsField> loadMapping(String name) {
-        return TypesTests.loadMapping(EsqlDataTypeRegistry.INSTANCE, name, true);
+        return LoadMapping.loadMapping(name);
     }
 
     public static String loadUtf8TextFile(String name) {