This is an automated email from the ASF dual-hosted git repository.

mattisonchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new ef5e0ffc80f [improve][meta] Upgrade Oxia client to 0.8.0 (#25962)
ef5e0ffc80f is described below

commit ef5e0ffc80f26c1638e99c66c82640342b25d9c0
Author: Qiang Zhao <[email protected]>
AuthorDate: Mon Jun 8 15:39:42 2026 +0800

    [improve][meta] Upgrade Oxia client to 0.8.0 (#25962)
---
 distribution/server/src/assemble/LICENSE.bin.txt                    | 6 ++++--
 gradle/libs.versions.toml                                           | 5 +++--
 .../org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java     | 3 ++-
 .../src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java | 4 +---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt 
b/distribution/server/src/assemble/LICENSE.bin.txt
index 007de90d5c5..957f2ab5851 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -489,11 +489,13 @@ The Apache Software License, Version 2.0
     - io.dropwizard.metrics-metrics-core-4.1.12.1.jar
     - io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar
     - io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar
+  * Failsafe
+    - dev.failsafe-failsafe-3.3.2.jar
   * Prometheus
     - io.prometheus-simpleclient_httpserver-0.16.0.jar
   * Oxia
-    - io.github.oxia-db-oxia-client-api-0.7.4.jar
-    - io.github.oxia-db-oxia-client-0.7.4.jar
+    - io.github.oxia-db-oxia-client-api-0.8.0.jar
+    - io.github.oxia-db-oxia-client-0.8.0.jar
   * OpenHFT
     - net.openhft-zero-allocation-hashing-0.16.jar
   * Java JSON WebTokens
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0cea45978ca..c624875b70a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -142,7 +142,8 @@ jakarta-validation = "3.0.2"
 javax-servlet = "3.1.0"
 jakarta-servlet = "6.0.0"
 # Oxia / etcd
-oxia = "0.7.4"
+oxia = "0.8.0"
+oxia-testcontainers = "0.7.4"
 # Build plugins
 lightproto = "0.7.3"
 errorprone = "2.45.0"
@@ -410,7 +411,7 @@ zt-zip = { module = "org.zeroturnaround:zt-zip", 
version.ref = "zt-zip" }
 ipaddress = { module = "com.github.seancfoley:ipaddress", version.ref = 
"ipaddress" }
 # Oxia / etcd
 oxia-client = { module = "io.github.oxia-db:oxia-client", version.ref = "oxia" 
}
-oxia-testcontainers = { module = "io.github.oxia-db:oxia-testcontainers", 
version.ref = "oxia" }
+oxia-testcontainers = { module = "io.github.oxia-db:oxia-testcontainers", 
version.ref = "oxia-testcontainers" }
 # Static analysis
 spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", 
version.ref = "spotbugs" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
diff --git 
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
 
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
index c8f52e468ab..336c1d942ff 100644
--- 
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
+++ 
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
@@ -223,9 +223,10 @@ public class OxiaMetadataStore extends 
AbstractMetadataStore {
         try {
             client.rangeScan(firstKey, lastKey, new 
io.oxia.client.api.RangeScanConsumer() {
                 @Override
-                public void onNext(io.oxia.client.api.GetResult result) {
+                public boolean onNext(io.oxia.client.api.GetResult result) {
                     consumer.onNext(new GetResult(result.value(),
                             convertStat(result.key(), result.version())));
+                    return true;
                 }
 
                 @Override
diff --git 
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
 
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
index d23a1b95572..406e57d6be2 100644
--- 
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
+++ 
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
@@ -32,7 +32,6 @@ import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 import io.oxia.client.ClientConfig;
 import io.oxia.client.api.AsyncOxiaClient;
-import io.oxia.client.session.SessionFactory;
 import io.oxia.client.session.SessionManager;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -622,8 +621,7 @@ public class MetadataStoreTest extends 
BaseMetadataStoreTest {
         OxiaMetadataStore store = (OxiaMetadataStore) 
MetadataStoreFactory.create(oxia, config);
         var client = (AsyncOxiaClient) WhiteboxImpl.getInternalState(store, 
"client");
         var sessionManager = (SessionManager) 
WhiteboxImpl.getInternalState(client, "sessionManager");
-        var sessionFactory = (SessionFactory) 
WhiteboxImpl.getInternalState(sessionManager, "factory");
-        var clientConfig = (ClientConfig) 
WhiteboxImpl.getInternalState(sessionFactory, "config");
+        var clientConfig = (ClientConfig) 
WhiteboxImpl.getInternalState(sessionManager, "clientConfig");
         var sessionTimeout = clientConfig.sessionTimeout();
         assertEquals(sessionTimeout, Duration.ofSeconds(60));
     }

Reply via email to