Skip to content

[ZEPPELIN-914] Apply new mechanism to IgniteInterpreter #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DrIgor wants to merge 3 commits into from
Closed

[ZEPPELIN-914] Apply new mechanism to IgniteInterpreter #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b5bb4
Added interpreter setting and removed registration from interperter.
meenakshisekar Oct 24, 2016
d140d9c
Fixed typo in default value and description
DrIgor Dec 28, 2016
ddba11a
Add missing property to make test green
DrIgor Dec 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions ignite/src/main/java/org/apache/zeppelin/ignite/IgniteInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 0 additions & 11 deletions ignite/src/main/java/org/apache/zeppelin/ignite/IgniteSqlInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
46 changes: 46 additions & 0 deletions ignite/src/main/resources/interpreter-setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"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",
"description": "Comma separated list of addresses (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."
}
}
}
]
1 change: 1 addition & 0 deletions ignite/src/test/java/org/apache/zeppelin/ignite/IgniteInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public void setUp() {
props.setProperty(IgniteSqlInterpreter.IGNITE_JDBC_URL, "jdbc:ignite:cfg://[email protected]");
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();
Expand Down