SQL: Add option to provide the delimiter for the CSV format #59907
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds the option to provide the desired character as the separator for the CSV format (the default remains comma). A set of characters are excluded though - like CR, LF, `"` - to avoid slipping onto the CSV-dialects slope. The tab is also forbidden, the user needs to choose the "tsv" format explicitely. The TSV format also gets a needed supplemental escaping, that of the '\' character.
|
@elasticmachine run elasticsearch-ci/2 |
|
Pinging @elastic/es-ql (:Query Languages/SQL) |
elasticmachine
added
the
Team:QL (Deprecated)
matriv
reviewed
Jul 21, 2020
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TextFormat.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/plugin/TextFormatTests.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlQueryAction.java
Outdated
Show resolved
Hide resolved
Fix the way the delimiter is being passed around, removing the CSV member - since its instantiation is a singleton - and pushing it through function arguments. The commit fixes a few issues with the "header" URL attribute: - these was no longer usable, since it wasn't "consumed" by RestSqlQueryAction before generating the answer (triggering an error responce on use); - its value was only checked against "absent", so an incorrect value (typo like "abaent") could have silently generated an unexpected reply. - missing Documentation for the "delimiter" attribute has also been added.
Of course, missed that, thanks for pointing it out. |
matriv
approved these changes
Jul 23, 2020
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TextFormat.java
Show resolved
Hide resolved
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TextFormat.java
Outdated
Show resolved
Hide resolved
The commit unescapes the deliter param. This is required for the doc-sourced tests. Also, implement a switch for param value validation and fix docs.
|
@elasticmachine update branch |
matriv
reviewed
Jul 23, 2020
matriv
approved these changes
Jul 23, 2020
Co-authored-by: Marios Trivyzas <matriv@gmail.com>
astefan
reviewed
Jul 27, 2020
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/TextFormat.java
Outdated
Show resolved
Hide resolved
- rip out anything which isn't Delimiter-related. - undo 'hasHeader' method renaming.
|
@elasticmachine update branch |
Update the doc to make it clear that the textual CSV, TSV and TXT formats pass the cursor back to the user through the Cursor HTTP header.
|
@elasticmachine update branch |
1 similar comment
|
@elasticmachine update branch |
bpintea
added a commit
to bpintea/elasticsearch
that referenced
this pull request
Jul 29, 2020
…59907) * Add option to provide the delimiter to the CSV fmt This adds the option to provide the desired character as the separator for the CSV format (the default remains comma). A set of characters are excluded though - like CR, LF, `"` - to avoid slipping onto the CSV-dialects slope. The tab is also forbidden, the user needs to choose the "tsv" format explicitely. Update the doc to make it clear that the textual CSV, TSV and TXT formats pass the cursor back to the user through the Cursor HTTP header. (cherry picked from commit 3a8b00c)
bpintea
added a commit
that referenced
this pull request
Jul 29, 2020
…60420) * SQL: Add option to provide the delimiter for the CSV format (#59907) * Add option to provide the delimiter to the CSV fmt This adds the option to provide the desired character as the separator for the CSV format (the default remains comma). A set of characters are excluded though - like CR, LF, `"` - to avoid slipping onto the CSV-dialects slope. The tab is also forbidden, the user needs to choose the "tsv" format explicitely. Update the doc to make it clear that the textual CSV, TSV and TXT formats pass the cursor back to the user through the Cursor HTTP header. (cherry picked from commit 3a8b00c) * Java8 fixes - replace Set#of(); - URLDecoder#decode() requires a string (vs a charset) as 2nd arg.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the option to provide the desired character as the separator
for the CSV format (the default remains comma).
A set of characters are excluded though - like CR, LF,
"- to avoidslipping onto the CSV-dialects slope. The tab is also forbidden, the
user needs to choose the
tsvformat explicitely.Closes #41634.