forked from apache/kyuubi
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[KYUUBI apache#6109] Fork beeline module from Apache Hive 3.1.3
# 🔍 Description ## Issue References 🔗 This is the first step of apache#6146, to gain a clear commit history, this PR just simply copied the `hive-beeline` module from Apache Hive 3.1.3, with minimal change to pass the tests and manually test basic functionalities, following PRs are going to remove other Hive deps gradually. ## Describe Your Solution 🔧 - Copy source code and test case from Apache Hive 3.1.3 - Drop `org.apache.hive:hive-beeline:3.1.3` - Backport HIVE-21584 to support JDK 9+ - Drop `HiveCli`, `HiveSchemaTool` and `BeelineInPlaceUpdateStream`, and the corresponding test cases - Temporary ignore(will fix later) `TestClientCommandHookFactory#testConnectHook` because of error `NoClassDefFound org/apache/curator/RetryPolicy` - Tune testing code to pass UT ## Types of changes :bookmark: - [ ] Bugfix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan 🧪 Minimal changes to pass the unit tests. --- # Checklist 📝 - [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes apache#6109 from pan3793/fork-beeline. Closes apache#6109 885f9fe [Cheng Pan] NOTICE a2efa1c [Cheng Pan] fix 5bb1cc9 [Cheng Pan] Copy from Apache Hive 3.1.3 Authored-by: Cheng Pan <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
- Loading branch information
1 parent
bbc147f
commit 9eaa291
Showing
69 changed files
with
11,297 additions
and
15 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,3 +51,5 @@ build/scala-*/** | |
**/node_modules/** | ||
**/gen/* | ||
**/*.tokens | ||
**/BeeLine.properties | ||
**/sql-keywords.properties |
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 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
103 changes: 103 additions & 0 deletions
103
kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/AbstractCommandHandler.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you 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. | ||
*/ | ||
|
||
/* | ||
* This source file is based on code taken from SQLLine 1.0.2 | ||
* See SQLLine notice in LICENSE | ||
*/ | ||
package org.apache.hive.beeline; | ||
|
||
import java.util.Arrays; | ||
import java.util.LinkedList; | ||
import java.util.List; | ||
import jline.console.completer.Completer; | ||
import jline.console.completer.NullCompleter; | ||
|
||
/** An abstract implementation of CommandHandler. */ | ||
public abstract class AbstractCommandHandler implements CommandHandler { | ||
private final BeeLine beeLine; | ||
private final String name; | ||
private final String[] names; | ||
private final String helpText; | ||
private Completer[] parameterCompleters = new Completer[0]; | ||
|
||
protected transient Throwable lastException; | ||
|
||
public AbstractCommandHandler( | ||
BeeLine beeLine, String[] names, String helpText, Completer[] completors) { | ||
this.beeLine = beeLine; | ||
name = names[0]; | ||
this.names = names; | ||
this.helpText = helpText; | ||
if (completors == null || completors.length == 0) { | ||
parameterCompleters = new Completer[] {new NullCompleter()}; | ||
} else { | ||
List<Completer> c = new LinkedList<Completer>(Arrays.asList(completors)); | ||
c.add(new NullCompleter()); | ||
parameterCompleters = c.toArray(new Completer[0]); | ||
} | ||
} | ||
|
||
@Override | ||
public String getHelpText() { | ||
return helpText; | ||
} | ||
|
||
@Override | ||
public String getName() { | ||
return name; | ||
} | ||
|
||
@Override | ||
public String[] getNames() { | ||
return names; | ||
} | ||
|
||
@Override | ||
public String matches(String line) { | ||
if (line == null || line.length() == 0) { | ||
return null; | ||
} | ||
|
||
String[] parts = beeLine.split(line); | ||
if (parts == null || parts.length == 0) { | ||
return null; | ||
} | ||
|
||
for (String name2 : names) { | ||
if (name2.startsWith(parts[0])) { | ||
return name2; | ||
} | ||
} | ||
return null; | ||
} | ||
|
||
public void setParameterCompleters(Completer[] parameterCompleters) { | ||
this.parameterCompleters = parameterCompleters; | ||
} | ||
|
||
@Override | ||
public Completer[] getParameterCompleters() { | ||
return parameterCompleters; | ||
} | ||
|
||
@Override | ||
public Throwable getLastException() { | ||
return lastException; | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/AbstractOutputFormat.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you 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. | ||
*/ | ||
|
||
/* | ||
* This source file is based on code taken from SQLLine 1.0.2 | ||
* See SQLLine notice in LICENSE | ||
*/ | ||
package org.apache.hive.beeline; | ||
|
||
/** Abstract OutputFormat. */ | ||
abstract class AbstractOutputFormat implements OutputFormat { | ||
|
||
public int print(Rows rows) { | ||
int count = 0; | ||
Rows.Row header = (Rows.Row) rows.next(); | ||
printHeader(header); | ||
|
||
while (rows.hasNext()) { | ||
printRow(rows, header, (Rows.Row) rows.next()); | ||
count++; | ||
} | ||
printFooter(header); | ||
return count; | ||
} | ||
|
||
abstract void printHeader(Rows.Row header); | ||
|
||
abstract void printFooter(Rows.Row header); | ||
|
||
abstract void printRow(Rows rows, Rows.Row header, Rows.Row row); | ||
} |
Oops, something went wrong.