LENS-1458 : RESULT_SET_PARENT_DIR set at driver level getting overwritten for queued queries after server restart
Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/cb92ec5c Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/cb92ec5c Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/cb92ec5c Branch: refs/heads/current-release-line Commit: cb92ec5cdafdee653465c7b6038850992123136b Parents: 05c364e Author: Sushil Mohanty <sushil.k.moha...@gmail.com> Authored: Mon Aug 7 18:38:15 2017 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Mon Aug 21 13:00:55 2017 +0530 ---------------------------------------------------------------------- .../apache/lens/server/api/query/DriverSelectorQueryContext.java | 2 +- .../src/test/java/org/apache/lens/server/TestServerRestart.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/cb92ec5c/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java index 41e533e..9cec42a 100644 --- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java +++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java @@ -254,7 +254,7 @@ public class DriverSelectorQueryContext { } public void setDriverConf(LensDriver driver, Configuration conf) { - driverQueryContextMap.get(driver).setDriverSpecificConf(conf); + driverQueryContextMap.get(driver).setDriverSpecificConf(mergeConf(driver, conf)); } public void setDriverCost(LensDriver driver, QueryCost cost) { http://git-wip-us.apache.org/repos/asf/lens/blob/cb92ec5c/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java index 20aa8cb..8b7728e 100644 --- a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java +++ b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java @@ -39,6 +39,7 @@ import org.apache.lens.api.APIResult.Status; import org.apache.lens.api.query.*; import org.apache.lens.api.result.LensAPIResult; import org.apache.lens.driver.hive.TestRemoteHiveDriver; +import org.apache.lens.server.api.LensConfConstants; import org.apache.lens.server.api.error.LensException; import org.apache.lens.server.api.query.QueryContext; import org.apache.lens.server.api.query.QueryExecutionService; @@ -245,6 +246,7 @@ public class TestServerRestart extends LensAllApplicationJerseyTest { assertEquals(lensQueryConf.getProperty(KEY_POST_SELECT), VALUE_POST_SELECT); if (afterRestart) { + assertEquals(driverConf.get(LensConfConstants.RESULT_SET_PARENT_DIR), "target/hive-lens-results"); //This will be unavailable since if was not updated in LensConf by MockDriverQueryHook assertNull(driverConf.get(UNSAVED_KEY_POST_SELECT)); } else {
