-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Hive-29660: Show an Apache Hive banner on Beeline startup #6539
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
aturoczy
wants to merge
7
commits into
apache:master
Choose a base branch
from
aturoczy:HIVE-29660
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+39
−28
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4eed725
HIVE-29660:
aturoczy 52b68ba
HIVE-29660: Show an Apache Hive banner on Beeline startup
aturoczy c87dc14
HIVE-29660: Remove unused imports and outdated class documentation fr…
aturoczy df69c22
HIVE-29660: Add color for the banner
aturoczy 02e17b5
HIVE-29660: Remove unused getApplicationTitle method
aturoczy 97688ef
HIVE-29660: Remove unused getApplicationTitle for every part of the code
aturoczy cdce7ec
HIVE-29660: Restore getApplicationTitle() as beeline.properties header
aturoczy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,6 +110,7 @@ | |
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
|
|
||
| import org.jline.builtins.Completers.FileNameCompleter; | ||
| import org.jline.reader.Completer; | ||
| import org.jline.reader.EndOfFileException; | ||
| import org.jline.reader.History; | ||
|
|
@@ -121,25 +122,6 @@ | |
| import org.jline.terminal.Terminal; | ||
| import org.jline.terminal.TerminalBuilder; | ||
|
|
||
| import static org.jline.builtins.Completers.FileNameCompleter; | ||
|
|
||
|
|
||
| /** | ||
| * A console SQL shell with command completion. | ||
| * <p> | ||
| * TODO: | ||
| * <ul> | ||
| * <li>User-friendly connection prompts</li> | ||
| * <li>Page results</li> | ||
| * <li>Handle binary data (blob fields)</li> | ||
| * <li>Implement command aliases</li> | ||
| * <li>Stored procedure execution</li> | ||
| * <li>Binding parameters to prepared statements</li> | ||
| * <li>Scripting language</li> | ||
| * <li>XA transactions</li> | ||
| * </ul> | ||
| * | ||
| */ | ||
| @SuppressWarnings("static-access") | ||
| public class BeeLine implements Closeable { | ||
| private static final ResourceBundle resourceBundle = | ||
|
|
@@ -468,21 +450,50 @@ String getManifestAttribute(String name) { | |
| } | ||
| } | ||
|
|
||
|
|
||
| String getApplicationBanner() { | ||
| Package pack = BeeLine.class.getPackage(); | ||
| String version = | ||
| pack.getImplementationVersion() == null ? "" : pack.getImplementationVersion(); | ||
| String sep = System.lineSeparator(); | ||
| boolean color = bannerColorEnabled(); | ||
| String yellow = color ? "\u001b[1;33m" : ""; | ||
| String reset = color ? "\u001b[0m" : ""; | ||
| return new StringBuilder(512) | ||
| .append(yellow) | ||
| .append(" _ _ _____ _______").append(sep) | ||
| .append(" | | | |_ _\\ \\ / / ____|").append(sep) | ||
| .append(" | |_| || | \\ \\ / /| _|").append(sep) | ||
| .append(" | _ || | \\ V / | |___").append(sep) | ||
| .append(" |_| |_|___| \\_/ |_____|").append(reset).append(sep) | ||
| .append(sep) | ||
| .append("Apache Hive " + version + " - Beeline").append(sep) | ||
| .append("The Open Data Warehouse for Modern Analytics").append(sep) | ||
| .toString(); | ||
| } | ||
|
|
||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are two empty lines here, please make only one empty line. |
||
| String getApplicationTitle() { | ||
| Package pack = BeeLine.class.getPackage(); | ||
|
|
||
| return loc("app-introduction", new Object[] { "Beeline", | ||
| pack.getImplementationVersion() == null ? "???" : pack.getImplementationVersion(), | ||
| "Apache Hive", | ||
| // getManifestAttribute ("Specification-Title"), | ||
| // getManifestAttribute ("Implementation-Version"), | ||
| // getManifestAttribute ("Implementation-ReleaseDate"), | ||
| // getManifestAttribute ("Implementation-Vendor"), | ||
| // getManifestAttribute ("Implementation-License"), | ||
| }); | ||
| } | ||
|
|
||
| /** True when the active terminal can display ANSI colors (not dumb/redirected). */ | ||
| private boolean bannerColorEnabled() { | ||
| try { | ||
| LineReader lr = getLineReader(); | ||
| if (lr != null && lr.getTerminal() != null) { | ||
| String type = lr.getTerminal().getType(); | ||
| return type != null && !Terminal.TYPE_DUMB.equals(type); | ||
| } | ||
| } catch (Exception e) { | ||
| // no usable terminal -> stay monochrome | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| String getApplicationContactInformation() { | ||
| return getManifestAttribute("Implementation-Vendor"); | ||
| } | ||
|
|
@@ -1139,7 +1150,7 @@ public int begin(String[] args, InputStream inputStream, boolean keepHistory) th | |
| return executeFile(getOpts().getScriptFile()); | ||
| } | ||
| try { | ||
| info(getApplicationTitle()); | ||
| info(getApplicationBanner()); | ||
| } catch (Exception e) { | ||
| // ignore | ||
| } | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why should these TODO items be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will create follow-up JIRA tickets for these items, or at least for the ones that make sense to follow up on.
For example, I am not sure what “scripting language” or “SP execution” means in this context. SP execution is already possible, so that part may need clarification before creating a separate ticket.