Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ public void write(int ordinal, Decimal input, int precision, int scale) {
// grow the global buffer before writing data.
holder.grow(16);

// always zero-out the 16-byte buffer
Platform.putLong(getBuffer(), cursor(), 0L);
Platform.putLong(getBuffer(), cursor() + 8, 0L);

// Make sure Decimal object has the same scale as DecimalType.
// Note that we may pass in null Decimal object to set null for it.
if (input == null || !input.changePrecision(precision, scale)) {
// zero-out the bytes
Platform.putLong(getBuffer(), cursor(), 0L);
Platform.putLong(getBuffer(), cursor() + 8, 0L);

BitSetMethods.set(getBuffer(), startingOffset, ordinal);
// keep the offset for future update
setOffsetAndSize(ordinal, 0);
Expand All @@ -200,8 +200,6 @@ public void write(int ordinal, Decimal input, int precision, int scale) {
final int numBytes = bytes.length;
assert numBytes <= 16;

zeroOutPaddingBytes(numBytes);

// Write the bytes to the variable length portion.
Platform.copyMemory(
bytes, Platform.BYTE_ARRAY_OFFSET, getBuffer(), cursor(), numBytes);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* 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.catalyst.expressions.codegen

import org.apache.spark.SparkFunSuite
import org.apache.spark.sql.types.Decimal

class UnsafeRowWriterSuite extends SparkFunSuite {

def checkDecimalSizeInBytes(decimal: Decimal, numBytes: Int): Unit = {
assert(decimal.toJavaBigDecimal.unscaledValue().toByteArray.length == numBytes)
}

test("SPARK-25538: zero-out all bits for decimals") {
val decimal1 = Decimal(0.431)
decimal1.changePrecision(38, 18)
checkDecimalSizeInBytes(decimal1, 8)

val decimal2 = Decimal(123456789.1232456789)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we verify the number of bytes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, I added a check for that.

decimal2.changePrecision(38, 18)
checkDecimalSizeInBytes(decimal2, 11)
// On an UnsafeRowWriter we write decimal2 first and then decimal1
val unsafeRowWriter1 = new UnsafeRowWriter(1)
unsafeRowWriter1.resetRowWriter()
unsafeRowWriter1.write(0, decimal2, decimal2.precision, decimal2.scale)
unsafeRowWriter1.reset()
unsafeRowWriter1.write(0, decimal1, decimal1.precision, decimal1.scale)
val res1 = unsafeRowWriter1.getRow
// On a second UnsafeRowWriter we write directly decimal1
val unsafeRowWriter2 = new UnsafeRowWriter(1)
unsafeRowWriter2.resetRowWriter()
unsafeRowWriter2.write(0, decimal1, decimal1.precision, decimal1.scale)
val res2 = unsafeRowWriter2.getRow
// The two rows should be the equal
assert(res1 == res2)
}

}