Pass the internal query executor along when "with" is called, as an optimization.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
index b7a732e..df61ecf 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
@@ -249,7 +249,7 @@ class JDBCStorage<S extends Storable> extends StandardQueryFactory<S>
     }

 

     protected StandardQuery<S> createQuery(FilterValues<S> values, OrderingList<S> ordering) {

-        return new JDBCQuery(values, ordering);

+        return new JDBCQuery(values, ordering, null);

     }

 

     public S instantiate(ResultSet rs) throws SQLException {

@@ -611,8 +611,8 @@ class JDBCStorage<S extends Storable> extends StandardQueryFactory<S>
     }

 

     private class JDBCQuery extends StandardQuery<S> {

-        JDBCQuery(FilterValues<S> values, OrderingList<S> ordering) {

-            super(values, ordering);

+        JDBCQuery(FilterValues<S> values, OrderingList<S> ordering, QueryExecutor<S> executor) {

+            super(values, ordering, executor);

         }

 

         @Override

@@ -642,8 +642,11 @@ class JDBCStorage<S extends Storable> extends StandardQueryFactory<S>
             return JDBCStorage.this.mExecutorFactory;

         }

 

-        protected StandardQuery<S> newInstance(FilterValues<S> values, OrderingList<S> ordering) {

-            return new JDBCQuery(values, ordering);

+        protected StandardQuery<S> newInstance(FilterValues<S> values,

+                                               OrderingList<S> ordering,

+                                               QueryExecutor<S> executor)

+        {

+            return new JDBCQuery(values, ordering, executor);

         }

     }