You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/11/04 19:14:23 UTC
hive git commit: HIVE-17913 : Cleanup unused methods in Driver
(Zoltan Haindrich via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master 1649c0741 -> 2140d8688
HIVE-17913 : Cleanup unused methods in Driver (Zoltan Haindrich via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2140d868
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2140d868
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2140d868
Branch: refs/heads/master
Commit: 2140d86888c99e55b2d00d574d8978e9f9ba0f75
Parents: 1649c07
Author: Zoltan Haindrich <ki...@rxd.hu>
Authored: Sat Nov 4 11:52:15 2017 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Sat Nov 4 11:53:25 2017 -0700
----------------------------------------------------------------------
.../hadoop/hive/ql/TestCreateUdfEntities.java | 1 -
.../hive/ql/parse/TestReplicationScenarios.java | 1 -
.../org/apache/hadoop/hive/ql/QTestUtil.java | 20 ++++++----
.../java/org/apache/hadoop/hive/ql/Driver.java | 41 +++++++-------------
.../ql/processors/AddResourceProcessor.java | 4 --
.../hive/ql/processors/CommandProcessor.java | 3 --
.../ql/processors/CommandProcessorFactory.java | 1 -
.../ql/processors/CommandProcessorResponse.java | 10 ++++-
.../hive/ql/processors/CompileProcessor.java | 5 ---
.../hive/ql/processors/CryptoProcessor.java | 4 --
.../ql/processors/DeleteResourceProcessor.java | 4 --
.../hadoop/hive/ql/processors/DfsProcessor.java | 4 --
.../ql/processors/ListResourceProcessor.java | 4 --
.../hive/ql/processors/ReloadProcessor.java | 4 --
.../hive/ql/processors/ResetProcessor.java | 20 ++++++----
.../hadoop/hive/ql/processors/SetProcessor.java | 4 --
.../ql/udf/generic/GenericUDTFGetSplits.java | 1 -
.../hadoop/hive/ql/exec/TestOperators.java | 4 --
.../apache/hadoop/hive/ql/hooks/TestHooks.java | 2 +-
.../hadoop/hive/ql/hooks/TestQueryHooks.java | 1 -
.../hive/ql/io/TestSymlinkTextInputFormat.java | 2 -
.../hive/ql/lockmgr/TestDbTxnManager2.java | 5 ++-
.../hadoop/hive/ql/parse/TestColumnAccess.java | 1 -
.../hive/ql/parse/TestHiveDecimalParse.java | 1 -
.../hive/ql/plan/TestReadEntityDirect.java | 1 -
.../hadoop/hive/ql/plan/TestViewEntity.java | 3 --
26 files changed, 51 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestCreateUdfEntities.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestCreateUdfEntities.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestCreateUdfEntities.java
index 61fb5ba..34f4ed0 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestCreateUdfEntities.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestCreateUdfEntities.java
@@ -37,7 +37,6 @@ public class TestCreateUdfEntities {
HiveConf conf = new HiveConf(Driver.class);
SessionState.start(conf);
driver = new Driver(conf);
- driver.init();
}
@After
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java
index 765fa11..5854116 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestReplicationScenarios.java
@@ -3198,7 +3198,6 @@ public class TestReplicationScenarios {
String replDumpLocn = getResult(0,0,driver);
// Reset the driver
driverMirror.close();
- driverMirror.init();
run("REPL LOAD " + dbName + "_dupe FROM '" + replDumpLocn + "'", driverMirror);
// Calling close() explicitly to clean up the staging dirs
driverMirror.close();
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 6c34c08..f1d90ff 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -706,7 +706,9 @@ public class QTestUtil {
public void addFile(File qf, boolean partial) throws IOException {
String query = readEntireFileIntoString(qf);
qMap.put(qf.getName(), query);
- if (partial) return;
+ if (partial) {
+ return;
+ }
if(checkHadoopVersionExclude(qf.getName(), query)) {
qSkipSet.add(qf.getName());
@@ -1090,7 +1092,6 @@ public class QTestUtil {
conf.set("hive.execution.engine", execEngine);
db = Hive.get(conf);
drv = new Driver(conf);
- drv.init();
pd = new ParseDriver();
sem = new SemanticAnalyzer(queryState);
}
@@ -1738,9 +1739,10 @@ public class QTestUtil {
getQuotedString(inFileName),
getQuotedString(outFileName)
}).getReturnCode();
- if (result != 0)
+ if (result != 0) {
throw new IllegalStateException("Unexpected error while overwriting " +
inFileName + " with " + outFileName);
+ }
}
private static QTestProcessExecResult executeDiffCommand(String inFileName,
@@ -1799,8 +1801,9 @@ public class QTestUtil {
"sort",
getQuotedString(in),
}, out, null).getReturnCode();
- if (result != 0)
+ if (result != 0) {
throw new IllegalStateException("Unexpected error while sorting " + in);
+ }
}
private static QTestProcessExecResult executeCmd(Collection<String> args) throws Exception {
@@ -1865,7 +1868,6 @@ public class QTestUtil {
}
public void resetParser() throws SemanticException {
- drv.init();
pd = new ParseDriver();
queryState = new QueryState.Builder().withHiveConf(conf).build();
sem = new SemanticAnalyzer(queryState);
@@ -2137,7 +2139,9 @@ public class QTestUtil {
}
private static void ensureQvFileList(String queryDir) {
- if (cachedQvFileList != null) return;
+ if (cachedQvFileList != null) {
+ return;
+ }
// Not thread-safe.
System.out.println("Getting versions from " + queryDir);
cachedQvFileList = (new File(queryDir)).list(new FilenameFilter() {
@@ -2146,7 +2150,9 @@ public class QTestUtil {
return name.toLowerCase().endsWith(".qv");
}
});
- if (cachedQvFileList == null) return; // no files at all
+ if (cachedQvFileList == null) {
+ return; // no files at all
+ }
Arrays.sort(cachedQvFileList, String.CASE_INSENSITIVE_ORDER);
List<String> defaults = getVersionFilesInternal("default");
cachedDefaultQvFileList = (defaults != null)
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
index 3fb7cfa..766cbeb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
@@ -229,8 +229,9 @@ public class Driver implements CommandProcessor {
}
public static void removeLockedDriverState() {
- if (lds != null)
+ if (lds != null) {
lds.remove();
+ }
}
}
@@ -243,11 +244,6 @@ public class Driver implements CommandProcessor {
return true;
}
- @Override
- public void init() {
- // Nothing for now.
- }
-
/**
* Return the status information about the Map-Reduce cluster
*/
@@ -1610,18 +1606,16 @@ public class Driver implements CommandProcessor {
// same instance of Driver, which can run multiple queries.
ctx.setHiveTxnManager(queryTxnMgr);
- if (requiresLock()) {
- // a checkpoint to see if the thread is interrupted or not before an expensive operation
- if (isInterrupted()) {
- ret = handleInterruption("at acquiring the lock.");
- } else {
- ret = acquireLocks();
- }
- if (ret != 0) {
- return rollback(createProcessorResponse(ret));
- }
+ if (isInterrupted()) {
+ return createProcessorResponse(handleInterruption("at acquiring the lock."));
}
- ret = execute(true);
+
+ CommandProcessorResponse resp = lockAndRespond();
+ if (resp.failed()) {
+ return resp;
+ }
+
+ ret = execute();
if (ret != 0) {
//if needRequireLock is false, the release here will do nothing because there is no lock
return rollback(createProcessorResponse(ret));
@@ -1683,6 +1677,7 @@ public class Driver implements CommandProcessor {
}
private CommandProcessorResponse rollback(CommandProcessorResponse cpr) {
+
//console.printError(cpr.toString());
try {
releaseLocksAndCommitOrRollback(false);
@@ -1767,11 +1762,7 @@ public class Driver implements CommandProcessor {
return new CommandProcessorResponse(ret, errorMessage, SQLState, downstreamError);
}
- public int execute() throws CommandNeedRetryException {
- return execute(false);
- }
-
- public int execute(boolean deferClose) throws CommandNeedRetryException {
+ private int execute() throws CommandNeedRetryException {
PerfLogger perfLogger = SessionState.getPerfLogger();
perfLogger.PerfLogBegin(CLASS_NAME, PerfLogger.DRIVER_EXECUTE);
@@ -2114,15 +2105,9 @@ public class Driver implements CommandProcessor {
console.printInfo("Total MapReduce CPU Time Spent: " + Utilities.formatMsecToStr(totalCpu));
}
boolean isInterrupted = isInterrupted();
- if (isInterrupted && !deferClose) {
- closeInProcess(true);
- }
lDrvState.stateLock.lock();
try {
if (isInterrupted) {
- if (!deferClose) {
- lDrvState.driverState = DriverState.ERROR;
- }
} else {
lDrvState.driverState = executionError ? DriverState.ERROR : DriverState.EXECUTED;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java
index e1edcaf..84f2ad7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java
@@ -41,10 +41,6 @@ public class AddResourceProcessor implements CommandProcessor {
public static final LogHelper console = new LogHelper(LOG);
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) {
SessionState ss = SessionState.get();
command = new VariableSubstitution(new HiveVariableSource() {
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java
index 10316fb..4de7c45 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessor.java
@@ -21,8 +21,5 @@ package org.apache.hadoop.hive.ql.processors;
import org.apache.hadoop.hive.ql.CommandNeedRetryException;
public interface CommandProcessor {
-
- void init();
-
CommandProcessorResponse run(String command) throws CommandNeedRetryException;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
index 412bcd3..8d0690d 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorFactory.java
@@ -128,7 +128,6 @@ public final class CommandProcessorFactory {
} else {
drv.resetQueryState();
}
- drv.init();
return drv;
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java
index e78ea45..a4687f2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java
@@ -96,8 +96,12 @@ public class CommandProcessorResponse {
public String getSQLState() { return SQLState; }
public Schema getSchema() { return resSchema; }
public Throwable getException() { return exception; }
+
+ public List<String> getConsoleMessages() {
+ return consoleMessages;
+ }
public int getErrorCode() { return hiveErrorCode; }
- public List<String> getConsoleMessages() { return consoleMessages; }
+ @Override
public String toString() {
return "(responseCode = " + responseCode + ", errorMessage = " + errorMessage + ", " +
(hiveErrorCode > 0 ? "hiveErrorCode = " + hiveErrorCode + ", " : "" ) +
@@ -105,4 +109,8 @@ public class CommandProcessorResponse {
(resSchema == null ? "" : ", resSchema = " + resSchema) +
(exception == null ? "" : ", exception = " + exception.getMessage()) + ")";
}
+
+ public boolean failed() {
+ return responseCode != 0;
+ }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
index 6981344..7fcac59 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
@@ -94,11 +94,6 @@ public class CompileProcessor implements CommandProcessor {
runCount = new AtomicInteger(0);
}
- @Override
- public void init() {
- //no init needed
- }
-
/**
* User supplies dynamic code in this format:
* COMPILE ` some code here ` AS groovy NAMED something.groovy;
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/CryptoProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/CryptoProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/CryptoProcessor.java
index 1acdc95..19065b4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/CryptoProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/CryptoProcessor.java
@@ -82,10 +82,6 @@ public class CryptoProcessor implements CommandProcessor {
}
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) throws CommandNeedRetryException {
String[] args = command.split("\\s+");
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java
index d34f253..588a916 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java
@@ -40,10 +40,6 @@ public class DeleteResourceProcessor implements CommandProcessor {
public static final LogHelper console = new LogHelper(LOG);
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) {
SessionState ss = SessionState.get();
command = new VariableSubstitution(new HiveVariableSource() {
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java
index 87a0c5a..3b514b7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java
@@ -60,10 +60,6 @@ public class DfsProcessor implements CommandProcessor {
}
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) {
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/ListResourceProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/ListResourceProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/ListResourceProcessor.java
index 989cb87..3ff4c60 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/ListResourceProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/ListResourceProcessor.java
@@ -44,10 +44,6 @@ public class ListResourceProcessor implements CommandProcessor {
}
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) throws CommandNeedRetryException {
SessionState ss = SessionState.get();
String[] tokens = command.split("\\s+");
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/ReloadProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/ReloadProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/ReloadProcessor.java
index 05b7fa8..44e5555 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/ReloadProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/ReloadProcessor.java
@@ -32,10 +32,6 @@ public class ReloadProcessor implements CommandProcessor{
private static final Logger LOG = LoggerFactory.getLogger(ReloadProcessor.class);
@Override
- public void init() {
- }
-
- @Override
public CommandProcessorResponse run(String command) throws CommandNeedRetryException {
SessionState ss = SessionState.get();
try {
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java
index b40879d..bd8e80b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java
@@ -40,10 +40,6 @@ import org.apache.hadoop.hive.ql.session.SessionState;
public class ResetProcessor implements CommandProcessor {
- @Override
- public void init() {
- }
-
private final static String DEFAULT_ARG = "-d";
@Override
@@ -68,7 +64,9 @@ public class ResetProcessor implements CommandProcessor {
boolean isDefault = false;
List<String> varnames = new ArrayList<>(parts.length);
for (String part : parts) {
- if (part.isEmpty()) continue;
+ if (part.isEmpty()) {
+ continue;
+ }
if (DEFAULT_ARG.equals(part)) {
isDefault = true;
} else {
@@ -95,7 +93,9 @@ public class ResetProcessor implements CommandProcessor {
}
private static void resetOverridesOnly(SessionState ss) {
- if (ss.getOverriddenConfigurations().isEmpty()) return;
+ if (ss.getOverriddenConfigurations().isEmpty()) {
+ return;
+ }
HiveConf conf = new HiveConf();
for (String key : ss.getOverriddenConfigurations().keySet()) {
setSessionVariableFromConf(ss, key, conf);
@@ -104,7 +104,9 @@ public class ResetProcessor implements CommandProcessor {
}
private static void resetOverrideOnly(SessionState ss, String varname) {
- if (!ss.getOverriddenConfigurations().containsKey(varname)) return;
+ if (!ss.getOverriddenConfigurations().containsKey(varname)) {
+ return;
+ }
setSessionVariableFromConf(ss, varname, new HiveConf());
ss.getOverriddenConfigurations().remove(varname);
}
@@ -150,7 +152,9 @@ public class ResetProcessor implements CommandProcessor {
private static HiveConf.ConfVars getConfVar(String propName) {
HiveConf.ConfVars confVars = HiveConf.getConfVars(propName);
- if (confVars == null) throw new IllegalArgumentException(propName + " not found");
+ if (confVars == null) {
+ throw new IllegalArgumentException(propName + " not found");
+ }
return confVars;
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
index 5a2c8cf..b9ca938 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
@@ -151,10 +151,6 @@ public class SetProcessor implements CommandProcessor {
}
}
- @Override
- public void init() {
- }
-
public CommandProcessorResponse executeSetVariable(String varname, String varvalue) {
try {
return setVariable(varname, varvalue);
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java
index 610f36f..dc79283 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java
@@ -244,7 +244,6 @@ public class GenericUDTFGetSplits extends GenericUDTF {
// Session TxnManager that is already in use.
HiveTxnManager txnManager = TxnManagerFactory.getTxnManagerFactory().getTxnManager(conf);
Driver driver = new Driver(conf, txnManager);
- driver.init();
DriverCleanup driverCleanup = new DriverCleanup(driver, txnManager, splitsAppId.toString());
boolean needsCleanup = true;
try {
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
index f62ba34..9be3e14 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
@@ -413,25 +413,21 @@ public class TestOperators extends TestCase {
"outputformat 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat' " +
"tblproperties ('myprop1'='val1', 'myprop2' = 'val2')";
Driver driver = new Driver();
- driver.init();
CommandProcessorResponse response = driver.run(cmd);
assertEquals(0, response.getResponseCode());
List<Object> result = new ArrayList<Object>();
cmd = "load data local inpath '../data/files/employee.dat' " +
"overwrite into table fetchOp partition (state='CA')";
- driver.init();
response = driver.run(cmd);
assertEquals(0, response.getResponseCode());
cmd = "load data local inpath '../data/files/employee2.dat' " +
"overwrite into table fetchOp partition (state='OR')";
- driver.init();
response = driver.run(cmd);
assertEquals(0, response.getResponseCode());
cmd = "select * from fetchOp";
- driver.init();
driver.setMaxRows(500);
response = driver.run(cmd);
assertEquals(0, response.getResponseCode());
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHooks.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHooks.java b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHooks.java
index 52ab10e..a89e5e0 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHooks.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHooks.java
@@ -83,6 +83,7 @@ public class TestHooks {
}
public static class SimpleQueryRedactor extends Redactor {
+ @Override
public String redactQuery(String query) {
return query.replaceAll("XXX", "AAA");
}
@@ -92,7 +93,6 @@ public class TestHooks {
HiveConf.setBoolVar(conf, HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
SessionState.start(conf);
Driver driver = new Driver(conf);
- driver.init();
return driver;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java
index 88a392a..4d19a71 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestQueryHooks.java
@@ -137,7 +137,6 @@ public class TestQueryHooks {
SessionState.start(conf);
Driver driver = new Driver(conf, mockLoader);
- driver.init();
return driver;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java b/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java
index b49cd67..976d83d 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/io/TestSymlinkTextInputFormat.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.hive.ql.Context;
import org.apache.hadoop.hive.ql.Driver;
import org.apache.hadoop.hive.ql.QueryPlan;
import org.apache.hadoop.hive.ql.exec.Utilities;
-import org.apache.hadoop.hive.ql.exec.mr.ExecDriver;
import org.apache.hadoop.hive.ql.exec.mr.MapRedTask;
import org.apache.hadoop.hive.ql.plan.MapredWork;
import org.apache.hadoop.hive.ql.plan.PartitionDesc;
@@ -139,7 +138,6 @@ public class TestSymlinkTextInputFormat extends TestCase {
HiveConf.setBoolVar(hiveConf, HiveConf.ConfVars.HIVE_REWORK_MAPREDWORK, true);
HiveConf.setBoolVar(hiveConf, HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
Driver drv = new Driver(hiveConf);
- drv.init();
String tblName = "text_symlink_text";
String createSymlinkTableCmd = "create table " + tblName + " (key int) stored as " +
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
index 3c172b9..2b72664 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
@@ -96,7 +96,6 @@ public class TestDbTxnManager2 {
SessionState.start(conf);
ctx = new Context(conf);
driver = new Driver(conf);
- driver.init();
TxnDbUtil.cleanDb(conf);
TxnDbUtil.prepDb(conf);
SessionState ss = SessionState.get();
@@ -109,7 +108,9 @@ public class TestDbTxnManager2 {
@After
public void tearDown() throws Exception {
driver.close();
- if (txnMgr != null) txnMgr.closeTxnManager();
+ if (txnMgr != null) {
+ txnMgr.closeTxnManager();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
index 27dc4fb..7bda832 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestColumnAccess.java
@@ -191,7 +191,6 @@ public class TestColumnAccess {
conf.setBoolVar(HiveConf.ConfVars.HIVE_STATS_COLLECT_SCANCOLS, true);
SessionState.start(conf);
Driver driver = new Driver(conf);
- driver.init();
return driver;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
index 9f155e1..eb06b85 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
@@ -137,7 +137,6 @@ public class TestHiveDecimalParse {
SessionState.start(conf);
Driver driver = new Driver(conf);
- driver.init();
return driver;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java
index 60ec8f9..79ce2f1 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestReadEntityDirect.java
@@ -186,7 +186,6 @@ public class TestReadEntityDirect {
HiveConf.setBoolVar(conf, HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
SessionState.start(conf);
Driver driver = new Driver(conf);
- driver.init();
return driver;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/2140d868/ql/src/test/org/apache/hadoop/hive/ql/plan/TestViewEntity.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestViewEntity.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestViewEntity.java
index 4cc9d72..234f979 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestViewEntity.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestViewEntity.java
@@ -24,14 +24,12 @@ import java.util.List;
import java.util.Set;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.ql.CommandNeedRetryException;
import org.apache.hadoop.hive.ql.Driver;
import org.apache.hadoop.hive.ql.exec.Task;
import org.apache.hadoop.hive.ql.hooks.ReadEntity;
import org.apache.hadoop.hive.ql.parse.AbstractSemanticAnalyzerHook;
import org.apache.hadoop.hive.ql.parse.HiveSemanticAnalyzerHookContext;
import org.apache.hadoop.hive.ql.parse.SemanticException;
-import org.apache.hadoop.hive.ql.plan.TestReadEntityDirect.CheckInputReadEntityDirect;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -68,7 +66,6 @@ public class TestViewEntity {
.setBoolVar(conf, HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
SessionState.start(conf);
driver = new Driver(conf);
- driver.init();
}
@AfterClass