[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224944120
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
+//Naturally ordered set of function names
+TreeSet functionSet = new TreeSet<>();
+//Extracting ONLY builtIn functions (i.e those already available)
+List builtInFuncHolderList =
this.drillbit.getContext().getFunctionImplementationRegistry().getLocalFunctionRegistry()
+.getAllJarsWithFunctionsHolders().get(LocalFunctionRegistry.BUILT_IN);
+
+//Build List of usable functions
+int skipCount = 0;
+for (FunctionHolder builtInFunctionHolder : builtInFuncHolderList) {
+ String name = builtInFunctionHolder.getName();
+ if (!name.contains(" ") && name.matches("([a-z]|[A-Z])\\w+")) {
+functionSet.add(name);
+ } else {
+logger.debug("Non-alphabetic leading character. Function skipped : {}
", name);
+skipCount++;
+ }
+}
+logger.debug("{} functions will not be available in WebUI : {} ",
skipCount);
+
+//Generated file
+File functionsListFile = new File(getTmpJavaScriptDir(), ACE_MODE_SQL_JS);
+//Template source Javascript file
+InputStream aceModeSqlTemplateStream =
Resource.newClassPathResource(ACE_MODE_SQL_TEMPLATE_JS).getInputStream();
+functionsListFile.deleteOnExit();
+int numLeftToWrite = functionSet.size();
+//Create a copy of a template and write with that!
+java.nio.file.Files.copy(aceModeSqlTemplateStream,
functionsListFile.toPath());
+StringBuilder funcListBldr = new StringBuilder();
Review comment:
Yeah... this should have been trivial. Silly on my part 臘♂️
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224943823
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
+//Naturally ordered set of function names
+TreeSet functionSet = new TreeSet<>();
+//Extracting ONLY builtIn functions (i.e those already available)
+List builtInFuncHolderList =
this.drillbit.getContext().getFunctionImplementationRegistry().getLocalFunctionRegistry()
+.getAllJarsWithFunctionsHolders().get(LocalFunctionRegistry.BUILT_IN);
+
+//Build List of usable functions
+int skipCount = 0;
+for (FunctionHolder builtInFunctionHolder : builtInFuncHolderList) {
+ String name = builtInFunctionHolder.getName();
+ if (!name.contains(" ") && name.matches("([a-z]|[A-Z])\\w+")) {
+functionSet.add(name);
+ } else {
+logger.debug("Non-alphabetic leading character. Function skipped : {}
", name);
+skipCount++;
+ }
+}
+logger.debug("{} functions will not be available in WebUI : {} ",
skipCount);
+
+//Generated file
+File functionsListFile = new File(getTmpJavaScriptDir(), ACE_MODE_SQL_JS);
+//Template source Javascript file
+InputStream aceModeSqlTemplateStream =
Resource.newClassPathResource(ACE_MODE_SQL_TEMPLATE_JS).getInputStream();
Review comment:
Let's not take a chance. I'll use try resources to manage the autoclose.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224943573
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
+//Naturally ordered set of function names
+TreeSet functionSet = new TreeSet<>();
+//Extracting ONLY builtIn functions (i.e those already available)
+List builtInFuncHolderList =
this.drillbit.getContext().getFunctionImplementationRegistry().getLocalFunctionRegistry()
+.getAllJarsWithFunctionsHolders().get(LocalFunctionRegistry.BUILT_IN);
+
+//Build List of usable functions
+int skipCount = 0;
+for (FunctionHolder builtInFunctionHolder : builtInFuncHolderList) {
+ String name = builtInFunctionHolder.getName();
+ if (!name.contains(" ") && name.matches("([a-z]|[A-Z])\\w+")) {
+functionSet.add(name);
+ } else {
+logger.debug("Non-alphabetic leading character. Function skipped : {}
", name);
+skipCount++;
+ }
+}
+logger.debug("{} functions will not be available in WebUI : {} ",
skipCount);
+
+//Generated file
+File functionsListFile = new File(getTmpJavaScriptDir(), ACE_MODE_SQL_JS);
+//Template source Javascript file
+InputStream aceModeSqlTemplateStream =
Resource.newClassPathResource(ACE_MODE_SQL_TEMPLATE_JS).getInputStream();
+functionsListFile.deleteOnExit();
Review comment:
Agreed!
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224943081
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
+//Naturally ordered set of function names
+TreeSet functionSet = new TreeSet<>();
+//Extracting ONLY builtIn functions (i.e those already available)
+List builtInFuncHolderList =
this.drillbit.getContext().getFunctionImplementationRegistry().getLocalFunctionRegistry()
+.getAllJarsWithFunctionsHolders().get(LocalFunctionRegistry.BUILT_IN);
+
+//Build List of usable functions
+int skipCount = 0;
+for (FunctionHolder builtInFunctionHolder : builtInFuncHolderList) {
+ String name = builtInFunctionHolder.getName();
+ if (!name.contains(" ") && name.matches("([a-z]|[A-Z])\\w+")) {
+functionSet.add(name);
+ } else {
+logger.debug("Non-alphabetic leading character. Function skipped : {}
", name);
+skipCount++;
+ }
+}
+logger.debug("{} functions will not be available in WebUI : {} ",
skipCount);
Review comment:
fixed it
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224942957
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
+//Naturally ordered set of function names
+TreeSet functionSet = new TreeSet<>();
+//Extracting ONLY builtIn functions (i.e those already available)
+List builtInFuncHolderList =
this.drillbit.getContext().getFunctionImplementationRegistry().getLocalFunctionRegistry()
+.getAllJarsWithFunctionsHolders().get(LocalFunctionRegistry.BUILT_IN);
+
+//Build List of usable functions
Review comment:
The ACE library cannot support autocomplete for functions like '<' , '!' and
'==' . We filter out all functions that don't start with an alphabet to avoid
breaking the suggestions that the library will provide after loading. Added
this in the comments now.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224942740
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -495,4 +509,50 @@ private void generateOptionsDescriptionJSFile() throws
IOException {
writer.flush();
}
}
+
+ //Generates ACE library javascript populated with list of available SQL
functions
+ private void generateFunctionJS() throws IOException {
Review comment:
done
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill
functions in WebUI for autocomplete
URL: https://github.com/apache/drill/pull/1491#discussion_r224942492
##
File path:
exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java
##
@@ -456,21 +471,20 @@ public void close() throws Exception {
FileUtils.deleteDirectory(getTmpJavaScriptDir());
}
- private static final String FILE_CONTENT_FOOTER = "};";
-
//Generate Options Description JavaScript
private void generateOptionsDescriptionJSFile() throws IOException {
//Obtain list of Options & their descriptions
OptionManager optionManager =
this.drillbit.getContext().getOptionManager();
OptionList publicOptions = optionManager.getPublicOptionList();
-List options = Lists.newArrayList(publicOptions);
+List options = new ArrayList<>(publicOptions);
Collections.sort(options);
int numLeftToWrite = options.size();
//Template source Javascript file
InputStream optionsDescripTemplateStream =
Resource.newClassPathResource(OPTIONS_DESCRIBE_TEMPLATE_JS).getInputStream();
//Generated file
File optionsDescriptionFile = new File(getTmpJavaScriptDir(),
OPTIONS_DESCRIBE_JS);
+final String FILE_CONTENT_FOOTER = "};";
Review comment:
Ok. I was following the convention for a constant string.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete
kkhatua commented on a change in pull request #1491: DRILL-6084: Show Drill functions in WebUI for autocomplete URL: https://github.com/apache/drill/pull/1491#discussion_r224942418 ## File path: exec/java-exec/src/main/resources/ace.mode-sql.template.js ## @@ -0,0 +1,121 @@ +/** Review comment: The reason I have the template here is for easy access to the file within the classpath. I don't believe the `rest/static/js` folder is loaded into the classpath (which makes sense, because it serves REST API requests). If I move the template here, it is visible to any browser accessing `http://drillhost/static/js/options.describe.template.js` I can remove `mode-sql.js` from the static resource, since we are doing a dynamic generation now. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
