Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN-215: Add DB schema names to the completion list

Browse source
This commit is contained in:
tzolov 2015-08-11 03:24:13 +02:00
parent cef2b95444
commit 0a3910d673
2 changed files with 54 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
postgresql/src/main/java/org/apache/zeppelin/postgresql/PostgreSqlInterpreter.java
View file

@ -178,7 +178,7 @@ public class PostgreSqlInterpreter extends Interpreter {
currentStatement = getJdbcConnection().createStatement();
currentStatement.setMaxRows(maxResult);
StringBuilder msg = null;
boolean isTableType = false;
@ -223,6 +223,9 @@ public class PostgreSqlInterpreter extends Interpreter {
int updateCount = currentStatement.getUpdateCount();
msg.append(UPDATE_COUNT_HEADER).append(NEWLINE);
msg.append(updateCount).append(NEWLINE);
// update the database metadata completions (beta)
//sqlCompleter.updateMetaData(getJdbcConnection());
}
} finally {
try {

69
postgresql/src/main/java/org/apache/zeppelin/postgresql/SqlCompleter.java
View file

@ -40,6 +40,8 @@ import jline.console.completer.StringsCompleter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Joiner;
/**
* SQL auto complete functionality for the PostgreSqlInterpreter.
*/
@ -93,6 +95,19 @@ public class SqlCompleter extends StringsCompleter {
return complete;
}
public void updateMetaData(Connection connection) {
Set<String> completions = new TreeSet<String>();
try {
completions.addAll(getColumnNames(connection.getMetaData()));
completions.addAll(getSchemaNames(connection.getMetaData()));
logger.info("Udateds metadata with:" + Joiner.on(',').join(completions));
this.getStrings().addAll(completions);
} catch (SQLException e) {
logger.error("Failed to update the metadata conmpletions", e);
}
}
public static Set<String> getSqlCompleterTokens(Connection connection, boolean skipmeta)
throws IOException, SQLException {
@ -157,44 +172,60 @@ public class SqlCompleter extends StringsCompleter {
// now add the tables and columns from the current connection
if (!(skipmeta)) {
String[] columns = getColumnNames(connection.getMetaData());
for (int i = 0; columns != null && i < columns.length; i++) {
completions.add(columns[i++]);
}
completions.addAll(getColumnNames(connection.getMetaData()));
completions.addAll(getSchemaNames(connection.getMetaData()));
}
return completions;
}
private static String[] getColumnNames(DatabaseMetaData meta) throws SQLException {
private static Set<String> getColumnNames(DatabaseMetaData meta) throws SQLException {
Set<String> names = new HashSet<String>();
try {
ResultSet columns = getColumns(meta, "%");
ResultSet columns = meta.getColumns(meta.getConnection().getCatalog(), null, "%", "%");
try {
while (columns.next()) {
// add the following strings:
// 1. column name
// 2. table name
// 3. tablename.columnname
// Add the following strings: (1) column name, (2) table name
String name = columns.getString("TABLE_NAME");
names.add(name);
names.add(columns.getString("COLUMN_NAME"));
names.add(columns.getString("TABLE_NAME") + "." + columns.getString("COLUMN_NAME"));
if (!isBlank(name)) {
names.add(name);
names.add(columns.getString("COLUMN_NAME"));
// names.add(columns.getString("TABLE_NAME") + "." + columns.getString("COLUMN_NAME"));
}
}
} finally {
columns.close();
}
return names.toArray(new String[0]);
logger.info(Joiner.on(',').join(names));
return names;
} catch (Throwable t) {
logger.error("Failed to tretrieve the column name", t);
return new String[0];
logger.error("Failed to retrieve the column name", t);
return new HashSet<String>();
}
}
static ResultSet getColumns(DatabaseMetaData metaData, String table) throws SQLException {
return metaData.getColumns(metaData.getConnection().getCatalog(), null, table, "%");
private static Set<String> getSchemaNames(DatabaseMetaData meta) throws SQLException {
Set<String> names = new HashSet<String>();
try {
ResultSet schemas = meta.getSchemas();
try {
while (schemas.next()) {
String schemaName = schemas.getString("TABLE_SCHEM");
if (!isBlank(schemaName)) {
names.add(schemaName + ".");
}
}
} finally {
schemas.close();
}
return names;
} catch (Throwable t) {
logger.error("Failed to retrieve the column name", t);
return new HashSet<String>();
}
}
}