You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ng...@apache.org on 2022/02/25 04:50:45 UTC
[hive] branch master updated: Revert "HIVE-25750: [standalone beeline] Fixing the bug in HIVE-24348.(Abhay Chennagiri via Naveen Gangam)"
This is an automated email from the ASF dual-hosted git repository.
ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 2a1a73f Revert "HIVE-25750: [standalone beeline] Fixing the bug in HIVE-24348.(Abhay Chennagiri via Naveen Gangam)"
2a1a73f is described below
commit 2a1a73f665eee497ebdb0745ab2c31c1614de017
Author: Naveen Gangam <ng...@cloudera.com>
AuthorDate: Thu Feb 24 23:50:26 2022 -0500
Revert "HIVE-25750: [standalone beeline] Fixing the bug in HIVE-24348.(Abhay Chennagiri via Naveen Gangam)"
This reverts commit fe14d020470b8494f01ab28afad8ff9abfee0665.
---
beeline/pom.xml | 47 ----------------------
.../src/java/org/apache/hive/beeline/BeeLine.java | 3 +-
packaging/src/main/assembly/beeline.xml | 11 +----
3 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/beeline/pom.xml b/beeline/pom.xml
index c5cac43..131a3f6 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -226,53 +226,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <finalName>jar-with-dependencies</finalName>
- <transformers>
- <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.openjdk.jmh.Main</mainClass>
- </transformer>
- </transformers>
- <filters>
- <filter>
- <!--
- Shading signed JARs will fail without this.
- http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
- -->
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>com.github.edwgiz</groupId>
- <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
- </plugin>
-
-
</plugins>
</build>
</project>
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
index 49b5fad..28b5caa 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -86,7 +86,6 @@ import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hive.conf.Constants;
@@ -1341,7 +1340,7 @@ public class BeeLine implements Closeable {
} else {
org.apache.hadoop.fs.Path path = new org.apache.hadoop.fs.Path(fileName);
FileSystem fs;
- Configuration conf = new Configuration();
+ HiveConf conf = new HiveConf();
if (!path.toUri().isAbsolute()) {
fs = FileSystem.getLocal(conf);
path = fs.makeQualified(path);
diff --git a/packaging/src/main/assembly/beeline.xml b/packaging/src/main/assembly/beeline.xml
index d18e327..f86f57b 100644
--- a/packaging/src/main/assembly/beeline.xml
+++ b/packaging/src/main/assembly/beeline.xml
@@ -73,15 +73,6 @@
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
-
- <fileSet>
- <fileMode>755</fileMode>
- <directory>${project.parent.basedir}/beeline/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>original-jar-with-dependencies.jar</include>
- </includes>
- </fileSet>
</fileSets>
-</assembly>
+</assembly>
\ No newline at end of file