File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed 
x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -276,9 +276,6 @@ tests:
276276- class : org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests 
277277  method : testBottomFieldSort 
278278  issue : https://github.com/elastic/elasticsearch/issues/118214 
279- - class : org.elasticsearch.xpack.esql.action.CrossClustersEnrichIT 
280-   method : testTopNThenEnrichRemote 
281-   issue : https://github.com/elastic/elasticsearch/issues/118307 
282279- class : org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1UnavailableRemotesIT 
283280  method : testEsqlRcs1UnavailableRemoteScenarios 
284281  issue : https://github.com/elastic/elasticsearch/issues/118350 
Original file line number Diff line number Diff line change 1212import  org .elasticsearch .xpack .esql .core .expression .Attribute ;
1313import  org .elasticsearch .xpack .esql .core .expression .Expressions ;
1414import  org .elasticsearch .xpack .esql .optimizer .rules .PlanConsistencyChecker ;
15+ import  org .elasticsearch .xpack .esql .plan .logical .Enrich ;
1516import  org .elasticsearch .xpack .esql .plan .physical .AggregateExec ;
17+ import  org .elasticsearch .xpack .esql .plan .physical .EnrichExec ;
1618import  org .elasticsearch .xpack .esql .plan .physical .FieldExtractExec ;
1719import  org .elasticsearch .xpack .esql .plan .physical .PhysicalPlan ;
1820
@@ -35,6 +37,12 @@ public Collection<Failure> verify(PhysicalPlan plan) {
3537        Set <Failure > failures  = new  LinkedHashSet <>();
3638        Failures  depFailures  = new  Failures ();
3739
40+         // AwaitsFix https://github.com/elastic/elasticsearch/issues/118531 
41+         var  enriches  = plan .collectFirstChildren (EnrichExec .class ::isInstance );
42+         if  (enriches .isEmpty () == false  && ((EnrichExec ) enriches .get (0 )).mode () == Enrich .Mode .REMOTE ) {
43+             return  failures ;
44+         }
45+ 
3846        plan .forEachDown (p  -> {
3947            if  (p  instanceof  AggregateExec  agg ) {
4048                var  exclude  = Expressions .references (agg .ordinalAttributes ());
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments