You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/09/11 23:02:11 UTC
svn commit: r1624389 [3/3] - in /hive/branches/cbo: ./
common/src/java/org/apache/hadoop/hive/conf/
itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/
itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/
itests/hiv...
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge1.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge1.q.out Thu Sep 11 21:02:09 2014
@@ -1,8 +1,12 @@
-PREHOOK: query: create table dest1(key int, val int)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table dest1(key int, val int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@dest1
-POSTHOOK: query: create table dest1(key int, val int)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table dest1(key int, val int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@dest1
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge2.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/merge2.q.out Thu Sep 11 21:02:09 2014
@@ -1,8 +1,12 @@
-PREHOOK: query: create table test1(key int, val int)
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+create table test1(key int, val int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@test1
-POSTHOOK: query: create table test1(key int, val int)
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+create table test1(key int, val int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@test1
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_analyze.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_analyze.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_analyze.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_analyze.q.out Thu Sep 11 21:02:09 2014
@@ -105,7 +105,7 @@ Table Parameters:
numFiles 1
numRows 100
rawDataSize 52600
- totalSize 3098
+ totalSize 3123
#### A masked pattern was here ####
# Storage Information
@@ -195,7 +195,7 @@ Table Parameters:
numFiles 1
numRows 100
rawDataSize 52600
- totalSize 3098
+ totalSize 3123
#### A masked pattern was here ####
# Storage Information
@@ -309,7 +309,7 @@ Partition Parameters:
numFiles 1
numRows 50
rawDataSize 21950
- totalSize 2016
+ totalSize 2024
#### A masked pattern was here ####
# Storage Information
@@ -354,7 +354,7 @@ Partition Parameters:
numFiles 1
numRows 50
rawDataSize 22050
- totalSize 2036
+ totalSize 2043
#### A masked pattern was here ####
# Storage Information
@@ -456,7 +456,7 @@ Partition Parameters:
numFiles 1
numRows 50
rawDataSize 21950
- totalSize 2016
+ totalSize 2024
#### A masked pattern was here ####
# Storage Information
@@ -501,7 +501,7 @@ Partition Parameters:
numFiles 1
numRows 50
rawDataSize 22050
- totalSize 2036
+ totalSize 2043
#### A masked pattern was here ####
# Storage Information
@@ -621,7 +621,7 @@ Partition Parameters:
numFiles 4
numRows 50
rawDataSize 21980
- totalSize 4955
+ totalSize 4963
#### A masked pattern was here ####
# Storage Information
@@ -666,7 +666,7 @@ Partition Parameters:
numFiles 4
numRows 50
rawDataSize 22048
- totalSize 5046
+ totalSize 5051
#### A masked pattern was here ####
# Storage Information
@@ -774,7 +774,7 @@ Partition Parameters:
numFiles 4
numRows 50
rawDataSize 21980
- totalSize 4955
+ totalSize 4963
#### A masked pattern was here ####
# Storage Information
@@ -819,7 +819,7 @@ Partition Parameters:
numFiles 4
numRows 50
rawDataSize 22048
- totalSize 5046
+ totalSize 5051
#### A masked pattern was here ####
# Storage Information
@@ -984,7 +984,7 @@ Partition Parameters:
numFiles 1
numRows 50
rawDataSize 21950
- totalSize 2016
+ totalSize 2024
#### A masked pattern was here ####
# Storage Information
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge3.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge3.q.out Thu Sep 11 21:02:09 2014
@@ -138,7 +138,7 @@ Table Parameters:
numFiles 1
numRows 1000
rawDataSize 94000
- totalSize 2502
+ totalSize 2538
#### A masked pattern was here ####
# Storage Information
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge4.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/orc_merge4.q.out Thu Sep 11 21:02:09 2014
@@ -64,7 +64,7 @@ Partition Parameters:
numFiles 1
numRows 500
rawDataSize 47000
- totalSize 2460
+ totalSize 2496
#### A masked pattern was here ####
# Storage Information
@@ -129,7 +129,7 @@ Partition Parameters:
numFiles 1
numRows 500
rawDataSize 47000
- totalSize 2460
+ totalSize 2496
#### A masked pattern was here ####
# Storage Information
@@ -170,7 +170,7 @@ Partition Parameters:
numFiles 1
numRows 500
rawDataSize 47000
- totalSize 2460
+ totalSize 2496
#### A masked pattern was here ####
# Storage Information
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out Thu Sep 11 21:02:09 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_19.q.out Thu Sep 11 21:02:09 2014
@@ -8,6 +8,8 @@ PREHOOK: query: -- This is to test the u
-- Since this test creates sub-directories for the output table outputTbl1, it might be easier
-- to run the test only on hadoop 23
+-- SORT_QUERY_RESULTS
+
create table inputTbl1(key string, val string) stored as textfile
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
@@ -22,6 +24,8 @@ POSTHOOK: query: -- This is to test the
-- Since this test creates sub-directories for the output table outputTbl1, it might be easier
-- to run the test only on hadoop 23
+-- SORT_QUERY_RESULTS
+
create table inputTbl1(key string, val string) stored as textfile
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
@@ -227,14 +231,14 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@outputtbl1
#### A masked pattern was here ####
1 1
-2 1
-3 1
-7 1
-8 2
1 1
2 1
+2 1
+3 1
3 1
7 1
+7 1
+8 2
8 2
PREHOOK: query: -- filter should be fine
explain
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/vectorized_ptf.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/vectorized_ptf.q.out?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/vectorized_ptf.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/vectorized_ptf.q.out Thu Sep 11 21:02:09 2014 differ
Modified: hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java (original)
+++ hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java Thu Sep 11 21:02:09 2014
@@ -347,7 +347,7 @@ public class PTest {
executionContext = executionContextProvider.createExecutionContext();
LocalCommandFactory localCommandFactory = new LocalCommandFactory(LOG);
PTest ptest = new PTest(conf, executionContext, buildTag, logDir,
- localCommandFactory, new SSHCommandExecutor(LOG),
+ localCommandFactory, new SSHCommandExecutor(LOG, localCommandFactory, conf.getSshOpts()),
new RSyncCommandExecutor(LOG, 10, localCommandFactory), LOG);
exitCode = ptest.run();
} finally {
Modified: hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java (original)
+++ hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java Thu Sep 11 21:02:09 2014
@@ -55,6 +55,7 @@ public class TestConfiguration {
private static final String JIRA_USER = "jiraUser";
private static final String JIRA_PASSWORD = "jiraPassword";
private static final String JENKINS_URL = "jenkinsURL";
+ private static final String SSH_OPTS = "sshOpts";
private static final String LOGS_URL = "logsURL";
private static final String TEST_CASE_PROPERTY_NAME = "testCasePropertyName";
private static final String BUILD_TOOL = "buildTool";
@@ -75,6 +76,7 @@ public class TestConfiguration {
private String javaHome;
private String javaHomeForTests;
private String branch;
+ private String sshOpts;
private final String jenkinsURL;
private final String logsURL;
private final String jiraUrl;
@@ -122,10 +124,14 @@ public class TestConfiguration {
jenkinsURL = context.getString(JENKINS_URL, "https://builds.apache.org/job").trim();
logsURL = context.getString(LOGS_URL, "").trim();
testCasePropertyName = context.getString(TEST_CASE_PROPERTY_NAME, "testcase").trim();
+ sshOpts = context.getString(SSH_OPTS, "").trim();
}
public Context getContext() {
return context;
}
+ public String getSshOpts() {
+ return sshOpts;
+ }
public String getJenkinsURL() {
return jenkinsURL;
}
Modified: hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java (original)
+++ hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java Thu Sep 11 21:02:09 2014
@@ -30,15 +30,17 @@ public class SSHCommandExecutor {
private final Logger mLogger;
private final LocalCommandFactory mLocalCommandFactory;
+ private final String mSshOpts;
private volatile boolean mShutdown;
-
- public SSHCommandExecutor(Logger logger, LocalCommandFactory localCommandFactory) {
+
+ public SSHCommandExecutor(Logger logger, LocalCommandFactory localCommandFactory, String sshOpts) {
mLogger = logger;
- mShutdown = false;
mLocalCommandFactory = localCommandFactory;
+ mSshOpts = sshOpts;
+ mShutdown = false;
}
public SSHCommandExecutor(Logger logger) {
- this(logger, new LocalCommandFactory(logger));
+ this(logger, new LocalCommandFactory(logger), "");
}
/**
* Execute the given command via the ssh command line tool. If the command
@@ -47,8 +49,8 @@ public class SSHCommandExecutor {
public void execute(SSHCommand command) {
CollectPolicy collector = new CollectPolicy();
try {
- String commandText = String.format("ssh -v -i %s -l %s %s '%s'", command.getPrivateKey(),
- command.getUser(), command.getHost(), command.getCommand());
+ String commandText = String.format("ssh -v -i %s %s -l %s %s '%s'", command.getPrivateKey(),
+ mSshOpts, command.getUser(), command.getHost(), command.getCommand());
int attempts = 0;
boolean retry;
LocalCommand cmd;
@@ -83,4 +85,4 @@ public class SSHCommandExecutor {
public void shutdownNow() {
this.mShutdown = true;
}
-}
\ No newline at end of file
+}
Modified: hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java?rev=1624389&r1=1624388&r2=1624389&view=diff
==============================================================================
--- hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java (original)
+++ hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java Thu Sep 11 21:02:09 2014
@@ -50,7 +50,8 @@ public class TestSSHCommandExecutor {
public void testShutdownBeforeWaitFor() throws Exception {
LocalCommand localCommand = mock(LocalCommand.class);
localCommandFactory.setInstance(localCommand);
- SSHCommandExecutor executor = new SSHCommandExecutor(LOG, localCommandFactory);
+ SSHCommandExecutor executor = new SSHCommandExecutor(LOG, localCommandFactory,
+ "-o StrictHostKeyChecking=no");
Assert.assertFalse(executor.isShutdown());
executor.shutdownNow();
SSHCommand command = new SSHCommand(executor, "privateKey", "user", "host", 1, "whoami");
@@ -66,7 +67,8 @@ public class TestSSHCommandExecutor {
public void testShutdownDuringWaitFor() throws Exception {
LocalCommand localCommand = mock(LocalCommand.class);
localCommandFactory.setInstance(localCommand);
- final SSHCommandExecutor executor = new SSHCommandExecutor(LOG, localCommandFactory);
+ final SSHCommandExecutor executor = new SSHCommandExecutor(LOG, localCommandFactory,
+ "-o StrictHostKeyChecking=no");
Assert.assertFalse(executor.isShutdown());
when(localCommand.getExitCode()).thenAnswer(new Answer<Integer>() {
@Override
@@ -84,4 +86,4 @@ public class TestSSHCommandExecutor {
}
verify(localCommand, never()).kill();
}
-}
\ No newline at end of file
+}