Fixed method visibility and removed dead code

apache · Aug 4, 2014 · 88a042e · 88a042e
1 parent 001f2e5
commit 88a042e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/columnar/NullableColumnBuilder.scala b/sql/core/src/main/scala/org/apache/spark/sql/columnar/NullableColumnBuilder.scala
@@ -79,7 +79,7 @@ private[sql] trait NullableColumnBuilder extends ColumnBuilder {
     buffer
   }
 
-  def buildNonNulls(): ByteBuffer = {
+  protected def buildNonNulls(): ByteBuffer = {
     nulls.limit(nulls.position()).rewind()
     super.build()
   }

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/columnar/compression/CompressionScheme.scala b/sql/core/src/main/scala/org/apache/spark/sql/columnar/compression/CompressionScheme.scala
@@ -67,22 +67,6 @@ private[sql] object CompressionScheme {
       s"Unrecognized compression scheme type ID: $typeId"))
   }
 
-  def copyColumnHeader(from: ByteBuffer, to: ByteBuffer) {
-    // Writes column type ID
-    to.putInt(from.getInt())
-
-    // Writes null count
-    val nullCount = from.getInt()
-    to.putInt(nullCount)
-
-    // Writes null positions
-    var i = 0
-    while (i < nullCount) {
-      to.putInt(from.getInt())
-      i += 1
-    }
-  }
-
   def columnHeaderSize(columnBuffer: ByteBuffer): Int = {
     val header = columnBuffer.duplicate().order(ByteOrder.nativeOrder)
     val nullCount = header.getInt(4)

diff --git a/.../test/scala/org/apache/spark/sql/columnar/compression/TestCompressibleColumnBuilder.scala b/.../test/scala/org/apache/spark/sql/columnar/compression/TestCompressibleColumnBuilder.scala
@@ -42,4 +42,3 @@ object TestCompressibleColumnBuilder {
     builder
   }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,3 @@ object TestCompressibleColumnBuilder {
		builder
		}
		}