Added code to extract the table name while deserializing prepare responses.

Removed unneeded call to QueryRequest.setTableName().
Updated QueryRequest to get table name from prepared statement.

Author: connelly38

driver/src/main/java/oracle/nosql/driver/http/Client.java

@@ -58,6 +58,7 @@
 import oracle.nosql.driver.ops.GetTableRequest;
 import oracle.nosql.driver.ops.QueryRequest;
 import oracle.nosql.driver.ops.QueryResult;
+import oracle.nosql.driver.ops.PreparedStatement;
 import oracle.nosql.driver.ops.Request;
 import oracle.nosql.driver.ops.Result;
 import oracle.nosql.driver.ops.TableLimits;
@@ -1124,5 +1125,4 @@ public void enableRateLimiting(boolean enable) {
             }
         }
     }
-
 }

driver/src/main/java/oracle/nosql/driver/ops/PreparedStatement.java

@@ -81,6 +81,19 @@ public class PreparedStatement {
      */
     private Map<String, FieldValue> boundVariables;
 
+
+    /*
+     * The namespace returned from a prepared query result, if any.
+     */
+    private String namespace;
+
+
+    /*
+     * The table name returned from a prepared query result, if any.
+     */
+    private String tableName;
+
+
     /**
      * @hidden
      * Constructs a PreparedStatement. Construction is hidden to eliminate
@@ -96,6 +109,8 @@ public class PreparedStatement {
      * @param numIterators num iterators in plan
      * @param numRegisters num registers in the plan
      * @param externalVars external variables for the query
+     * @param namespace namespace, if any, from deserialization
+     * @param tableName table name, if any, from deserialization
      */
     public PreparedStatement(
         String sqlText,
@@ -105,7 +120,9 @@ public PreparedStatement(
         PlanIter driverPlan,
         int numIterators,
         int numRegisters,
-        Map<String, Integer> externalVars) {
+        Map<String, Integer> externalVars,
+        String namespace,
+        String tableName) {
 
         /* 10 is arbitrary. TODO: put magic number in it for validation? */
         if (proxyStatement == null || proxyStatement.length < 10) {
@@ -121,6 +138,8 @@ public PreparedStatement(
         this.numIterators = numIterators;
         this.numRegisters = numRegisters;
         this.variables = externalVars;
+        this.namespace = namespace;
+        this.tableName = tableName;
     }
 
     /**
@@ -139,7 +158,9 @@ public PreparedStatement copyStatement() {
                                      driverQueryPlan,
                                      numIterators,
                                      numRegisters,
-                                     variables);
+                                     variables,
+                                     namespace,
+                                     tableName);
     }
 
     /**
@@ -341,4 +362,20 @@ public synchronized PreparedStatement setTopologyInfo(TopologyInfo ti) {
     public TopologyInfo topologyInfo() {
         return topologyInfo;
     }
+
+    /**
+     * @hidden
+     * @return namespace from prepared statement, if any
+     */
+    public String getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * @hidden
+     * @return table name from prepared statement, if any
+     */
+    public String getTableName() {
+        return tableName;
+    }
 }

driver/src/main/java/oracle/nosql/driver/ops/QueryRequest.java

@@ -642,19 +642,6 @@ public int getTimeout() {
         return super.getTimeoutInternal();
     }
 
-    /**
-     * Sets the table name for a query operation.
-     * This is used by rate limiting logic to manage internal rate limiters.
-     *
-     * @param tableName the name (or OCID) of the table
-     *
-     * @return this
-     */
-    public QueryRequest setTableName(String tableName) {
-        super.setTableNameInternal(tableName);
-        return this;
-    }
-
     /**
      * @hidden
      */
@@ -697,4 +684,15 @@ public void validate() {
                 "Either statement or prepared statement should be set");
         }
     }
+
+    /**
+     * @hidden
+     */
+    @Override
+    public String getTableName() {
+        if (preparedStatement == null) {
+            return null;
+        }
+        return preparedStatement.getTableName();
+    }
 }

driver/src/main/java/oracle/nosql/driver/ops/serde/PrepareRequestSerializer.java

@@ -70,6 +70,23 @@ static PreparedStatement deserializeInternal(
         ByteInputStream in,
         short serialVersion)  throws IOException {
 
+        /*
+         * Extract the table name and namespace from the prepared query.
+         * This dips into the portion of the prepared query that is
+         * normally opaque
+         *
+         * int (4 byte)
+         * byte[] (32 bytes -- hash)
+         * byte (number of tables)
+         * namespace (string)
+         * tablename (string)
+         */
+        int savedOffset = in.getOffset();
+        in.skip(37); // 4 + 32 + 1
+        String namespace = readString(in);
+        String tableName = readString(in);
+        in.setOffset(savedOffset);
+
         byte[] proxyStatement = readByteArrayWithInt(in);
 
         int numIterators = 0;
@@ -110,6 +127,8 @@ static PreparedStatement deserializeInternal(
                                      driverPlan,
                                      numIterators,
                                      numRegisters,
-                                     externalVars);
+                                     externalVars,
+                                     namespace,
+                                     tableName);
     }
 }