From ce8ae757d6d2dd272bfe0af24af022e77466a6ab Mon Sep 17 00:00:00 2001
From: cgivre <cgivre@gmail.com>
Date: Mon, 5 May 2025 23:30:08 -0400
Subject: [PATCH 1/2] DRILL-8524: Drill Adding Duplicate Parameters in Offset
 Paginator

---
 contrib/storage-http/pom.xml                           | 10 +++++++++-
 .../exec/store/http/paginator/OffsetPaginator.java     |  7 ++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/contrib/storage-http/pom.xml b/contrib/storage-http/pom.xml
index d49e2ab7d19..311ab58d275 100644
--- a/contrib/storage-http/pom.xml
+++ b/contrib/storage-http/pom.xml
@@ -31,7 +31,7 @@
   <name>Drill : Contrib : Storage : HTTP</name>
 
   <properties>
-    <okhttp.version>4.9.3</okhttp.version>
+    <okhttp.version>4.12.0</okhttp.version>
   </properties>
 
   <dependencies>
@@ -100,6 +100,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>10</source>
+          <target>10</target>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
index eed3c2384b9..2f30c6d428d 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
+++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/paginator/OffsetPaginator.java
@@ -73,11 +73,8 @@ public String next() {
       throw new NoSuchElementException();
     }
 
-    builder.removeAllEncodedQueryParameters(offsetParam);
-    builder.removeAllEncodedQueryParameters(limitParam);
-
-    builder.addQueryParameter(offsetParam, String.valueOf(offset));
-    builder.addQueryParameter(limitParam, String.valueOf(pageSize));
+    builder.setEncodedQueryParameter(offsetParam, String.valueOf(offset));
+    builder.setEncodedQueryParameter(limitParam, String.valueOf(pageSize));
     offset += pageSize;
 
     return builder.build().url().toString();

From b940c893d1588c613c765144b92ca4ebe13825f6 Mon Sep 17 00:00:00 2001
From: cgivre <cgivre@gmail.com>
Date: Mon, 5 May 2025 23:36:01 -0400
Subject: [PATCH 2/2] Remove accidental pom.xml modification.

---
 contrib/storage-http/pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/contrib/storage-http/pom.xml b/contrib/storage-http/pom.xml
index 311ab58d275..9796978992a 100644
--- a/contrib/storage-http/pom.xml
+++ b/contrib/storage-http/pom.xml
@@ -100,14 +100,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>10</source>
-          <target>10</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>