You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2016/09/13 07:50:22 UTC
hive git commit: HIVE-14663: Change ptest java language version to
1.7,
other version changes and fixes (Siddharth Seth reviewed by Prasanth
Jayachandran)
Repository: hive
Updated Branches:
refs/heads/master 805367b0e -> 7c7fa756c
HIVE-14663: Change ptest java language version to 1.7, other version changes and fixes (Siddharth Seth reviewed by Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/7c7fa756
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/7c7fa756
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/7c7fa756
Branch: refs/heads/master
Commit: 7c7fa756cbb79c004363cdac55e311d7d52ea9e9
Parents: 805367b
Author: Prasanth Jayachandran <pr...@apache.org>
Authored: Tue Sep 13 00:50:07 2016 -0700
Committer: Prasanth Jayachandran <pr...@apache.org>
Committed: Tue Sep 13 00:50:07 2016 -0700
----------------------------------------------------------------------
testutils/ptest2/pom.xml | 41 ++++++++++++--------
.../hive/ptest/execution/conf/TestParser.java | 3 --
...tScripts.testAlternativeTestJVM.approved.txt | 8 +++-
.../TestScripts.testBatch.approved.txt | 8 +++-
4 files changed, 38 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/7c7fa756/testutils/ptest2/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
index 375c2a1..cea29b6 100644
--- a/testutils/ptest2/pom.xml
+++ b/testutils/ptest2/pom.xml
@@ -26,8 +26,9 @@ limitations under the License.
<name>hive-ptest</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4j2.version>2.4.1</log4j2.version>
+ <log4j2.version>2.6.2</log4j2.version>
<spring.framework.version>3.2.16.RELEASE</spring.framework.version>
+ <jclouds.version>1.9.2</jclouds.version>
</properties>
<repositories>
@@ -48,7 +49,7 @@ limitations under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -58,12 +59,12 @@ limitations under the License.
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>18.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -83,37 +84,43 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5</version>
+ <version>4.4</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
<artifactId>aws-ec2</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>ec2</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
- <version>1.7.3</version>
+ <version>${jclouds.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -128,13 +135,13 @@ limitations under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.10</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
+ <version>1.7.10</version>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@@ -179,8 +186,8 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/hive/blob/7c7fa756/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
index e38cbb4..5da804f 100644
--- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
+++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
@@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,8 +34,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.PatternLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/hive/blob/7c7fa756/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
index 83bcbee..092461b 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
@@ -85,10 +85,16 @@ fi
echo $pid >> batch.pid
wait $pid
ret=$?
-find ./ -type f -name hive.log -o -name spark.log | \
+find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \
xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f'
find ./ -type f -name 'TEST-*.xml' | \
xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f'
+find ./ -path "*/spark/work" | \
+ xargs -I {} sh -c 'mv {} /some/log/dir/spark-log'
+find ./ -type f -name 'syslog*' | \
+ xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs'
+
+
if [[ -f /some/log/dir/.log ]]
then
mv /some/log/dir/.log /some/log/dir/dot.log
http://git-wip-us.apache.org/repos/asf/hive/blob/7c7fa756/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
index 5705839..3270167 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
@@ -85,10 +85,16 @@ fi
echo $pid >> batch.pid
wait $pid
ret=$?
-find ./ -type f -name hive.log -o -name spark.log | \
+find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \
xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f'
find ./ -type f -name 'TEST-*.xml' | \
xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f'
+find ./ -path "*/spark/work" | \
+ xargs -I {} sh -c 'mv {} /some/log/dir/spark-log'
+find ./ -type f -name 'syslog*' | \
+ xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs'
+
+
if [[ -f /some/log/dir/.log ]]
then
mv /some/log/dir/.log /some/log/dir/dot.log