File tree Expand file tree Collapse file tree 3 files changed +12
-2
lines changed
server/src/main/java/org/elasticsearch/xpack/esql/qa/rest
testFixtures/src/main/resources
src/main/java/org/elasticsearch/xpack/esql/action Expand file tree Collapse file tree 3 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -987,6 +987,10 @@ public void testDoubleParamsWithLookupJoin() throws IOException {
987987 }
988988
989989 public void testMultipleBatchesWithLookupJoin () throws IOException {
990+ assumeTrue (
991+ "Requires new null alias ids for join with multiple batches" ,
992+ EsqlCapabilities .Cap .REPLACE_MISSING_FIELD_WITH_NULL_NEW_ALIAS_ID_FOR_JOIN_AND_MULTIPLE_BATCHES .isEnabled ()
993+ );
990994 // Create more than 10 indices to trigger multiple batches of data node execution.
991995 // The sort field should be missing on some indices to reproduce NullPointerException caused by duplicated items in layout
992996 for (int i = 1 ; i <= 20 ; i ++) {
Original file line number Diff line number Diff line change @@ -1456,9 +1456,10 @@ emp_no:integer | language_code:integer | language_name:keyword
14561456multipleBatches
14571457required_capability: join_lookup_v12
14581458required_capability: remove_redundant_sort
1459+ required_capability: replace_missing_field_with_null_new_alias_id_for_join_and_multiple_batches
14591460
14601461from *
1461- | rename city.country.continent.planet.name as message
1462+ | rename city.country.continent.planet.name as message
14621463| lookup join message_types_lookup on message
14631464| sort language_code, birth_date
14641465| keep birth_date
Original file line number Diff line number Diff line change @@ -912,7 +912,12 @@ public enum Cap {
912912 /**
913913 * The metrics command
914914 */
915- METRICS_COMMAND (Build .current ().isSnapshot ());
915+ METRICS_COMMAND (Build .current ().isSnapshot ()),
916+
917+ /**
918+ * Create null alias with new id in ReplaceMissingFieldWithNull when there is lookup join with multiple batches.
919+ */
920+ REPLACE_MISSING_FIELD_WITH_NULL_NEW_ALIAS_ID_FOR_JOIN_AND_MULTIPLE_BATCHES ;
916921
917922 private final boolean enabled ;
918923
You can’t perform that action at this time.
0 commit comments