From f4241211d0c6492c3c1a64a4eed28ec9793c0c67 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Mon, 24 Oct 2016 18:10:12 +0530 Subject: [PATCH 1/8] Added interpreter setting and removed registration from interperter. --- .../zeppelin/ignite/IgniteInterpreter.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java index 66dac1b54f2..78de052cc62 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java @@ -76,22 +76,6 @@ public class IgniteInterpreter extends Interpreter { static final String IGNITE_CFG_URL = "ignite.config.url"; - static { - Interpreter.register( - "ignite", - "ignite", - IgniteInterpreter.class.getName(), - true, - new InterpreterPropertyBuilder() - .add(IGNITE_ADDRESSES, "127.0.0.1:47500..47509", - "Coma separated list of addresses " - + "(e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)") - .add(IGNITE_CLIENT_MODE, "true", "Client mode. true or false") - .add(IGNITE_CFG_URL, "", "Configuration URL. Overrides all other settings.") - .add(IGNITE_PEER_CLASS_LOADING_ENABLED, "true", - "Peer class loading enabled. true or false") - .build()); - } private Logger logger = LoggerFactory.getLogger(IgniteInterpreter.class); private Ignite ignite; From 56d23591744f6d897ec9768e2cdc74889d08c185 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Mon, 24 Oct 2016 18:14:43 +0530 Subject: [PATCH 2/8] Added interpreter setting file. --- .../main/resources/interpreter-setting.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 ignite/src/main/resources/interpreter-setting.json diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json new file mode 100644 index 00000000000..e1b6906d2ee --- /dev/null +++ b/ignite/src/main/resources/interpreter-setting.json @@ -0,0 +1,34 @@ +[ + { + "group": "ignite", + "name": "ignite", + "className": "org.apache.zeppelin.ignite.IgniteInterpreter", + "properties": { + "ignite.addresses": { + "envName": null, + "propertyName": "ignite.addresses", + "defaultValue": "127.0.0.1:47500..47509,Coma separated list of addresses", + "description": "(e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)" + }, + "ignite.clientMode": { + "envName": null, + "propertyName": "ignite.clientMode", + "defaultValue": "true", + "description": "Client mode. true or false" + }, + "ignite.config.url": { + "envName": null, + "propertyName": "ignite.config.url", + "defaultValue": "", + "description": "Configuration URL. Overrides all other settings." + }, + "ignite.peerClassLoadingEnabled": { + "envName": null, + "propertyName": "ignite.peerClassLoadingEnabled", + "defaultValue": "true", + "description": "Peer class loading enabled. true or false" + } + } + + } +] \ No newline at end of file From b2e132a6a63d9562284ce0641bdc4157fd1b1380 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Wed, 26 Oct 2016 15:44:38 +0530 Subject: [PATCH 3/8] Corrected the type O --- ignite/src/main/resources/interpreter-setting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index e1b6906d2ee..81e1d485df6 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -7,7 +7,7 @@ "ignite.addresses": { "envName": null, "propertyName": "ignite.addresses", - "defaultValue": "127.0.0.1:47500..47509,Coma separated list of addresses", + "defaultValue": "127.0.0.1:47500..47509,Comma separated list of addresses", "description": "(e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)" }, "ignite.clientMode": { From 7a127efcd1b9269d5896be07c9c7bc084e0fc48f Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Wed, 26 Oct 2016 15:57:25 +0530 Subject: [PATCH 4/8] Added indentation --- ignite/src/main/resources/interpreter-setting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index 81e1d485df6..90fd021bc09 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -22,7 +22,7 @@ "defaultValue": "", "description": "Configuration URL. Overrides all other settings." }, - "ignite.peerClassLoadingEnabled": { + "ignite.peerClassLoadingEnabled": { "envName": null, "propertyName": "ignite.peerClassLoadingEnabled", "defaultValue": "true", From 21bada9e1bdb4f796068ad8eb1ad516c2544263d Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Thu, 27 Oct 2016 17:24:51 +0530 Subject: [PATCH 5/8] Added igniteSQl interpreter to the group. --- ignite/src/main/resources/interpreter-setting.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index 90fd021bc09..63124d0a045 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -30,5 +30,18 @@ } } + }, + { + "group": "ignite", + "name": "ignitesql", + "className": "org.apache.zeppelin.ignite.IgniteSqlInterpreter", + "properties": { + "ignite.jdbc.url": { + "envName": null, + "propertyName": "ignite.jdbc.url", + "defaultValue": "jdbc:ignite:cfg://default-ignite-jdbc.xml", + "description": "Ignite JDBC connection URL." + } + } } ] \ No newline at end of file From acda4f54d16e030195c8516a35f2d66add93b3a5 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Mon, 31 Oct 2016 13:06:35 +0530 Subject: [PATCH 6/8] Removed properties in interpreter file and added new line in json file. --- .../apache/zeppelin/ignite/IgniteSqlInterpreter.java | 11 ----------- ignite/src/main/resources/interpreter-setting.json | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java index 9a651f8816f..03ea4f8816b 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java @@ -57,17 +57,6 @@ public class IgniteSqlInterpreter extends Interpreter { static final String IGNITE_JDBC_URL = "ignite.jdbc.url"; - static { - Interpreter.register( - "ignitesql", - "ignite", - IgniteSqlInterpreter.class.getName(), - new InterpreterPropertyBuilder() - .add(IGNITE_JDBC_URL, - "jdbc:ignite:cfg://default-ignite-jdbc.xml", "Ignite JDBC connection URL.") - .build()); - } - private Logger logger = LoggerFactory.getLogger(IgniteSqlInterpreter.class); private Connection conn; diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index 63124d0a045..6af499359ac 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -44,4 +44,4 @@ } } } -] \ No newline at end of file +] From a4e558fcb2e370401668c949243cf92b64b9eb41 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Wed, 9 Nov 2016 11:55:34 +0530 Subject: [PATCH 7/8] Added new line and added one more variable for context in interpreterTEst class. --- ignite/src/main/resources/interpreter-setting.json | 2 +- .../java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index 6af499359ac..12c829fee0b 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -26,7 +26,7 @@ "envName": null, "propertyName": "ignite.peerClassLoadingEnabled", "defaultValue": "true", - "description": "Peer class loading enabled. true or false" + "description": "Peer class loading enabled. True or false" } } diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java index f1517631c0b..fae94a013d5 100644 --- a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java +++ b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java @@ -40,7 +40,7 @@ public class IgniteInterpreterTest { private static final String HOST = "127.0.0.1:47500..47509"; private static final InterpreterContext INTP_CONTEXT = - new InterpreterContext(null, null, null, null, null, null, null, null, null, null, null); + new InterpreterContext(null, null, null, null, null, null, null, null, null, null,null); private IgniteInterpreter intp; private Ignite ignite; From bd0115c40aa30f1a7e67b6f5bb7acd54b83cf8d6 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Wed, 9 Nov 2016 11:55:35 +0530 Subject: [PATCH 8/8] Added new line and added one more variable for context in interpreterTEst class.