[pulsar] branch master updated: Process mode covers function_details in quotes. We need to remove that (#2693)

[sa...@apache.org]

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

sanjeevrk 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 248e329  Process mode covers function_details in quotes. We need to remove that (#2693)
248e329 is described below

commit 248e3296412f1d5471fc048947e687f2374e8b68
Author: Sanjeev Kulkarni <sa...@gmail.com>
AuthorDate: Mon Oct 1 21:25:54 2018 -0700

    Process mode covers function_details in quotes. We need to remove that (#2693)
---
 pulsar-functions/instance/src/main/python/python_instance_main.py   | 5 +++++
 .../java/org/apache/pulsar/functions/runtime/JavaInstanceMain.java  | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/pulsar-functions/instance/src/main/python/python_instance_main.py b/pulsar-functions/instance/src/main/python/python_instance_main.py
index 3012e6d..6ef74c2 100644
--- a/pulsar-functions/instance/src/main/python/python_instance_main.py
+++ b/pulsar-functions/instance/src/main/python/python_instance_main.py
@@ -74,6 +74,11 @@ def main():
 
   args = parser.parse_args()
   function_details = Function_pb2.FunctionDetails()
+  args.function_details = str(args.function_details)
+  if args.function_details[0] == '\'':
+    args.function_details = args.function_details[1:]
+  if args.function_details[-1] == '\'':
+    args.function_details = args.function_details[:-1]
   json_format.Parse(args.function_details, function_details)
 
   if os.path.splitext(str(args.py))[1] == '.whl':
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceMain.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceMain.java
index affa119..1551f6f 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceMain.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/JavaInstanceMain.java
@@ -111,6 +111,12 @@ public class JavaInstanceMain implements AutoCloseable {
         instanceConfig.setInstanceId(instanceId);
         instanceConfig.setMaxBufferedTuples(maxBufferedTuples);
         FunctionDetails.Builder functionDetailsBuilder = FunctionDetails.newBuilder();
+        if (functionDetailsJsonString.charAt(0) == '\'') {
+            functionDetailsJsonString = functionDetailsJsonString.substring(1);
+        }
+        if (functionDetailsJsonString.charAt(functionDetailsJsonString.length() - 1) == '\'') {
+            functionDetailsJsonString = functionDetailsJsonString.substring(0, functionDetailsJsonString.length() - 1);
+        }
         JsonFormat.parser().merge(functionDetailsJsonString, functionDetailsBuilder);
         FunctionDetails functionDetails = functionDetailsBuilder.build();
         instanceConfig.setFunctionDetails(functionDetails);