diff --git ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java index f2fc421..4f7990f 100644 --- ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java +++ ql/src/test/org/apache/hadoop/hive/ql/schq/TestScheduledQueryStatements.java @@ -205,6 +205,9 @@ @Test public void testExecuteImmediate() throws ParseException, Exception { + // use a different namespace because the schq executor might be able to + // catch the new schq execution immediately + env_setup.getTestCtx().hiveConf.setVar(ConfVars.HIVE_SCHEDULED_QUERIES_NAMESPACE, "immed"); IDriver driver = createDriver(); driver.run("set role admin"); @@ -213,7 +216,7 @@ driver.run("alter scheduled query immed execute"); try (CloseableObjectStore os = new CloseableObjectStore(env_setup.getTestCtx().hiveConf)) { - Optional sq = os.getMScheduledQuery(new ScheduledQueryKey("immed", "hive")); + Optional sq = os.getMScheduledQuery(new ScheduledQueryKey("immed", "immed")); assertTrue(sq.isPresent()); assertThat(sq.get().getNextExecution(), Matchers.lessThanOrEqualTo((int) (System.currentTimeMillis() / 1000))); int cnt1 = ScheduledQueryExecutionService.getForcedScheduleCheckCount(); diff --git ql/src/test/queries/clientpositive/schq_analyze.q ql/src/test/queries/clientpositive/schq_analyze.q index 3c03360..246a215 100644 --- ql/src/test/queries/clientpositive/schq_analyze.q +++ ql/src/test/queries/clientpositive/schq_analyze.q @@ -21,7 +21,7 @@ alter scheduled query t_analyze execute; -!sleep 10; +!sleep 30; select * from information_schema.scheduled_executions s where schedule_name='ex_analyze' order by scheduled_execution_id desc limit 3; diff --git ql/src/test/queries/clientpositive/schq_ingest.q ql/src/test/queries/clientpositive/schq_ingest.q index b7bc90c..8ffc722 100644 --- ql/src/test/queries/clientpositive/schq_ingest.q +++ ql/src/test/queries/clientpositive/schq_ingest.q @@ -39,7 +39,7 @@ -- pretend that a timeout have happened alter scheduled query ingest execute; -!sleep 10; +!sleep 30; select state,error_message from sys.scheduled_executions; select * from t order by id; diff --git ql/src/test/queries/clientpositive/schq_materialized.q ql/src/test/queries/clientpositive/schq_materialized.q index 7242f3e..46b725e 100644 --- ql/src/test/queries/clientpositive/schq_materialized.q +++ ql/src/test/queries/clientpositive/schq_materialized.q @@ -68,7 +68,7 @@ alter scheduled query d execute; -!sleep 10; +!sleep 30; -- the scheduled execution will fail - because of missing TXN; but overall it works.. select state,error_message from sys.scheduled_executions;