sijie closed pull request #2052: fix bug in concerning ContextImpl
URL: https://github.com/apache/incubator-pulsar/pull/2052
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
index 5ca07d91bd..e2887bf37b 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
@@ -18,11 +18,8 @@
*/
package org.apache.pulsar.functions.instance;
-import static com.google.common.base.Preconditions.checkState;
-
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import java.nio.ByteBuffer;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang.StringUtils;
@@ -36,15 +33,17 @@
import org.apache.pulsar.functions.api.Context;
import org.apache.pulsar.functions.api.SerDe;
import org.apache.pulsar.functions.api.utils.DefaultSerDe;
-import org.apache.pulsar.functions.proto.InstanceCommunication.MetricsData;
import org.apache.pulsar.functions.instance.state.StateContextImpl;
+import org.apache.pulsar.functions.proto.InstanceCommunication.MetricsData;
import org.apache.pulsar.functions.utils.Reflections;
import org.slf4j.Logger;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -52,6 +51,8 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
+import static com.google.common.base.Preconditions.checkState;
+
/**
* This class implements the Context interface exposed to the user.
*/
@@ -141,6 +142,9 @@ public String getCurrentMessageTopicName() {
@Override
public Collection<String> getInputTopics() {
+ if (inputConsumer == null) {
+ return new LinkedList<>();
+ }
if (inputConsumer instanceof MultiTopicsConsumerImpl) {
return ((MultiTopicsConsumerImpl) inputConsumer).getTopics();
} else {
@@ -302,6 +306,10 @@ public ByteBuffer getState(String key) {
//TODO remove topic argument
@Override
public CompletableFuture<Void> ack(byte[] messageId) {
+ // if inputConsumer is null, then ack is a no-op
+ if (inputConsumer == null) {
+ return CompletableFuture.completedFuture(null);
+ }
MessageId actualMessageId = null;
try {
actualMessageId = MessageId.fromByteArray(messageId);
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
index 5ab8d8548c..3bd563ebf5 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
@@ -21,6 +21,7 @@
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.functions.api.Function;
@@ -51,13 +52,13 @@ public JavaInstance(InstanceConfig config, Object
userClassObject,
// TODO: cache logger instances by functions?
Logger instanceLog = LoggerFactory.getLogger("function-" +
config.getFunctionDetails().getName());
+ Consumer consumer = null;
if (source instanceof PulsarSource) {
- this.context = new ContextImpl(config, instanceLog, pulsarClient,
clsLoader,
- ((PulsarSource) source).getInputConsumer());
- } else {
- this.context = null;
+ consumer = ((PulsarSource) source).getInputConsumer();
}
+ this.context = new ContextImpl(config, instanceLog, pulsarClient,
clsLoader, consumer);
+
// create the functions
if (userClassObject instanceof Function) {
this.function = (Function) userClassObject;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
