Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added test suite for IntegralDelta (IntDelta & LongDelta)
  • Loading branch information
liancheng committed Apr 5, 2014
commit d7c0e8fe18eb5b759200dca86ec8c6fe98462d23
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ private[sql] sealed abstract class IntegralDelta[I <: IntegralType] extends Comp
*/
protected def byteSizedDelta(x: I#JvmType, y: I#JvmType): (Boolean, Byte)

/**
* Simply computes `x + delta`
*/
protected def addDelta(x: I#JvmType, delta: Byte): I#JvmType

class Encoder extends compression.Encoder[I] {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.spark.sql.columnar.compression

import org.scalatest.FunSuite

import org.apache.spark.sql.catalyst.expressions.GenericMutableRow
import org.apache.spark.sql.catalyst.types.IntegralType
import org.apache.spark.sql.columnar._

class IntegralDeltaSuite extends FunSuite {
testIntegralDelta(new IntColumnStats, INT, IntDelta)
testIntegralDelta(new LongColumnStats, LONG, LongDelta)

def testIntegralDelta[I <: IntegralType](
columnStats: NativeColumnStats[I],
columnType: NativeColumnType[I],
scheme: IntegralDelta[I]) {

def skeleton(input: Seq[I#JvmType]) {
// -------------
// Tests encoder
// -------------

val builder = TestCompressibleColumnBuilder(columnStats, columnType, scheme)
val deltas = if (input.isEmpty) {
Seq.empty[Long]
} else {
(input.tail, input.init).zipped.map {
case (x: Int, y: Int) => (x - y).toLong
case (x: Long, y: Long) => x - y
}
}

input.map { value =>
val row = new GenericMutableRow(1)
columnType.setField(row, 0, value)
builder.appendFrom(row, 0)
}

val buffer = builder.build()
// Column type ID + null count + null positions
val headerSize = CompressionScheme.columnHeaderSize(buffer)

// Compression scheme ID + compressed contents
val compressedSize = 4 + (if (deltas.isEmpty) {
0
} else {
val oneBoolean = columnType.defaultSize
1 + oneBoolean + deltas.map {
d => if (math.abs(d) < Byte.MaxValue) 1 else 1 + oneBoolean
}.sum
})

// 4 extra bytes for compression scheme type ID
expectResult(headerSize + compressedSize, "Wrong buffer capacity")(buffer.capacity)

buffer.position(headerSize)
expectResult(scheme.typeId, "Wrong compression scheme ID")(buffer.getInt())

if (input.nonEmpty) {
expectResult(Byte.MinValue, "The first byte should be an escaping mark")(buffer.get())
expectResult(input.head, "The first value is wrong")(columnType.extract(buffer))

(input.tail, deltas).zipped.foreach { (value, delta) =>
if (delta < Byte.MaxValue) {
expectResult(delta, "Wrong delta")(buffer.get())
} else {
expectResult(Byte.MinValue, "Expecting escaping mark here")(buffer.get())
expectResult(value, "Wrong value")(columnType.extract(buffer))
}
}
}

// -------------
// Tests decoder
// -------------

// Rewinds, skips column header and 4 more bytes for compression scheme ID
buffer.rewind().position(headerSize + 4)

val decoder = scheme.decoder(buffer, columnType)
input.foreach(expectResult(_, "Wrong decoded value")(decoder.next()))
assert(!decoder.hasNext)
}

test(s"$scheme: empty column") {
skeleton(Seq.empty)
}

test(s"$scheme: simple case") {
val input = columnType match {
case INT => Seq(1: Int, 2: Int, 130: Int)
case LONG => Seq(1: Long, 2: Long, 130: Long)
}

skeleton(input.map(_.asInstanceOf[I#JvmType]))
}
}
}