You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by de...@apache.org on 2016/02/03 13:10:52 UTC
[32/51] [abbrv] lens git commit: LENS-924 : Remove edits to
LensSession's default config
LENS-924 : Remove edits to LensSession's default config
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/5d2dccb0
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/5d2dccb0
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/5d2dccb0
Branch: refs/heads/current-release-line
Commit: 5d2dccb00606844a877b7ff379e80ae0a3b965a9
Parents: edcdd96
Author: Puneet Gupta <pu...@gmail.com>
Authored: Tue Jan 19 10:14:31 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Jan 19 10:14:31 2016 +0530
----------------------------------------------------------------------
.../apache/lens/server/session/LensSessionImpl.java | 5 +++--
.../apache/lens/server/query/TestQueryService.java | 16 ++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/5d2dccb0/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java b/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
index cc62d92..895a819 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
@@ -66,7 +66,7 @@ public class LensSessionImpl extends HiveSessionImpl {
private long sessionTimeout;
/** The conf. */
- private Configuration conf = new Configuration(createDefaultConf());
+ private Configuration conf = createDefaultConf();
/**
* Keep track of DB static resources which failed to be added to this session
@@ -123,7 +123,8 @@ public class LensSessionImpl extends HiveSessionImpl {
}
}
}
- return sessionDefaultConfig;
+ //Not exposing sessionDefaultConfig directly to insulate it form modifications
+ return new Configuration(sessionDefaultConfig);
}
/** The default hive session conf. */
http://git-wip-us.apache.org/repos/asf/lens/blob/5d2dccb0/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index c5d75de..494bce5 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -1254,6 +1254,22 @@ public class TestQueryService extends LensJerseyTest {
// server configuration should not set
assertNull(dconf.get("lens.server.persist.location"));
}
+
+ checkDefaultConfigConsistency();
+ }
+
+ public void checkDefaultConfigConsistency() {
+ Configuration conf = LensSessionImpl.createDefaultConf();
+ assertNotNull(conf.get("lens.query.enable.persistent.resultset"));
+ boolean isDriverPersistent = conf.getBoolean("lens.query.enable.persistent.resultset", false);
+ conf.setBoolean("lens.query.enable.persistent.resultset", isDriverPersistent ? false : true);
+ conf.set("new_random_property", "new_random_property");
+
+ // Get the default conf again and verify its not modified by previous operations
+ conf = LensSessionImpl.createDefaultConf();
+ boolean isDriverPersistentNow = conf.getBoolean("lens.query.enable.persistent.resultset", false);
+ assertEquals(isDriverPersistentNow, isDriverPersistent);
+ assertNull(conf.get("new_random_property"));
}
/**