diff --git ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java index 444e45c..babe440 100644 --- ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java +++ ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java @@ -72,6 +72,11 @@ public class SessionState { * verbose mode */ protected boolean isVerbose; + + /** + * initialization phase, used for test executions only + */ + protected boolean isInitPhase; /* * HiveHistory Object @@ -659,4 +664,12 @@ public class SessionState { public void setCreateTableGrants(CreateTableAutomaticGrant createTableGrants) { this.createTableGrants = createTableGrants; } + + public boolean isInitPhase() { + return isInitPhase; + } + + public void setInitPhase(boolean isInitPhase) { + this.isInitPhase = isInitPhase; + } } diff --git ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java index 8f1eb50..242169e 100644 --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java @@ -415,7 +415,7 @@ public class QTestUtil { public void createSources() throws Exception { startSessionState(); - conf.setBoolean("hive.test.init.phase", true); + SessionState.get().setInitPhase(true); // Create a bunch of tables with columns key and value LinkedList cols = new LinkedList(); @@ -510,7 +510,7 @@ public class QTestUtil { fpath = new Path(testFiles, "json.txt"); runLoadCmd("LOAD DATA LOCAL INPATH '" + fpath.toString() + "' INTO TABLE src_json"); - conf.setBoolean("hive.test.init.phase", false); + SessionState.get().setInitPhase(false); } public void init() throws Exception { diff --git ql/src/test/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java ql/src/test/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java index ec0c7b3..2cb248d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java +++ ql/src/test/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java @@ -45,7 +45,7 @@ public class EnforceReadOnlyTables implements ExecuteWithHookContext { public void run(SessionState sess, Set inputs, Set outputs, UserGroupInformation ugi) throws Exception { - if (sess.getConf().getBoolean("hive.test.init.phase", false) == true) { + if (SessionState.get().isInitPhase()) { return; } for (WriteEntity w: outputs) {