janhoy commented on code in PR #4695:
URL: https://github.com/apache/solr/pull/4695#discussion_r3708672513
##########
solr/core/src/java/org/apache/solr/cli/StreamTool.java:
##########
@@ -137,38 +154,46 @@ public Options getOptions() {
}
@Override
- @SuppressWarnings({"rawtypes"})
public void runImpl(CommandLine cli) throws Exception {
+ StreamParams params =
+ new StreamParams(
+ cli.getArgs(),
+ cli.getOptionValue(EXECUTION_OPTION, "remote"),
+ cli.getOptionValue(ARRAY_DELIMITER_OPTION, "|"),
+ cli.getOptionValue(DELIMITER_OPTION, " "),
+ cli.hasOption(HEADER_OPTION),
+ cli.getOptionValue(FIELDS_OPTION),
+ cli.getOptionValue(COLLECTION_OPTION),
+ cli.getOptionValue(CommonCLIOptions.CREDENTIALS_OPTION));
+
+ String expr = readExpressionFromArgs(params.args());
+ echoIfVerbose("Running Expression: " + expr);
- String expressionArgument = cli.getArgs()[0];
- String execution = cli.getOptionValue(EXECUTION_OPTION, "remote");
- String arrayDelimiter = cli.getOptionValue(ARRAY_DELIMITER_OPTION, "|");
- String delimiter = cli.getOptionValue(DELIMITER_OPTION, " ");
- boolean includeHeaders = cli.hasOption(HEADER_OPTION);
- String[] outputHeaders = getOutputFields(cli);
+ // Validate inputs before opening any connection to Solr.
+ boolean local = params.execution().equalsIgnoreCase("local");
+ validateExpressionArgs(local, params.collection(), expr);
- LineNumberReader bufferedReader = null;
- String expr;
- try {
- Reader inputStream =
- expressionArgument.toLowerCase(Locale.ROOT).endsWith(".expr")
- ? new InputStreamReader(
- new FileInputStream(expressionArgument),
Charset.defaultCharset())
- : new StringReader(expressionArgument);
-
- bufferedReader = new LineNumberReader(inputStream);
- expr = StreamTool.readExpression(bufferedReader, cli.getArgs());
- echoIfVerbose("Running Expression: " + expr);
- } finally {
- if (bufferedReader != null) {
- bufferedReader.close();
- }
+ var solrConnection = CLIUtils.getSolrConnection(cli);
+ String solrUrl = local ? null : CLIUtils.normalizeSolrUrl(cli);
+
+ runStream(params, expr, solrConnection, solrUrl);
+ }
+
+ static String readExpressionFromArgs(String[] args) throws IOException {
+ String expressionArgument = args[0];
+ try (LineNumberReader bufferedReader =
Review Comment:
Both these are comments about pre-existing weaknesses already on main today.
While unrelated, I'll fix them here while we touch this code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
