From c1b5bb4745de9eb0a6a2c93d741c660d6397cff1 Mon Sep 17 00:00:00 2001 From: meenakshisekar Date: Mon, 24 Oct 2016 18:10:12 +0530 Subject: [PATCH 1/3] Added interpreter setting and removed registration from interperter. --- .../zeppelin/ignite/IgniteInterpreter.java | 17 ------- .../zeppelin/ignite/IgniteSqlInterpreter.java | 11 ----- .../main/resources/interpreter-setting.json | 47 +++++++++++++++++++ 3 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 ignite/src/main/resources/interpreter-setting.json 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..a44b6ef6604 100644 --- a/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java +++ b/ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java @@ -76,23 +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; private ByteArrayOutputStream out; 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 new file mode 100644 index 00000000000..12c829fee0b --- /dev/null +++ b/ignite/src/main/resources/interpreter-setting.json @@ -0,0 +1,47 @@ +[ + { + "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,Comma 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" + } + } + + }, + { + "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." + } + } + } +] From d140d9ce56a342b1a6b23e2cebc3fdd83a725417 Mon Sep 17 00:00:00 2001 From: Igor Drozdov Date: Wed, 28 Dec 2016 12:47:13 +0300 Subject: [PATCH 2/3] Fixed typo in default value and description --- ignite/src/main/resources/interpreter-setting.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ignite/src/main/resources/interpreter-setting.json b/ignite/src/main/resources/interpreter-setting.json index 12c829fee0b..92cf75b4223 100644 --- a/ignite/src/main/resources/interpreter-setting.json +++ b/ignite/src/main/resources/interpreter-setting.json @@ -7,8 +7,8 @@ "ignite.addresses": { "envName": null, "propertyName": "ignite.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)" + "defaultValue": "127.0.0.1:47500..47509", + "description": "Comma separated list of addresses (e.g. 127.0.0.1:47500 or 127.0.0.1:47500..47509)" }, "ignite.clientMode": { "envName": null, @@ -29,7 +29,6 @@ "description": "Peer class loading enabled. True or false" } } - }, { "group": "ignite", From ddba11a43c5c8159e922ab149ed4a88f8ad4bfd6 Mon Sep 17 00:00:00 2001 From: Igor Drozdov Date: Wed, 28 Dec 2016 14:28:19 +0300 Subject: [PATCH 3/3] Add missing property to make test green Default value is set in `interpreter-setting.json` but test doesn't use this file --- .../java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java | 1 + 1 file changed, 1 insertion(+) 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 c2e13ec88b0..9cb5eafe345 100644 --- a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java +++ b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java @@ -64,6 +64,7 @@ public void setUp() { props.setProperty(IgniteSqlInterpreter.IGNITE_JDBC_URL, "jdbc:ignite:cfg://cache=person@default-ignite-jdbc.xml"); props.setProperty(IgniteInterpreter.IGNITE_CLIENT_MODE, "false"); props.setProperty(IgniteInterpreter.IGNITE_PEER_CLASS_LOADING_ENABLED, "false"); + props.setProperty(IgniteInterpreter.IGNITE_ADDRESSES, HOST); intp = new IgniteInterpreter(props); intp.open();