You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/05/23 19:57:40 UTC
[GitHub] sijie closed pull request #1837: fixing problem of functions that
have an array as input or output
sijie closed pull request #1837: fixing problem of functions that have an array as input or output
URL: https://github.com/apache/incubator-pulsar/pull/1837
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/pom.xml b/pom.xml
index 4c8bebf7de..9882efa96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@ flexible messaging model and an intuitive client API.</description>
<puppycrawl.checkstyle.version>6.19</puppycrawl.checkstyle.version>
<dockerfile-maven.version>1.3.7</dockerfile-maven.version>
<typetools.version>0.5.0</typetools.version>
+ <jboss-reflect.version>2.2.1.SP1</jboss-reflect.version>
<protobuf2.version>2.4.1</protobuf2.version>
<protobuf3.version>3.5.1</protobuf3.version>
<grpc.version>1.5.0</grpc.version>
@@ -690,6 +691,12 @@ flexible messaging model and an intuitive client API.</description>
<version>${typetools.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${jboss-reflect.version}</version>
+ </dependency>
+
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-all</artifactId>
diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml
index bcdf780dc4..b6dfb745a6 100644
--- a/pulsar-functions/instance/pom.xml
+++ b/pulsar-functions/instance/pom.xml
@@ -84,6 +84,11 @@
<artifactId>typetools</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+
</dependencies>
</project>
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
index 5b5e943e84..a96c703549 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
@@ -341,16 +341,21 @@ private Record readInput() {
@Override
public void close() {
- try {
- source.close();
- } catch (Exception e) {
- log.error("Failed to close source {}", instanceConfig.getFunctionDetails().getSource().getClassName(), e);
+ if (source != null) {
+ try {
+ source.close();
+ } catch (Exception e) {
+ log.error("Failed to close source {}", instanceConfig.getFunctionDetails().getSource().getClassName(), e);
+
+ }
}
- try {
- sink.close();
- } catch (Exception e) {
- log.error("Failed to close sink {}", instanceConfig.getFunctionDetails().getSource().getClassName(), e);
+ if (sink != null) {
+ try {
+ sink.close();
+ } catch (Exception e) {
+ log.error("Failed to close sink {}", instanceConfig.getFunctionDetails().getSource().getClassName(), e);
+ }
}
if (null != javaInstance) {
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
index 4fccb54451..8b246cf78c 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
@@ -40,6 +40,7 @@
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.io.core.RecordContext;
import org.apache.pulsar.io.core.Sink;
+import org.jboss.util.Classes;
import java.util.Base64;
import java.util.Map;
@@ -232,14 +233,16 @@ public void write(RecordContext recordContext, T value) throws Exception {
@Override
public void close() throws Exception {
- this.pulsarSinkProcessor.close();
-
+ if (this.pulsarSinkProcessor != null) {
+ this.pulsarSinkProcessor.close();
+ }
}
@VisibleForTesting
void setupSerDe() throws ClassNotFoundException {
- Class<?> typeArg = Thread.currentThread().getContextClassLoader().loadClass(
- this.pulsarSinkConfig.getTypeClassName());
+
+ Class<?> typeArg = Classes.loadClass(this.pulsarSinkConfig.getTypeClassName(),
+ Thread.currentThread().getContextClassLoader());
if (!Void.class.equals(typeArg)) { // return type is not `Void.class`
if (this.pulsarSinkConfig.getSerDeClassName() == null
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
index 5cae902236..25b0874446 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
@@ -32,6 +32,7 @@
import org.apache.pulsar.functions.utils.FunctionConfig;
import org.apache.pulsar.io.core.Record;
import org.apache.pulsar.io.core.Source;
+import org.jboss.util.Classes;
import java.util.ArrayList;
import java.util.HashMap;
@@ -124,13 +125,17 @@ public void open(Map<String, Object> config) throws Exception {
@Override
public void close() throws Exception {
- this.inputConsumer.close();
+ if (this.inputConsumer != null) {
+ this.inputConsumer.close();
+ }
}
@VisibleForTesting
void setupSerDe() throws ClassNotFoundException {
- Class<?> typeArg = Thread.currentThread().getContextClassLoader().loadClass(this.pulsarSourceConfig.getTypeClassName());
+ Class<?> typeArg = Classes.loadClass(this.pulsarSourceConfig.getTypeClassName(),
+ Thread.currentThread().getContextClassLoader());
+
if (Void.class.equals(typeArg)) {
throw new RuntimeException("Input type of Pulsar Function cannot be Void");
}
diff --git a/pulsar-functions/runtime-shaded/pom.xml b/pulsar-functions/runtime-shaded/pom.xml
index 1536e21b63..f50e3d91df 100644
--- a/pulsar-functions/runtime-shaded/pom.xml
+++ b/pulsar-functions/runtime-shaded/pom.xml
@@ -132,6 +132,9 @@
<include>com.google.googlejavaformat:google-java-format</include>
<include>com.google.errorprone:javac</include>
<include>net.jodah:typetools</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss.logging:jboss-logging-spi</include>
+ <include>org.jboss:jboss-common-core</include>
<include>com.beust:jcommander</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
<include>org.yaml:snakeyaml</include>
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services