just stash

Author: xiangying

pcip/pcip-4.md

@@ -0,0 +1,116 @@
+<!--
+RULES
+* Never place a link to an external site like Google Doc. The proposal should be in this issue entirely.
+* Use a spelling and grammar checker tools if available for you (there are plenty of free ones).
+
+PROPOSAL HEALTH CHECK
+I can read the design document and understand the problem statement and what you plan to change *without* resorting to a couple of hours of code reading just to start having a high level understanding of the change.
+
+IMAGES
+If you need the diagrams, please create a folder named pcip-XXX under the [pcip/static/img](https://github.com/apache/pulsar-java-contrib/tree/master/pcip/static/img) path and put the images in.
+
+THIS COMMENTS
+Please remove them when done.
+-->
+
+# PCIP-XXX: Proposal title
+
+# Background knowledge
+
+<!--
+Describes all the knowledge you need to know in order to understand all the other sections in this PCIP
+
+* Give a high level explanation on all concepts you will be using throughout this document. For example, if you want to talk about Persistent Subscriptions, explain briefly (1 paragraph) what this is. If you're going to talk about Transaction Buffer, explain briefly what this is. 
+  If you're going to change something specific, then go into more detail about it and how it works. 
+* Provide links where possible if a person wants to dig deeper into the background information. 
+
+DON'T
+* Do not include links *instead* explanation. Do provide links for further explanation.
+
+EXAMPLES
+* See [PCIP-2](https://github.com/apache/pulsar-java-contrib/pull/6), Background section to get an understanding on how you add the background knowledge needed.
+  (They also included the motivation there, but ignore it as we place that in Motivation section explicitly).
+-->
+
+# Motivation
+
+<!--
+Describe the problem this proposal is trying to solve.
+
+* Explain what is the problem you're trying to solve - current situation.
+* This section is the "Why" of your proposal.
+-->
+
+# Goals
+
+## In Scope
+
+<!--
+What this PCIP intend to achieve once It's integrated into Pulsar.
+Why does it benefit Pulsar.
+-->
+
+## Out of Scope
+
+<!--
+Describe what you have decided to keep out of scope, perhaps left for a different PCIP/s.
+-->
+
+
+# High Level Design
+
+<!--
+Describe the design of your solution in *high level*.
+Describe the solution end to end, from a birds-eye view.
+Don't go into implementation details in this section.
+
+I should be able to finish reading from beginning of the PCIP to here (including) and understand the feature and 
+how you intend to solve it, end to end.
+
+DON'T
+* Avoid code snippets, unless it's essential to explain your intent.
+-->
+
+# Detailed Design
+
+## Design & Implementation Details
+
+<!--
+This is the section where you dive into the details. It can be:
+* Concrete class names and their roles and responsibility, including methods.
+* Code snippets of existing code.
+* Interface names and its methods.
+* ...
+-->
+
+## Public-facing Changes
+
+<!--
+Describe the additions you plan to make for each public facing component. 
+Remove the sections you are not changing.
+Clearly mark any changes which are BREAKING backward compatability.
+-->
+
+### Public API
+<!--
+When adding a new endpoint to the REST API, please make sure to document the following:
+
+* path
+* query parameters
+* HTTP body parameters, usually as JSON.
+* Response codes, and for each what they mean.
+  For each response code, please include a detailed description of the response body JSON, specifying each field and what it means.
+  This is the place to document the errors.
+-->
+
+### Configuration
+
+### CLI
+
+# Get started
+
+## Quick Start
+
+<!--
+Introduce how to use it and teach users how to use it quickly
+-->

pom.xml

@@ -35,7 +35,7 @@
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <pulsar.version>3.3.1</pulsar.version>
+        <pulsar.version>4.1.0-SNAPSHOT</pulsar.version>
         <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
         <puppycrawl.checkstyle.version>8.45.1</puppycrawl.checkstyle.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
@@ -50,6 +50,7 @@
         <testcontainers.version>1.20.1</testcontainers.version>
         <junit.version>4.13.1</junit.version>
         <mockito.version>5.12.0</mockito.version>
+        <caffeine.version>3.2.0</caffeine.version>
     </properties>
 
     <modules>

pulsar-client-common-contrib/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.pulsar</groupId>
             <artifactId>pulsar-client-all</artifactId>
-            <version>${pulsar.version}}</version>
+            <version>${pulsar.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>

pulsar-client-common-contrib/src/main/java/org/apache/pulsar/client/api/impl/PulsarPullConsumerImpl.java

@@ -144,7 +144,7 @@ private List<Message<T>> readMessages(Reader<T> reader,
 
     @Override
     public void ack(long offset, int partition) throws PulsarClientException {
-        String partitionTopic = buildPartitionTopic(topic, partition);
+        String partitionTopic = partition >=0 ? buildPartitionTopic(topic, partition) : topic;
         Consumer<T> consumer = consumerMap.get(partitionTopic);
         if (consumer == null) {
             throw new PulsarClientException("Consumer not found for partition: " + partition);
@@ -159,14 +159,14 @@ public void ack(long offset, int partition) throws PulsarClientException {
 
     @Override
     public long searchOffset(int partition, long timestamp) throws PulsarAdminException {
-        String partitionTopic = buildPartitionTopic(topic, partition);
+        String partitionTopic = partition >=0 ? buildPartitionTopic(topic, partition) : topic;
         MessageIdAdv messageId = (MessageIdAdv) pulsarAdmin.topics().getMessageIdByTimestamp(partitionTopic, timestamp);
         return extractMessageIndex(partitionTopic, messageId);
     }
 
     @Override
     public long getConsumeStats(int partition) throws PulsarAdminException {
-        String partitionTopic = buildPartitionTopic(topic, partition);
+        String partitionTopic = partition >=0 ? buildPartitionTopic(topic, partition) : topic;
         String messageIdStr = pulsarAdmin.topics()
                 .getPartitionedInternalStats(topic)
                 .partitions.get(partitionTopic)
@@ -199,7 +199,6 @@ private void closeResources() {
         }
     }
 
-    // Validation helpers
     private void validatePullParameters(int maxMessages, int maxBytes) {
         if (maxMessages <= 0) {
             throw new IllegalArgumentException("maxMessages must be positive");

pulsar-client-common-contrib/src/main/java/org/apache/pulsar/client/util/OffsetToMessageIdCache.java

@@ -7,6 +7,7 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.MessageId;
 
 /**
@@ -48,15 +49,8 @@ private LoadingCache<Long, MessageId> createCache(String partitionTopic) {
     /**
      * TODO: Implement after https://github.com/apache/pulsar/pull/24220 is merged
      */
-    private MessageId loadMessageId(String partitionTopic, Long offset) {
-        // Placeholder implementation
-        // try {
-        //     return pulsarAdmin.topics().getMessageIDByOffsetAndPartitionID(partitionTopic, offset);
-        // } catch (PulsarAdminException e) {
-        //     throw new CompletionException("Failed to load message ID for "
-        //         + partitionTopic + " offset " + offset, e);
-        // }
-        return null;
+    private MessageId loadMessageId(String partitionTopic, Long offset) throws PulsarAdminException {
+        return pulsarAdmin.topics().getMessageIdByIndex(partitionTopic, offset);
     }
 
     public MessageId getMessageIdByOffset(String partitionTopic, long offset) {

pulsar-client-common-contrib/src/main/java/org/apache/pulsar/client/util/ReaderCache.java

@@ -116,11 +116,8 @@ public Reader<T> getReader(String partitionTopic, long offset) {
 
     // Allows users to proactively return the reader
     public void releaseReader(String partitionTopic, long offset, Reader<T> reader) {
-        // Assumes the partitionTopic entry exists
         readerCacheMap.computeIfPresent(partitionTopic, (pt, cache) -> {
-            if (!reader.isConnected()) {
-                closeReaderSilently(reader);
-            } else {
+            if (reader.isConnected()) {
                 cache.put(offset, reader);
             }
             return cache;