You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2019/10/08 13:04:22 UTC
[hive] branch master updated (050f918 -> d907dfe)
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git.
from 050f918 HIVE-22252: Fix caught NullPointerExceptions generated during EXPLAIN (John Sherman, reviewed by Jesus Camacho Rodriguez)
new 50296ef HIVE-7145: Remove dependence on apache commons-lang (David Lavati via László Bodor, Zoltan Haindrich)
new caf7ac0 HIVE-22278: Upgrade log4j to 2.12.1 (David Lavati via Zoltan Haindrich)
new d907dfe HIVE-22270: Upgrade commons-io to 2.6 (David Lavati via Zoltan Haindrich)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
accumulo-handler/pom.xml | 4 ----
beeline/pom.xml | 5 -----
cli/pom.xml | 5 -----
common/pom.xml | 5 -----
druid-handler/pom.xml | 5 -----
hbase-handler/pom.xml | 5 -----
hplsql/pom.xml | 5 -----
.../hive/service/cli/operation/TestOperationLoggingLayout.java | 4 ++--
llap-server/pom.xml | 5 -----
metastore/pom.xml | 5 -----
pom.xml | 10 ++--------
ql/pom.xml | 10 +++++-----
.../hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java | 4 ++++
serde/pom.xml | 5 -----
service/pom.xml | 6 ------
shims/0.23/pom.xml | 5 -----
shims/common/pom.xml | 5 -----
standalone-metastore/metastore-common/pom.xml | 5 +++++
standalone-metastore/pom.xml | 2 +-
storage-api/pom.xml | 6 ------
testutils/ptest2/pom.xml | 4 ++--
vector-code-gen/pom.xml | 5 -----
22 files changed, 21 insertions(+), 94 deletions(-)
[hive] 03/03: HIVE-22270: Upgrade commons-io to 2.6 (David Lavati
via Zoltan Haindrich)
Posted by kg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit d907dfe68ed84714d62a22e5191efa616eab2b24
Author: David Lavati <da...@gmail.com>
AuthorDate: Tue Oct 8 12:56:15 2019 +0000
HIVE-22270: Upgrade commons-io to 2.6 (David Lavati via Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
---
pom.xml | 2 +-
testutils/ptest2/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1f4cb10..47634f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.18</commons-compress.version>
<commons-exec.version>1.1</commons-exec.version>
- <commons-io.version>2.4</commons-io.version>
+ <commons-io.version>2.6</commons-io.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-pool.version>1.5.4</commons-pool.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
index 32e302e..ebb3990 100644
--- a/testutils/ptest2/pom.xml
+++ b/testutils/ptest2/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
[hive] 02/03: HIVE-22278: Upgrade log4j to 2.12.1 (David Lavati via
Zoltan Haindrich)
Posted by kg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit caf7ac0099645ac8500d824556941447e66e25e3
Author: David Lavati <da...@gmail.com>
AuthorDate: Tue Oct 8 12:54:24 2019 +0000
HIVE-22278: Upgrade log4j to 2.12.1 (David Lavati via Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
---
.../hive/service/cli/operation/TestOperationLoggingLayout.java | 4 ++--
pom.xml | 2 +-
ql/pom.xml | 5 +++++
.../apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java | 4 ++++
standalone-metastore/metastore-common/pom.xml | 5 +++++
standalone-metastore/pom.xml | 2 +-
testutils/ptest2/pom.xml | 2 +-
7 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
index d90d590..6972dde 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
@@ -188,7 +188,7 @@ public class TestOperationLoggingLayout {
Map<String, Appender> appendersMap = loggerConfig.getAppenders();
RoutingAppender routingAppender = (RoutingAppender) appendersMap.get(routingAppenderName);
Assert.assertNotNull(msg + "could not find routingAppender " + routingAppenderName, routingAppender);
- Field defaultsField = RoutingAppender.class.getDeclaredField("appenders");
+ Field defaultsField = RoutingAppender.class.getDeclaredField("createdAppenders");
defaultsField.setAccessible(true);
ConcurrentHashMap appenders = (ConcurrentHashMap) defaultsField.get(routingAppender);
AppenderControl appenderControl = (AppenderControl) appenders.get(queryId);
@@ -219,7 +219,7 @@ public class TestOperationLoggingLayout {
Map<String, Appender> appendersMap = loggerConfig.getAppenders();
RoutingAppender routingAppender = (RoutingAppender) appendersMap.get(routingAppenderName);
Assert.assertNotNull("could not find routingAppender " + routingAppenderName, routingAppender);
- Field defaultsField = RoutingAppender.class.getDeclaredField("appenders");
+ Field defaultsField = RoutingAppender.class.getDeclaredField("createdAppenders");
defaultsField.setAccessible(true);
ConcurrentHashMap appenders = (ConcurrentHashMap) defaultsField.get(routingAppender);
AppenderControl appenderControl = (AppenderControl) appenders.get(queryId);
diff --git a/pom.xml b/pom.xml
index ba11dcf..1f4cb10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
<!-- Leaving libfb303 at 0.9.3 regardless of libthrift: As per THRIFT-4613 The Apache Thrift project does not publish items related to fb303 at this point -->
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.9.3-1</libthrift.version>
- <log4j2.version>2.10.0</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.5.6</orc.version>
<mockito-core.version>1.10.19</mockito-core.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 6e850e7..0d57c25 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -131,6 +131,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
index 664734c..67bbd8e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java
@@ -73,6 +73,10 @@ public class SlidingFilenameRolloverStrategy
return getLogFileName(pattern);
}
+ @Override public void clearCurrentFileName() {
+ // no rename is needed
+ }
+
/**
* @return Mangled file name formed by appending the current timestamp
*/
diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml
index 2aa3950..e252f12 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -186,6 +186,11 @@
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
</dependency>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index be0add47..9f064a8 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -88,7 +88,7 @@
<junit.version>4.11</junit.version>
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.9.3-1</libthrift.version>
- <log4j2.version>2.8.2</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<mockito-core.version>1.10.19</mockito-core.version>
<orc.version>1.5.1</orc.version>
<protobuf.version>2.5.0</protobuf.version>
diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
index e8f964c..32e302e 100644
--- a/testutils/ptest2/pom.xml
+++ b/testutils/ptest2/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
<name>hive-ptest</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4j2.version>2.10.0</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<spring.framework.version>3.2.16.RELEASE</spring.framework.version>
<jclouds.version>2.1.0</jclouds.version>
<checkstyle.conf.dir>${basedir}/../../checkstyle/</checkstyle.conf.dir>
[hive] 01/03: HIVE-7145: Remove dependence on apache commons-lang (David Lavati via László Bodor, Zoltan Haindrich)
Posted by kg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit 50296ef9a7cfd436f6e7b058cbc67e1243cd81a1
Author: David Lavati <da...@gmail.com>
AuthorDate: Tue Oct 8 12:53:57 2019 +0000
HIVE-7145: Remove dependence on apache commons-lang (David Lavati via László Bodor, Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
---
accumulo-handler/pom.xml | 4 ----
beeline/pom.xml | 5 -----
cli/pom.xml | 5 -----
common/pom.xml | 5 -----
druid-handler/pom.xml | 5 -----
hbase-handler/pom.xml | 5 -----
hplsql/pom.xml | 5 -----
llap-server/pom.xml | 5 -----
metastore/pom.xml | 5 -----
pom.xml | 6 ------
ql/pom.xml | 5 -----
serde/pom.xml | 5 -----
service/pom.xml | 6 ------
shims/0.23/pom.xml | 5 -----
shims/common/pom.xml | 5 -----
storage-api/pom.xml | 6 ------
vector-code-gen/pom.xml | 5 -----
17 files changed, 87 deletions(-)
diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml
index 79fc809..20637c0 100644
--- a/accumulo-handler/pom.xml
+++ b/accumulo-handler/pom.xml
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<exclusions>
diff --git a/beeline/pom.xml b/beeline/pom.xml
index 19ec53e..4e5ad07 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -67,11 +67,6 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6dd5856..79fa973 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -71,11 +71,6 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
diff --git a/common/pom.xml b/common/pom.xml
index 07afc0e..9cc9d6b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -60,11 +60,6 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml
index 3146cbe..0b8686e 100644
--- a/druid-handler/pom.xml
+++ b/druid-handler/pom.xml
@@ -76,11 +76,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${druid.guava.version}</version>
diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml
index 58666f8..da24059 100644
--- a/hbase-handler/pom.xml
+++ b/hbase-handler/pom.xml
@@ -41,11 +41,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
diff --git a/hplsql/pom.xml b/hplsql/pom.xml
index 11eb14f..2642c6a 100644
--- a/hplsql/pom.xml
+++ b/hplsql/pom.xml
@@ -44,11 +44,6 @@
<version>${commons-cli.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
diff --git a/llap-server/pom.xml b/llap-server/pom.xml
index 231aa2d..e03de9c 100644
--- a/llap-server/pom.xml
+++ b/llap-server/pom.xml
@@ -76,11 +76,6 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
diff --git a/metastore/pom.xml b/metastore/pom.xml
index e6de6de..95e2d07 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -90,11 +90,6 @@
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<!-- XXX we probably shouldn't be shipping this but the tests depend on it -->
<dependency>
<groupId>org.apache.derby</groupId>
diff --git a/pom.xml b/pom.xml
index 351df44..ba11dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,6 @@
<commons-compress.version>1.18</commons-compress.version>
<commons-exec.version>1.1</commons-exec.version>
<commons-io.version>2.4</commons-io.version>
- <commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<commons-pool.version>1.5.4</commons-pool.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
@@ -349,11 +348,6 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 4459113..6e850e7 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -120,11 +120,6 @@
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>javolution</groupId>
<artifactId>javolution</artifactId>
<version>${javolution.version}</version>
diff --git a/serde/pom.xml b/serde/pom.xml
index 970074e..373cce9 100644
--- a/serde/pom.xml
+++ b/serde/pom.xml
@@ -61,11 +61,6 @@
<version>${commons-codec.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
<version>${arrow.version}</version>
diff --git a/service/pom.xml b/service/pom.xml
index ca91408..911e93a 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -128,12 +128,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
- <!-- used by thrift generated code -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml
index 4e11ba5..a5d680e 100644
--- a/shims/0.23/pom.xml
+++ b/shims/0.23/pom.xml
@@ -42,11 +42,6 @@
</dependency>
<!-- inter-project -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
diff --git a/shims/common/pom.xml b/shims/common/pom.xml
index d0c23c9..49d507b 100644
--- a/shims/common/pom.xml
+++ b/shims/common/pom.xml
@@ -62,11 +62,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${libthrift.version}</version>
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index bb1ec1f..46109c0 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -30,7 +30,6 @@
<name>Hive Storage API</name>
<properties>
- <commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.3</commons-logging.version>
<guava.version>19.0</guava.version>
<hadoop.version>3.1.0</hadoop.version>
@@ -43,11 +42,6 @@
<dependencies>
<!-- compile inter-project -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
diff --git a/vector-code-gen/pom.xml b/vector-code-gen/pom.xml
index 0605a89..489f4a8 100644
--- a/vector-code-gen/pom.xml
+++ b/vector-code-gen/pom.xml
@@ -34,11 +34,6 @@
<dependencies>
<!-- dependencies are always listed in sorted order by groupId, artifectId -->
<!-- inter-project -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>