congbobo184 commented on code in PR #16931:
URL: https://github.com/apache/pulsar/pull/16931#discussion_r1000516836
##########
pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java:
##########
@@ -37,6 +37,15 @@ public class SystemTopicNames {
*/
public static final String TRANSACTION_BUFFER_SNAPSHOT =
"__transaction_buffer_snapshot";
+ /**
+ * Local topic name for the transaction buffer snapshot segment.
+ */
+ public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENT =
"__transaction_buffer_snapshot_segments";
Review Comment:
```suggestion
public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS =
"__transaction_buffer_snapshot_segments";
```
##########
pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java:
##########
@@ -37,6 +37,15 @@ public class SystemTopicNames {
*/
public static final String TRANSACTION_BUFFER_SNAPSHOT =
"__transaction_buffer_snapshot";
+ /**
+ * Local topic name for the transaction buffer snapshot segment.
Review Comment:
```suggestion
* Local topic name for the transaction buffer snapshot segments.
```
##########
pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java:
##########
@@ -37,6 +37,15 @@ public class SystemTopicNames {
*/
public static final String TRANSACTION_BUFFER_SNAPSHOT =
"__transaction_buffer_snapshot";
+ /**
+ * Local topic name for the transaction buffer snapshot segment.
Review Comment:
```suggestion
* Local topic name for the transaction buffer snapshot segments.
```
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSnapshotBaseSystemTopicClient.java:
##########
@@ -0,0 +1,218 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.systopic;
+
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.naming.TopicName;
+
+@Slf4j
+public class TransactionBufferSnapshotBaseSystemTopicClient<T> extends
SystemTopicClientBase<T> {
+
+ protected final SystemTopicTxnBufferSnapshotService<T>
systemTopicTxnBufferSnapshotService;
+ protected final Class<T> schemaType;
+
+ public TransactionBufferSnapshotBaseSystemTopicClient(PulsarClient client,
+ TopicName topicName,
+
SystemTopicTxnBufferSnapshotService<T>
+
systemTopicTxnBufferSnapshotService,
+ Class<T> schemaType)
{
+ super(client, topicName);
+ this.systemTopicTxnBufferSnapshotService =
systemTopicTxnBufferSnapshotService;
+ this.schemaType = schemaType;
+ }
+
+ protected void removeWriter(Writer<T> writer) {
+ writers.remove(writer);
+ this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this);
+ }
+
+ protected void removeReader(Reader<T> reader) {
+ readers.remove(reader);
+ this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this);
+ }
+
+ protected static class TransactionBufferSnapshotWriter<T> implements
Writer<T> {
+
+ protected final Producer<T> producer;
+ protected final TransactionBufferSnapshotBaseSystemTopicClient<T>
+ transactionBufferSnapshotBaseSystemTopicClient;
+
+ protected TransactionBufferSnapshotWriter(Producer<T> producer,
+
TransactionBufferSnapshotBaseSystemTopicClient<T>
+
transactionBufferSnapshotBaseSystemTopicClient) {
+ this.producer = producer;
+ this.transactionBufferSnapshotBaseSystemTopicClient =
transactionBufferSnapshotBaseSystemTopicClient;
+ }
+
+ @Override
+ public MessageId write(T t, String key)
+ throws PulsarClientException {
+ return producer.newMessage().key(key)
+ .value(t).send();
+ }
+
+ @Override
+ public CompletableFuture<MessageId> writeAsync(T t, String key) {
+ return producer.newMessage()
+ .key(key)
+ .value(t).sendAsync();
+ }
+
+ @Override
+ public MessageId delete(T t, String key)
+ throws PulsarClientException {
+ return producer.newMessage()
+ .key(key)
+ .value(null)
+ .send();
+ }
+
+ @Override
+ public CompletableFuture<MessageId> deleteAsync(T t, String key) {
+ return producer.newMessage()
+ .key(key)
+ .value(null)
+ .sendAsync();
+ }
+
+ @Override
+ public void close() throws IOException {
+ this.producer.close();
+ transactionBufferSnapshotBaseSystemTopicClient.removeWriter(this);
Review Comment:
+1
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java:
##########
@@ -74,7 +74,7 @@ protected CompletableFuture<Reader<PulsarEvent>>
newReaderAsyncInternal() {
});
}
- private static class TopicPolicyWriter implements Writer<PulsarEvent> {
+ public static class TopicPolicyWriter implements Writer<PulsarEvent> {
Review Comment:
why change this to public?
##########
pulsar-common/src/main/java/org/apache/pulsar/common/naming/SystemTopicNames.java:
##########
@@ -37,6 +37,15 @@ public class SystemTopicNames {
*/
public static final String TRANSACTION_BUFFER_SNAPSHOT =
"__transaction_buffer_snapshot";
+ /**
+ * Local topic name for the transaction buffer snapshot segment.
+ */
+ public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENT =
"__transaction_buffer_snapshot_segments";
Review Comment:
```suggestion
public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENT =
"__transaction_buffer_snapshot_segments";
```
```suggestion
public static final String TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS =
"__transaction_buffer_snapshot_segments";
```
##########
pulsar-common/src/main/java/org/apache/pulsar/common/events/EventType.java:
##########
@@ -31,5 +31,15 @@ public enum EventType {
/**
* Transaction buffer snapshot events.
*/
- TRANSACTION_BUFFER_SNAPSHOT
+ TRANSACTION_BUFFER_SNAPSHOT,
+
+ /**
+ * Transaction buffer snapshot segment events.
+ */
+ TRANSACTION_BUFFER_SNAPSHOT_SEGMENT,
Review Comment:
```suggestion
TRANSACTION_BUFFER_SNAPSHOT_SEGMENTS,
```
##########
pulsar-client-api/src/main/java/org/apache/pulsar/client/api/transaction/TxnID.java:
##########
@@ -39,14 +43,14 @@ public class TxnID implements Serializable {
*
* @serial
*/
- private final long mostSigBits;
+ private long mostSigBits;
Review Comment:
add final
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/systopic/TransactionBufferSnapshotBaseSystemTopicClient.java:
##########
@@ -0,0 +1,216 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.systopic;
+
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.service.SystemTopicTxnBufferSnapshotService;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.naming.TopicName;
+
+@Slf4j
+public class TransactionBufferSnapshotBaseSystemTopicClient<T> extends
SystemTopicClientBase<T> {
+
+ protected final SystemTopicTxnBufferSnapshotService<T>
systemTopicTxnBufferSnapshotService;
+ protected final Class<T> schemaType;
+
+ public TransactionBufferSnapshotBaseSystemTopicClient(PulsarClient client,
+ TopicName topicName,
+
SystemTopicTxnBufferSnapshotService<T>
+
systemTopicTxnBufferSnapshotService,
+ Class<T> schemaType)
{
+ super(client, topicName);
+ this.systemTopicTxnBufferSnapshotService =
systemTopicTxnBufferSnapshotService;
+ this.schemaType = schemaType;
+ }
+
+ protected void removeWriter(Writer<T> writer) {
+ writers.remove(writer);
+ this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this);
+ }
+
+ protected void removeReader(Reader<T> reader) {
+ readers.remove(reader);
+ this.systemTopicTxnBufferSnapshotService.removeClient(topicName, this);
+ }
+
+ protected static class TransactionBufferSnapshotWriter<T> implements
Writer<T> {
+
+ protected final Producer<T> producer;
+ protected final TransactionBufferSnapshotBaseSystemTopicClient<T>
+ transactionBufferSnapshotBaseSystemTopicClient;
+
+ protected TransactionBufferSnapshotWriter(Producer<T> producer,
+
TransactionBufferSnapshotBaseSystemTopicClient<T>
+
transactionBufferSnapshotBaseSystemTopicClient) {
+ this.producer = producer;
+ this.transactionBufferSnapshotBaseSystemTopicClient =
transactionBufferSnapshotBaseSystemTopicClient;
+ }
+
+ @Override
+ public MessageId write(String key, T t)
+ throws PulsarClientException {
+ return producer.newMessage().key(key)
+ .value(t).send();
+ }
+
+ @Override
+ public CompletableFuture<MessageId> writeAsync(String key, T t) {
+ return producer.newMessage()
+ .key(key)
+ .value(t).sendAsync();
+ }
+
+ @Override
+ public MessageId delete(String key, T t)
+ throws PulsarClientException {
+ return producer.newMessage()
+ .key(key)
+ .value(null)
+ .send();
+ }
+
+ @Override
+ public CompletableFuture<MessageId> deleteAsync(String key, T t) {
+ return producer.newMessage()
+ .key(key)
+ .value(null)
+ .sendAsync();
+ }
+
+ @Override
+ public void close() throws IOException {
+ this.producer.closeAsync().join();
+ transactionBufferSnapshotBaseSystemTopicClient.removeWriter(this);
+ }
+
+ @Override
+ public CompletableFuture<Void> closeAsync() {
+ CompletableFuture<Void> completableFuture = new
CompletableFuture<>();
+ producer.closeAsync().whenComplete((v, e) -> {
+ // if close fail, also need remove the producer
+
transactionBufferSnapshotBaseSystemTopicClient.removeWriter(this);
+ if (e != null) {
+ completableFuture.completeExceptionally(e);
+ return;
+ }
+ completableFuture.complete(null);
+ });
+ return completableFuture;
+ }
+
+ @Override
+ public SystemTopicClient<T> getSystemTopicClient() {
+ return transactionBufferSnapshotBaseSystemTopicClient;
+ }
+ }
+
+ protected static class TransactionBufferSnapshotReader<T> implements
Reader<T> {
+
+ private final org.apache.pulsar.client.api.Reader<T> reader;
+ private final TransactionBufferSnapshotBaseSystemTopicClient<T>
transactionBufferSnapshotBaseSystemTopicClient;
+
+ protected TransactionBufferSnapshotReader(
+ org.apache.pulsar.client.api.Reader<T> reader,
+ TransactionBufferSnapshotBaseSystemTopicClient<T>
transactionBufferSnapshotBaseSystemTopicClient) {
+ this.reader = reader;
+ this.transactionBufferSnapshotBaseSystemTopicClient =
transactionBufferSnapshotBaseSystemTopicClient;
+ }
+
+ @Override
+ public Message<T> readNext() throws PulsarClientException {
+ return reader.readNext();
+ }
+
+ @Override
+ public CompletableFuture<Message<T>> readNextAsync() {
+ return reader.readNextAsync();
+ }
+
+ @Override
+ public boolean hasMoreEvents() throws PulsarClientException {
+ return reader.hasMessageAvailable();
+ }
+
+ @Override
+ public CompletableFuture<Boolean> hasMoreEventsAsync() {
+ return reader.hasMessageAvailableAsync();
+ }
+
+ @Override
+ public void close() throws IOException {
+ this.reader.closeAsync().join();
+ transactionBufferSnapshotBaseSystemTopicClient.removeReader(this);
+ }
+
+ @Override
+ public CompletableFuture<Void> closeAsync() {
+ CompletableFuture<Void> completableFuture = new
CompletableFuture<>();
+ reader.closeAsync().whenComplete((v, e) -> {
+ // if close fail, also need remove the reader
+
transactionBufferSnapshotBaseSystemTopicClient.removeReader(this);
+ if (e != null) {
+ completableFuture.completeExceptionally(e);
+ return;
+ }
+ completableFuture.complete(null);
+ });
+ return completableFuture;
+ }
+
+ @Override
+ public SystemTopicClient<T> getSystemTopic() {
+ return transactionBufferSnapshotBaseSystemTopicClient;
+ }
+ }
+
+ @Override
+ protected CompletableFuture<Writer<T>> newWriterAsyncInternal() {
+ return client.newProducer(Schema.AVRO(schemaType))
+ .topic(topicName.toString())
+ .createAsync().thenApply(producer -> {
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] A new {} writer is created",
topicName, schemaType.getName());
+ }
+ return new TransactionBufferSnapshotWriter<>(producer,
this);
+ });
+ }
+
+ @Override
+ protected CompletableFuture<Reader<T>> newReaderAsyncInternal() {
+ return client.newReader(Schema.AVRO(schemaType))
+ .topic(topicName.toString())
+ .startMessageId(MessageId.earliest)
+ .readCompacted(true)
+ .createAsync()
+ .thenApply(reader -> {
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] A new {} reader is created",
topicName, schemaType);
Review Comment:
```suggestion
log.debug("[{}] A new {} reader is created",
topicName, schemaType.getName());
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
