Improved changelog text, and fixed failing tests

craigtaverner · Nov 14, 2024 · 95ce406 · 95ce406
1 parent 4967d43
commit 95ce406
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/docs/changelog/115091.yaml b/docs/changelog/115091.yaml
@@ -1,5 +1,5 @@
 pr: 115091
-summary: Added strict range type checks for ENRICH
+summary: Added stricter range type checks and runtime warnings for ENRICH
 area: ES|QL
 type: bug
 issues:

diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle
@@ -89,5 +89,6 @@ tasks.named("yamlRestCompatTestTransform").configure({ task ->
   task.skipTest("esql/80_text/reverse text", "The output type changed from TEXT to KEYWORD.")
   task.skipTest("esql/80_text/values function", "The output type changed from TEXT to KEYWORD.")
   task.skipTest("privileges/11_builtin/Test get builtin privileges" ,"unnecessary to test compatibility")
+  task.skipTest("esql/61_enrich_ip/Invalid IP strings", "We switched from exceptions to null+warnings for ENRICH runtime errors")
 })
 
diff --git a/.../plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/AbstractLookupService.java b/.../plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/AbstractLookupService.java
@@ -168,8 +168,8 @@ abstract class AbstractLookupService<R extends AbstractLookupService.Request, T
         );
     }
 
-    public ThreadPool getThreadPool() {
-        return transportService.getThreadPool();
+    public ThreadContext getThreadContext() {
+        return transportService.getThreadPool().getThreadContext();
     }
 
     /**

diff --git a/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupOperator.java b/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichLookupOperator.java
@@ -111,7 +111,7 @@ public EnrichLookupOperator(
         this.matchField = matchField;
         this.enrichFields = enrichFields;
         this.source = source;
-        this.responseHeadersCollector = new ResponseHeadersCollector(enrichLookupService.getThreadPool().getThreadContext());
+        this.responseHeadersCollector = new ResponseHeadersCollector(enrichLookupService.getThreadContext());
     }
 
     @Override