SQL: JLine upgrade and polishing (#40321)
Upgrade JLine to 3.10.0 Switch to using JLine granular jars instead of the uber-one Remove Jansi dependency (due to errors in closing streams) Pin JNA dependency to our own artifact Fix #40239 (cherry picked from commit 9afa65fa80111f3b68c13373c7b6db13c11dde31)
This commit is contained in:
Costin Leau
Costin Leau
parent
496070fda6
commit
87d3d16c5a
|
|
@ -10,6 +10,12 @@ esplugin {
|
||||||
extendedPlugins = ['x-pack-core', 'lang-painless']
|
extendedPlugins = ['x-pack-core', 'lang-painless']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext {
|
||||||
|
// SQL dependency versions
|
||||||
|
jlineVersion="3.10.0"
|
||||||
|
antlrVersion="4.5.3"
|
||||||
|
}
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
// Bundles the sql-cli.jar into the distribution
|
// Bundles the sql-cli.jar into the distribution
|
||||||
bin
|
bin
|
||||||
|
|
@ -81,7 +87,7 @@ configurations {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
regenerate 'org.antlr:antlr4:4.5.3'
|
regenerate "org.antlr:antlr4:${antlrVersion}"
|
||||||
}
|
}
|
||||||
|
|
||||||
String grammarPath = 'src/main/antlr'
|
String grammarPath = 'src/main/antlr'
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,16 @@ dependencies {
|
||||||
|
|
||||||
// CLI testing dependencies
|
// CLI testing dependencies
|
||||||
compile project(path: xpackModule('sql:sql-cli'), configuration: 'nodeps')
|
compile project(path: xpackModule('sql:sql-cli'), configuration: 'nodeps')
|
||||||
compile "org.jline:jline:3.8.2"
|
|
||||||
|
// select just the parts of JLine that are needed
|
||||||
|
compile("org.jline:jline-terminal-jna:${jlineVersion}") {
|
||||||
|
exclude group: "net.java.dev.jna"
|
||||||
|
}
|
||||||
|
compile "org.jline:jline-terminal:${jlineVersion}"
|
||||||
|
compile "org.jline:jline-reader:${jlineVersion}"
|
||||||
|
compile "org.jline:jline-style:${jlineVersion}"
|
||||||
|
|
||||||
|
testRuntime "org.elasticsearch:jna:${versions.jna}"
|
||||||
}
|
}
|
||||||
|
|
||||||
/* disable unit tests because these are all integration tests used
|
/* disable unit tests because these are all integration tests used
|
||||||
|
|
@ -31,49 +40,6 @@ forbiddenApisMain {
|
||||||
replaceSignatureFiles 'es-all-signatures', 'es-test-signatures'
|
replaceSignatureFiles 'es-all-signatures', 'es-test-signatures'
|
||||||
}
|
}
|
||||||
|
|
||||||
thirdPartyAudit.ignoreMissingClasses (
|
|
||||||
// jLine's optional dependencies
|
|
||||||
'org.apache.sshd.client.SshClient',
|
|
||||||
'org.apache.sshd.client.auth.keyboard.UserInteraction',
|
|
||||||
'org.apache.sshd.client.channel.ChannelShell',
|
|
||||||
'org.apache.sshd.client.channel.ClientChannel',
|
|
||||||
'org.apache.sshd.client.channel.ClientChannelEvent',
|
|
||||||
'org.apache.sshd.client.future.AuthFuture',
|
|
||||||
'org.apache.sshd.client.future.ConnectFuture',
|
|
||||||
'org.apache.sshd.client.future.OpenFuture',
|
|
||||||
'org.apache.sshd.client.session.ClientSession',
|
|
||||||
'org.apache.sshd.common.Factory',
|
|
||||||
'org.apache.sshd.common.channel.PtyMode',
|
|
||||||
'org.apache.sshd.common.config.keys.FilePasswordProvider',
|
|
||||||
'org.apache.sshd.common.util.io.NoCloseInputStream',
|
|
||||||
'org.apache.sshd.common.util.io.NoCloseOutputStream',
|
|
||||||
'org.apache.sshd.server.Command',
|
|
||||||
'org.apache.sshd.server.Environment',
|
|
||||||
'org.apache.sshd.server.ExitCallback',
|
|
||||||
'org.apache.sshd.server.SessionAware',
|
|
||||||
'org.apache.sshd.server.Signal',
|
|
||||||
'org.apache.sshd.server.SshServer',
|
|
||||||
'org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider',
|
|
||||||
'org.apache.sshd.server.scp.ScpCommandFactory$Builder',
|
|
||||||
'org.apache.sshd.server.session.ServerSession',
|
|
||||||
'org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory$Builder',
|
|
||||||
'org.fusesource.jansi.Ansi',
|
|
||||||
'org.fusesource.jansi.internal.CLibrary$Termios',
|
|
||||||
'org.fusesource.jansi.internal.CLibrary$WinSize',
|
|
||||||
'org.fusesource.jansi.internal.CLibrary',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$CHAR_INFO',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$CONSOLE_SCREEN_BUFFER_INFO',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$COORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$FOCUS_EVENT_RECORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$INPUT_RECORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$KEY_EVENT_RECORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$MOUSE_EVENT_RECORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$SMALL_RECT',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32',
|
|
||||||
'org.fusesource.jansi.internal.WindowsSupport',
|
|
||||||
'org.mozilla.universalchardet.UniversalDetector',
|
|
||||||
)
|
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
apply plugin: 'elasticsearch.standalone-rest-test'
|
apply plugin: 'elasticsearch.standalone-rest-test'
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
@ -95,7 +61,7 @@ subprojects {
|
||||||
|
|
||||||
|
|
||||||
// TODO check if needed
|
// TODO check if needed
|
||||||
testRuntime("org.antlr:antlr4-runtime:4.5.3") {
|
testRuntime("org.antlr:antlr4-runtime:${antlrVersion}") {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -104,7 +70,15 @@ subprojects {
|
||||||
testRuntime (xpackProject('plugin:sql:sql-action')) {
|
testRuntime (xpackProject('plugin:sql:sql-action')) {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
testRuntime "org.jline:jline:3.8.2"
|
|
||||||
|
testRuntime("org.jline:jline-terminal-jna:${jlineVersion}") {
|
||||||
|
exclude group: "net.java.dev.jna"
|
||||||
|
}
|
||||||
|
testRuntime "org.jline:jline-terminal:${jlineVersion}"
|
||||||
|
testRuntime "org.jline:jline-reader:${jlineVersion}"
|
||||||
|
testRuntime "org.jline:jline-style:${jlineVersion}"
|
||||||
|
|
||||||
|
testRuntime "org.elasticsearch:jna:${versions.jna}"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (project.name != 'security') {
|
if (project.name != 'security') {
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,20 @@ archivesBaseName = 'elasticsearch-sql-cli'
|
||||||
description = 'Command line interface to Elasticsearch that speaks SQL'
|
description = 'Command line interface to Elasticsearch that speaks SQL'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile "org.jline:jline:3.8.2"
|
|
||||||
|
// select just the parts of JLine that are needed
|
||||||
|
compile "org.jline:jline-terminal:${jlineVersion}"
|
||||||
|
compile("org.jline:jline-terminal-jna:${jlineVersion}") {
|
||||||
|
exclude group: "net.java.dev.jna"
|
||||||
|
}
|
||||||
|
compile "org.jline:jline-reader:${jlineVersion}"
|
||||||
|
compile "org.jline:jline-style:${jlineVersion}"
|
||||||
|
|
||||||
compile xpackProject('plugin:sql:sql-client')
|
compile xpackProject('plugin:sql:sql-client')
|
||||||
compile xpackProject('plugin:sql:sql-action')
|
compile xpackProject('plugin:sql:sql-action')
|
||||||
compile "org.elasticsearch:elasticsearch-cli:${version}"
|
compile "org.elasticsearch:elasticsearch-cli:${version}"
|
||||||
|
|
||||||
runtime "org.fusesource.jansi:jansi:1.16"
|
|
||||||
runtime "org.elasticsearch:jna:${versions.jna}"
|
runtime "org.elasticsearch:jna:${versions.jna}"
|
||||||
|
|
||||||
testCompile "org.elasticsearch.test:framework:${version}"
|
testCompile "org.elasticsearch.test:framework:${version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -32,6 +38,7 @@ dependencyLicenses {
|
||||||
mapping from: /lucene-.*/, to: 'lucene'
|
mapping from: /lucene-.*/, to: 'lucene'
|
||||||
mapping from: /sql-action.*/, to: 'elasticsearch'
|
mapping from: /sql-action.*/, to: 'elasticsearch'
|
||||||
mapping from: /sql-client.*/, to: 'elasticsearch'
|
mapping from: /sql-client.*/, to: 'elasticsearch'
|
||||||
|
mapping from: /jline-.*/, to: 'jline'
|
||||||
ignoreSha 'elasticsearch-cli'
|
ignoreSha 'elasticsearch-cli'
|
||||||
ignoreSha 'elasticsearch-core'
|
ignoreSha 'elasticsearch-core'
|
||||||
ignoreSha 'elasticsearch'
|
ignoreSha 'elasticsearch'
|
||||||
|
|
@ -41,7 +48,7 @@ dependencyLicenses {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Bundle all dependencies into the main jar and mark it as executable it
|
* Bundle all dependencies into the main jar and mark it as executable it
|
||||||
* can be easilly shipped around and used.
|
* can be easily shipped around and used.
|
||||||
*/
|
*/
|
||||||
jar {
|
jar {
|
||||||
from({
|
from({
|
||||||
|
|
@ -78,37 +85,6 @@ forbiddenApisMain {
|
||||||
signaturesFiles += files('src/forbidden/cli-signatures.txt')
|
signaturesFiles += files('src/forbidden/cli-signatures.txt')
|
||||||
}
|
}
|
||||||
|
|
||||||
thirdPartyAudit.ignoreMissingClasses (
|
|
||||||
// jLine's optional dependencies
|
|
||||||
'org.apache.sshd.client.SshClient',
|
|
||||||
'org.apache.sshd.client.auth.keyboard.UserInteraction',
|
|
||||||
'org.apache.sshd.client.channel.ChannelShell',
|
|
||||||
'org.apache.sshd.client.channel.ClientChannel',
|
|
||||||
'org.apache.sshd.client.channel.ClientChannelEvent',
|
|
||||||
'org.apache.sshd.client.future.AuthFuture',
|
|
||||||
'org.apache.sshd.client.future.ConnectFuture',
|
|
||||||
'org.apache.sshd.client.future.OpenFuture',
|
|
||||||
'org.apache.sshd.client.session.ClientSession',
|
|
||||||
'org.apache.sshd.common.Factory',
|
|
||||||
'org.apache.sshd.common.channel.PtyMode',
|
|
||||||
'org.apache.sshd.common.config.keys.FilePasswordProvider',
|
|
||||||
'org.apache.sshd.common.util.io.NoCloseInputStream',
|
|
||||||
'org.apache.sshd.common.util.io.NoCloseOutputStream',
|
|
||||||
'org.apache.sshd.server.Command',
|
|
||||||
'org.apache.sshd.server.Environment',
|
|
||||||
'org.apache.sshd.server.ExitCallback',
|
|
||||||
'org.apache.sshd.server.SessionAware',
|
|
||||||
'org.apache.sshd.server.Signal',
|
|
||||||
'org.apache.sshd.server.SshServer',
|
|
||||||
'org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider',
|
|
||||||
'org.apache.sshd.server.scp.ScpCommandFactory$Builder',
|
|
||||||
'org.apache.sshd.server.session.ServerSession',
|
|
||||||
'org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory$Builder',
|
|
||||||
'org.mozilla.universalchardet.UniversalDetector',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$FOCUS_EVENT_RECORD',
|
|
||||||
'org.fusesource.jansi.internal.Kernel32$MOUSE_EVENT_RECORD',
|
|
||||||
)
|
|
||||||
|
|
||||||
task runcli {
|
task runcli {
|
||||||
description = 'Run the CLI and connect to elasticsearch running on 9200'
|
description = 'Run the CLI and connect to elasticsearch running on 9200'
|
||||||
dependsOn 'assemble'
|
dependsOn 'assemble'
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
b1aaf0028852164ab6b4057192ccd0ba7dedd3a5
|
|
||||||
|
|
@ -1,202 +0,0 @@
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
8b81efadcb78388b662ede7965b272be56a86ec1
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
c93b837f49fe8eb3f68cc3daee5dfb83141ca538
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
495cfd226e13abf2b8a5be4f270d5b9897588733
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
ac853ad4dd46252319cbb9c012d9ab1bcc501162
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
797f8cadcb4a969881e8dbd07a623d1b13214984
|
||||||
|
|
@ -7,6 +7,7 @@ package org.elasticsearch.xpack.sql.cli;
|
||||||
|
|
||||||
import joptsimple.OptionSet;
|
import joptsimple.OptionSet;
|
||||||
import joptsimple.OptionSpec;
|
import joptsimple.OptionSpec;
|
||||||
|
|
||||||
import org.elasticsearch.cli.ExitCodes;
|
import org.elasticsearch.cli.ExitCodes;
|
||||||
import org.elasticsearch.cli.LoggingAwareCommand;
|
import org.elasticsearch.cli.LoggingAwareCommand;
|
||||||
import org.elasticsearch.cli.Terminal;
|
import org.elasticsearch.cli.Terminal;
|
||||||
|
|
@ -20,11 +21,12 @@ import org.elasticsearch.xpack.sql.cli.command.FetchSizeCliCommand;
|
||||||
import org.elasticsearch.xpack.sql.cli.command.PrintLogoCommand;
|
import org.elasticsearch.xpack.sql.cli.command.PrintLogoCommand;
|
||||||
import org.elasticsearch.xpack.sql.cli.command.ServerInfoCliCommand;
|
import org.elasticsearch.xpack.sql.cli.command.ServerInfoCliCommand;
|
||||||
import org.elasticsearch.xpack.sql.cli.command.ServerQueryCliCommand;
|
import org.elasticsearch.xpack.sql.cli.command.ServerQueryCliCommand;
|
||||||
import org.elasticsearch.xpack.sql.client.HttpClient;
|
|
||||||
import org.elasticsearch.xpack.sql.client.ClientException;
|
import org.elasticsearch.xpack.sql.client.ClientException;
|
||||||
import org.elasticsearch.xpack.sql.client.ConnectionConfiguration;
|
import org.elasticsearch.xpack.sql.client.ConnectionConfiguration;
|
||||||
|
import org.elasticsearch.xpack.sql.client.HttpClient;
|
||||||
import org.elasticsearch.xpack.sql.client.Version;
|
import org.elasticsearch.xpack.sql.client.Version;
|
||||||
import org.jline.terminal.TerminalBuilder;
|
import org.jline.terminal.TerminalBuilder;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.ConnectException;
|
import java.net.ConnectException;
|
||||||
import java.sql.SQLInvalidAuthorizationSpecException;
|
import java.sql.SQLInvalidAuthorizationSpecException;
|
||||||
|
|
@ -46,8 +48,13 @@ public class Cli extends LoggingAwareCommand {
|
||||||
* -Dorg.jline.terminal.dumb=true
|
* -Dorg.jline.terminal.dumb=true
|
||||||
*/
|
*/
|
||||||
public static void main(String[] args) throws Exception {
|
public static void main(String[] args) throws Exception {
|
||||||
final Cli cli = new Cli(new JLineTerminal(TerminalBuilder.builder().build(), true));
|
|
||||||
configureJLineLogging();
|
configureJLineLogging();
|
||||||
|
final Cli cli = new Cli(new JLineTerminal(TerminalBuilder.builder()
|
||||||
|
.name("Elasticsearch SQL CLI")
|
||||||
|
// remove jansi since it has issues on Windows in closing terminals
|
||||||
|
// the CLI uses JNA anyway
|
||||||
|
.jansi(false)
|
||||||
|
.build(), true));
|
||||||
int status = cli.main(args, Terminal.DEFAULT);
|
int status = cli.main(args, Terminal.DEFAULT);
|
||||||
if (status != ExitCodes.OK) {
|
if (status != ExitCodes.OK) {
|
||||||
exit(status);
|
exit(status);
|
||||||
|
|
@ -142,7 +149,7 @@ public class Cli extends LoggingAwareCommand {
|
||||||
"Cannot connect to the server " + con.connectionString() + " - " + ex.getCause().getMessage());
|
"Cannot connect to the server " + con.connectionString() + " - " + ex.getCause().getMessage());
|
||||||
} else if (ex.getCause() != null && ex.getCause() instanceof SQLInvalidAuthorizationSpecException) {
|
} else if (ex.getCause() != null && ex.getCause() instanceof SQLInvalidAuthorizationSpecException) {
|
||||||
throw new UserException(ExitCodes.NOPERM,
|
throw new UserException(ExitCodes.NOPERM,
|
||||||
"Cannot establish a secure connection to the server " +
|
"Cannot establish a secure connection to the server " +
|
||||||
con.connectionString() + " - " + ex.getCause().getMessage());
|
con.connectionString() + " - " + ex.getCause().getMessage());
|
||||||
} else {
|
} else {
|
||||||
// Most likely we connected to something other than Elasticsearch
|
// Most likely we connected to something other than Elasticsearch
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,6 @@ dependencyLicenses {
|
||||||
mapping from: /sql-proto.*/, to: 'elasticsearch'
|
mapping from: /sql-proto.*/, to: 'elasticsearch'
|
||||||
mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
|
mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
|
||||||
mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
|
mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
|
||||||
mapping from: /lucene-.*/, to: 'lucene'
|
|
||||||
ignoreSha 'sql-action'
|
|
||||||
ignoreSha 'elasticsearch'
|
|
||||||
ignoreSha 'elasticsearch-core'
|
ignoreSha 'elasticsearch-core'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ dependencies {
|
||||||
compile (project(':libs:x-content')) {
|
compile (project(':libs:x-content')) {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
compile "joda-time:joda-time:${versions.joda}"
|
|
||||||
runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
|
runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
|
||||||
|
|
||||||
testCompile "org.elasticsearch.test:framework:${version}"
|
testCompile "org.elasticsearch.test:framework:${version}"
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
|
|
||||||
|
|
@ -1,202 +0,0 @@
|
||||||
|
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
=============================================================================
|
|
||||||
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
|
|
||||||
=============================================================================
|
|
||||||
This product includes software developed by
|
|
||||||
Joda.org (http://www.joda.org/).
|
|
||||||
Loading…
Reference in New Issue