Add logged keyspace getter in Session

Sylvain Lebresne · Sylvain Lebresne · commit 11d53493d670 · 2014-02-18T16:32:34.000+01:00
JAVA-249 #fixes
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -4,9 +4,10 @@ CHANGELOG
 1.0.6:
 ------
 
+- [new] Added Session#prepareAsync calls (JAVA-224)
+- [new] Added Cluster#getLoggedKeyspace (JAVA-249)
 - [improvement] Make most main objects interface to facilitate testing/mocking (JAVA-195)
 - [improvement] Avoid preparing a statement multiple time per host with multiple sessions
-- [improvement] Adds Session#prepareAsync calls (JAVA-224)
 - [bug] Fix potential thread leaks when shutting down Metrics (JAVA-232)
 - [bug] Fix potential NPE in HostConnectionPool (JAVA-231)
 - [bug] Make sure connections are returned to the right pools (JAVA-255)
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Session.java b/driver-core/src/main/java/com/datastax/driver/core/Session.java
@@ -36,6 +36,17 @@
  */
 public interface Session {
 
+    /**
+     * The keyspace to which this Session is currently logged in, if any.
+     * <p>
+     * This correspond to the name passed to {@link Cluster#connect(String)}, or to the
+     * last keyspace logged into through a "USE" CQL query if one was used.
+     *
+     * @return the name of the keyspace to which this Session is currently
+     * logged in, or {@code null} if the session is logged to no keyspace.
+     */
+    public String getLoggedKeyspace();
+
     /**
      * Executes the provided query.
      *
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java b/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java
@@ -67,6 +67,10 @@ class SessionManager implements Session {
         }
     }
 
+    public String getLoggedKeyspace() {
+        return poolsState.keyspace;
+    }
+
     public ResultSet execute(String query) {
         return execute(new SimpleStatement(query));
     }
@@ -299,7 +303,7 @@ void setKeyspace(String keyspace) {
         long timeout = configuration().getSocketOptions().getConnectTimeoutMillis();
         try {
             Future<?> future = executeQuery(new QueryMessage("use " + keyspace, ConsistencyLevel.DEFAULT_CASSANDRA_CL), Query.DEFAULT);
-            // Note: using the connection timeout is perfectly correct, we should probably change that someday
+            // Note: using the connection timeout isn't perfectly correct, we should probably change that someday
             Uninterruptibles.getUninterruptibly(future, timeout, TimeUnit.MILLISECONDS);
         } catch (TimeoutException e) {
             throw new DriverInternalError(String.format("No responses after %d milliseconds while setting current keyspace. This should not happen, unless you have setup a very low connection timeout.", timeout));

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ class SessionManager implements Session {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ public String getLoggedKeyspace() {`
	`71`	`+ return poolsState.keyspace;`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`public ResultSet execute(String query) {`
`71`	`75`	`return execute(new SimpleStatement(query));`
`72`	`76`	`}`
`@@ -299,7 +303,7 @@ void setKeyspace(String keyspace) {`
`299`	`303`	`long timeout = configuration().getSocketOptions().getConnectTimeoutMillis();`
`300`	`304`	`try {`
`301`	`305`	`Future<?> future = executeQuery(new QueryMessage("use " + keyspace, ConsistencyLevel.DEFAULT_CASSANDRA_CL), Query.DEFAULT);`
`302`		`- // Note: using the connection timeout is perfectly correct, we should probably change that someday`
	`306`	`+ // Note: using the connection timeout isn't perfectly correct, we should probably change that someday`
`303`	`307`	`Uninterruptibles.getUninterruptibly(future, timeout, TimeUnit.MILLISECONDS);`
`304`	`308`	`} catch (TimeoutException e) {`
`305`	`309`	`throw new DriverInternalError(String.format("No responses after %d milliseconds while setting current keyspace. This should not happen, unless you have setup a very low connection timeout.", timeout));`