Move reserveDictionaryIds logic into the parent class.

apache · Aug 17, 2017 · 2769b39 · 2769b39
1 parent d2dda9c
commit 2769b39
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/MutableColumnVector.java
@@ -573,7 +573,17 @@ public void setDictionary(Dictionary dictionary) {
   /**
    * Reserve a integer column for ids of dictionary.
    */
-  public abstract MutableColumnVector reserveDictionaryIds(int capacity);
+  public MutableColumnVector reserveDictionaryIds(int capacity) {
+    MutableColumnVector dictionaryIds = (MutableColumnVector) this.dictionaryIds;
+    if (dictionaryIds == null) {
+      dictionaryIds = reserveNewColumn(capacity, DataTypes.IntegerType);
+      this.dictionaryIds = dictionaryIds;
+    } else {
+      dictionaryIds.reset();
+      dictionaryIds.reserve(capacity);
+    }
+    return dictionaryIds;
+  }
 
   /**
    * Returns the underlying integer column for ids of dictionary.

diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OffHeapColumnVector.java
@@ -492,22 +492,6 @@ public void loadBytes(ColumnVector.Array array) {
     array.byteArrayOffset = 0;
   }
 
-  /**
-   * Reserve a integer column for ids of dictionary.
-   */
-  @Override
-  public OffHeapColumnVector reserveDictionaryIds(int capacity) {
-    OffHeapColumnVector dictionaryIds = (OffHeapColumnVector) this.dictionaryIds;
-    if (dictionaryIds == null) {
-      dictionaryIds = new OffHeapColumnVector(capacity, DataTypes.IntegerType);
-      this.dictionaryIds = dictionaryIds;
-    } else {
-      dictionaryIds.reset();
-      dictionaryIds.reserve(capacity);
-    }
-    return dictionaryIds;
-  }
-
   // Split out the slow path.
   @Override
   protected void reserveInternal(int newCapacity) {

diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/OnHeapColumnVector.java
@@ -461,22 +461,6 @@ public int putByteArray(int rowId, byte[] value, int offset, int length) {
     return result;
   }
 
-  /**
-   * Reserve a integer column for ids of dictionary.
-   */
-  @Override
-  public OnHeapColumnVector reserveDictionaryIds(int capacity) {
-    OnHeapColumnVector dictionaryIds = (OnHeapColumnVector) this.dictionaryIds;
-    if (dictionaryIds == null) {
-      dictionaryIds = new OnHeapColumnVector(capacity, DataTypes.IntegerType);
-      this.dictionaryIds = dictionaryIds;
-    } else {
-      dictionaryIds.reset();
-      dictionaryIds.reserve(capacity);
-    }
-    return dictionaryIds;
-  }
-
   // Spilt this function out since it is the slow path.
   @Override
   protected void reserveInternal(int newCapacity) {