From 50e19f52867b25dc5280ac5308c1f7c900be40fe Mon Sep 17 00:00:00 2001 From: Aurelien FOUCRET Date: Thu, 5 Jun 2025 14:53:01 +0200 Subject: [PATCH 1/4] [ES|QL] Fix test releases for LookupJoinTypesIT. --- .../xpack/esql/action/LookupJoinTypesIT.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java index 4070e11120ab9..6fa904c8beff0 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java @@ -54,6 +54,7 @@ import static org.elasticsearch.xpack.esql.core.type.DataType.SHORT; import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT; import static org.elasticsearch.xpack.esql.core.type.DataType.TSID_DATA_TYPE; +import static org.elasticsearch.xpack.esql.core.type.DataType.UNDER_CONSTRUCTION; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -318,6 +319,9 @@ private void testLookupJoinTypes(String group) { initIndexes(group); initData(group); for (TestConfig config : testConfigurations.get(group).configs.values()) { + if ((isValidDatType(config.mainType()) && isValidDatType(config.lookupType())) == false ) { + continue; + } String query = String.format( Locale.ROOT, "FROM index | LOOKUP JOIN %s ON %s | KEEP other", @@ -572,4 +576,8 @@ public void testQuery(String query) { assertion().accept(e); } } + + private boolean isValidDatType(DataType dataType) { + return UNDER_CONSTRUCTION.get(dataType) == null || UNDER_CONSTRUCTION.get(dataType).isEnabled(); + } } From f1985245379837cdc269b7cf67bb39ca1d767487 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 5 Jun 2025 13:02:58 +0000 Subject: [PATCH 2/4] [CI] Auto commit changes from spotless --- .../org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java index 6fa904c8beff0..b3a03bbf342e0 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java @@ -319,7 +319,7 @@ private void testLookupJoinTypes(String group) { initIndexes(group); initData(group); for (TestConfig config : testConfigurations.get(group).configs.values()) { - if ((isValidDatType(config.mainType()) && isValidDatType(config.lookupType())) == false ) { + if ((isValidDatType(config.mainType()) && isValidDatType(config.lookupType())) == false) { continue; } String query = String.format( From 3ff3a72c904971d3e13ab63459ebf7d353d2e3e9 Mon Sep 17 00:00:00 2001 From: Aurelien FOUCRET Date: Thu, 5 Jun 2025 15:03:03 +0200 Subject: [PATCH 3/4] Fix typo. --- .../elasticsearch/xpack/esql/action/LookupJoinTypesIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java index 6fa904c8beff0..c2b8c9bf559ef 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java @@ -319,7 +319,7 @@ private void testLookupJoinTypes(String group) { initIndexes(group); initData(group); for (TestConfig config : testConfigurations.get(group).configs.values()) { - if ((isValidDatType(config.mainType()) && isValidDatType(config.lookupType())) == false ) { + if ((isValidDataType(config.mainType()) && isValidDataType(config.lookupType())) == false ) { continue; } String query = String.format( @@ -577,7 +577,7 @@ public void testQuery(String query) { } } - private boolean isValidDatType(DataType dataType) { + private boolean isValidDataType(DataType dataType) { return UNDER_CONSTRUCTION.get(dataType) == null || UNDER_CONSTRUCTION.get(dataType).isEnabled(); } } From 8fc1e83665dfee23dc0e56c365bde8f235fed945 Mon Sep 17 00:00:00 2001 From: Aurelien FOUCRET Date: Thu, 5 Jun 2025 15:35:26 +0200 Subject: [PATCH 4/4] Fix typo. --- .../elasticsearch/xpack/esql/action/LookupJoinTypesIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java index b3a03bbf342e0..fdf82bc73349d 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/LookupJoinTypesIT.java @@ -319,7 +319,7 @@ private void testLookupJoinTypes(String group) { initIndexes(group); initData(group); for (TestConfig config : testConfigurations.get(group).configs.values()) { - if ((isValidDatType(config.mainType()) && isValidDatType(config.lookupType())) == false) { + if ((isValidDataType(config.mainType()) && isValidDataType(config.lookupType())) == false) { continue; } String query = String.format( @@ -577,7 +577,7 @@ public void testQuery(String query) { } } - private boolean isValidDatType(DataType dataType) { + private boolean isValidDataType(DataType dataType) { return UNDER_CONSTRUCTION.get(dataType) == null || UNDER_CONSTRUCTION.get(dataType).isEnabled(); } }