Revert "[ESQL] Introduce pluggable external datasource framework (#141678) (#142663)

* Revert "[ESQL] Introduce pluggable external datasource framework (#141678)"

This reverts commit 6acdb30. It's
causing HeapAttackIT to fail in serverless. On some machines. But not
others! How exciting.

For now, we'll revert and then try and get it back more slowly.

Co-authored-by: Nik Everett <nik9000@gmail.com>

Author: smalyshev

build-tools-internal/version.properties

@@ -24,7 +24,6 @@ cuvs_java           = 25.12.0
 ldapsdk             = 7.0.3
 
 antlr4            = 4.13.1
-iceberg           = 1.10.1
 # bouncy castle version for non-fips. fips jars use a different version
 bouncycastle=1.79
 # used by security and idp (need to be in sync due to cross-dependency in testing)

gradle/verification-metadata.xml

@@ -118,9 +118,6 @@ public void handle(final HttpExchange exchange) throws IOException {
                 if (blob == null) {
                     exchange.sendResponseHeaders(RestStatus.NOT_FOUND.getStatus(), -1);
                 } else {
-                    // HEAD response must include Content-Length header for S3 clients (AWS SDK) that read file size
-                    exchange.getResponseHeaders().add("Content-Length", String.valueOf(blob.length()));
-                    exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
                     exchange.sendResponseHeaders(RestStatus.OK.getStatus(), -1);
                 }
             } else if (request.isListMultipartUploadsRequest()) {
@@ -184,9 +181,6 @@ public void handle(final HttpExchange exchange) throws IOException {
                             exchange.sendResponseHeaders(RestStatus.NOT_FOUND.getStatus(), -1);
                         } else {
                             var range = parsePartRange(exchange);
-                            if (range.end() == null) {
-                                throw new AssertionError("Copy-part range must specify an end: " + range);
-                            }
                             int start = Math.toIntExact(range.start());
                             int len = Math.toIntExact(range.end() - range.start() + 1);
                             var part = sourceBlob.slice(start, len);
@@ -385,15 +379,16 @@ public void handle(final HttpExchange exchange) throws IOException {
                     return;
                 }
 
-                // S3 supports https://www.rfc-editor.org/rfc/rfc9110.html#name-range
-                // This handler supports both bounded ranges (bytes=0-100) and open-ended ranges (bytes=100-)
+                // S3 supports https://www.rfc-editor.org/rfc/rfc9110.html#name-range. The AWS SDK v1.x seems to always generate range
+                // requests with a header value like "Range: bytes=start-end" where both {@code start} and {@code end} are always defined
+                // (sometimes to very high value for {@code end}). It would be too tedious to fully support the RFC so S3HttpHandler only
+                // supports when both {@code start} and {@code end} are defined to match the SDK behavior.
                 final HttpHeaderParser.Range range = parseRangeHeader(rangeHeader);
                 if (range == null) {
                     throw new AssertionError("Bytes range does not match expected pattern: " + rangeHeader);
                 }
                 long start = range.start();
-                // For open-ended ranges (bytes=N-), end is null, meaning "to end of file"
-                long end = range.end() != null ? range.end() : blob.length() - 1;
+                long end = range.end();
                 if (end < start) {
                     exchange.getResponseHeaders().add("Content-Type", "application/octet-stream");
                     exchange.sendResponseHeaders(RestStatus.OK.getStatus(), blob.length());

test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java

@@ -15,18 +15,13 @@
 public enum HttpHeaderParser {
     ;
 
-    // Pattern supports both bounded ranges (bytes=0-100) and open-ended ranges (bytes=100-)
-    private static final Pattern RANGE_HEADER_PATTERN = Pattern.compile("bytes=([0-9]+)-([0-9]*)");
+    private static final Pattern RANGE_HEADER_PATTERN = Pattern.compile("bytes=([0-9]+)-([0-9]+)");
     private static final Pattern CONTENT_RANGE_HEADER_PATTERN = Pattern.compile("bytes (?:(\\d+)-(\\d+)|\\*)/(?:(\\d+)|\\*)");
 
     /**
      * Parse a "Range" header
      *
-     * Supports both bounded and open-ended ranges:
-     * <ul>
-     *   <li>Bounded: <code>Range: bytes={range_start}-{range_end}</code></li>
-     *   <li>Open-ended: <code>Range: bytes={range_start}-</code> (end is null, meaning "to end of file")</li>
-     * </ul>
+     * Note: only a single bounded range is supported (e.g. <code>Range: bytes={range_start}-{range_end}</code>)
      *
      * @see <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range">MDN: Range header</a>
      * @param rangeHeaderValue The header value as a string
@@ -36,38 +31,18 @@ public static Range parseRangeHeader(String rangeHeaderValue) {
         final Matcher matcher = RANGE_HEADER_PATTERN.matcher(rangeHeaderValue);
         if (matcher.matches()) {
             try {
-                long start = Long.parseLong(matcher.group(1));
-                String endGroup = matcher.group(2);
-                Long end = (endGroup == null || endGroup.isEmpty()) ? null : Long.parseLong(endGroup);
-                return new Range(start, end);
+                return new Range(Long.parseLong(matcher.group(1)), Long.parseLong(matcher.group(2)));
             } catch (NumberFormatException e) {
                 return null;
             }
         }
         return null;
     }
 
-    /**
-     * A HTTP "Range" from a Range header.
-     *
-     * @param start The start of the range (always present)
-     * @param end The end of the range, or null for open-ended ranges (meaning "to end of file")
-     */
-    public record Range(long start, Long end) {
-
-        public Range(long start, long end) {
-            this(start, (Long) end);
-        }
-
-        /**
-         * Returns true if this is an open-ended range (no end specified).
-         */
-        public boolean isOpenEnded() {
-            return end == null;
-        }
+    public record Range(long start, long end) {
 
         public String headerString() {
-            return end != null ? "bytes=" + start + "-" + end : "bytes=" + start + "-";
+            return "bytes=" + start + "-" + end;
         }
     }
 

test/framework/src/main/java/org/elasticsearch/test/fixture/HttpHeaderParser.java

@@ -43,9 +43,8 @@ public void testParseRangeHeaderMultipleRangesNotMatched() {
         );
     }
 
-    public void testParseRangeHeaderEndlessRange() {
-        var bytes = randomLongBetween(0, Long.MAX_VALUE);
-        assertEquals(new HttpHeaderParser.Range(bytes, null), HttpHeaderParser.parseRangeHeader(Strings.format("bytes=%d-", bytes)));
+    public void testParseRangeHeaderEndlessRangeNotMatched() {
+        assertNull(HttpHeaderParser.parseRangeHeader(Strings.format("bytes=%d-", randomLongBetween(0, Long.MAX_VALUE))));
     }
 
     public void testParseRangeHeaderSuffixLengthNotMatched() {