Remove fetchRequired flag from ReaderBucket

If there are no columns to fetch, then there shouldn't be a `_fetchid`, and therefore no fetch operation happening. So this flag is in a way redundant.
daminichopra · Mar 17, 2020 · dfba29d · dfba29d
1 parent da6375c
commit dfba29d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/sql/src/main/java/io/crate/execution/engine/fetch/FetchBatchAccumulator.java b/sql/src/main/java/io/crate/execution/engine/fetch/FetchBatchAccumulator.java
@@ -200,7 +200,7 @@ private IntObjectHashMap<IntContainer> generateToFetch(IntSet readerIds) {
         IntObjectHashMap<IntContainer> toFetch = new IntObjectHashMap<>(readerIds.size());
         for (IntCursor readerIdCursor : readerIds) {
             ReaderBucket readerBucket = context.readerBucket(readerIdCursor.value);
-            if (readerBucket != null && readerBucket.fetchRequired() && readerBucket.docs.size() > 0) {
+            if (readerBucket != null && readerBucket.docs.size() > 0) {
                 toFetch.put(readerIdCursor.value, readerBucket.docs.keys());
             }
         }

diff --git a/sql/src/main/java/io/crate/execution/engine/fetch/FetchProjectorContext.java b/sql/src/main/java/io/crate/execution/engine/fetch/FetchProjectorContext.java
@@ -59,7 +59,7 @@ public FetchProjectorContext(Map<RelationName, FetchSource> tableToFetchSource,
         this.indexToTable = indexToTable;
     }
 
-
+    @Nullable
     ReaderBucket readerBucket(int readerId) {
         return readerBuckets.get(readerId);
     }
@@ -69,21 +69,13 @@ ReaderBucket require(long fetchId) {
         int docId = FetchId.decodeDocId(fetchId);
         ReaderBucket readerBucket = readerBuckets.get(readerId);
         if (readerBucket == null) {
-            readerBucket = createReaderBucket(readerId);
+            readerBucket = new ReaderBucket();
             readerBuckets.put(readerId, readerBucket);
         }
         readerBucket.require(docId);
         return readerBucket;
     }
 
-    private ReaderBucket createReaderBucket(int readerId) {
-        String index = readerIdToIndex.floorEntry(readerId).getValue();
-        RelationName relationName = indexToTable.get(index);
-        FetchSource fetchSource = tableToFetchSource.get(relationName);
-        assert fetchSource != null : "fetchSource must be available";
-        return new ReaderBucket(!fetchSource.references().isEmpty());
-    }
-
     ReaderBucket getReaderBucket(int readerId) {
         return readerBuckets.get(readerId);
     }

diff --git a/sql/src/main/java/io/crate/execution/engine/fetch/ReaderBucket.java b/sql/src/main/java/io/crate/execution/engine/fetch/ReaderBucket.java
@@ -32,11 +32,9 @@
 
 class ReaderBucket {
 
-    private final boolean fetchRequired;
     final IntObjectHashMap<Object[]> docs = new IntObjectHashMap<>();
 
-    ReaderBucket(boolean fetchRequired) {
-        this.fetchRequired = fetchRequired;
+    ReaderBucket() {
     }
 
     void require(int doc) {
@@ -57,8 +55,4 @@ void fetched(Bucket bucket) {
         }
         assert !rowIterator.hasNext() : "no more rows should exist";
     }
-
-    boolean fetchRequired() {
-        return fetchRequired;
-    }
 }
diff --git a/sql/src/test/java/io/crate/integrationtests/TransportSQLActionTest.java b/sql/src/test/java/io/crate/integrationtests/TransportSQLActionTest.java
@@ -446,7 +446,6 @@ public void testSqlRequestWithNumericGtFilter() throws Exception {
 
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testArraySupport() throws Exception {
         execute("create table t1 (id int primary key, strings array(string), integers array(integer)) with (number_of_replicas=0)");
         ensureYellow();