-
Notifications
You must be signed in to change notification settings - Fork 28.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-22825][SQL] Fix incorrect results of Casting Array to String
## What changes were proposed in this pull request? This pr fixed the issue when casting arrays into strings; ``` scala> val df = spark.range(10).select('id.cast("integer")).agg(collect_list('id).as('ids)) scala> df.write.saveAsTable("t") scala> sql("SELECT cast(ids as String) FROM t").show(false) +------------------------------------------------------------------+ |ids | +------------------------------------------------------------------+ |org.apache.spark.sql.catalyst.expressions.UnsafeArrayData8bc285df| +------------------------------------------------------------------+ ``` This pr modified the result into; ``` +------------------------------+ |ids | +------------------------------+ |[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]| +------------------------------+ ``` ## How was this patch tested? Added tests in `CastSuite` and `SQLQuerySuite`. Author: Takeshi Yamamuro <[email protected]> Closes #20024 from maropu/SPARK-22825. (cherry picked from commit 52fc5c1) Signed-off-by: Wenchen Fan <[email protected]>
- Loading branch information
Showing
4 changed files
with
171 additions
and
2 deletions.
There are no files selected for viewing
78 changes: 78 additions & 0 deletions
78
...st/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UTF8StringBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* 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.unsafe.Platform; | ||
import org.apache.spark.unsafe.array.ByteArrayMethods; | ||
import org.apache.spark.unsafe.types.UTF8String; | ||
|
||
/** | ||
* A helper class to write {@link UTF8String}s to an internal buffer and build the concatenated | ||
* {@link UTF8String} at the end. | ||
*/ | ||
public class UTF8StringBuilder { | ||
|
||
private static final int ARRAY_MAX = ByteArrayMethods.MAX_ROUNDED_ARRAY_LENGTH; | ||
|
||
private byte[] buffer; | ||
private int cursor = Platform.BYTE_ARRAY_OFFSET; | ||
|
||
public UTF8StringBuilder() { | ||
// Since initial buffer size is 16 in `StringBuilder`, we set the same size here | ||
this.buffer = new byte[16]; | ||
} | ||
|
||
// Grows the buffer by at least `neededSize` | ||
private void grow(int neededSize) { | ||
if (neededSize > ARRAY_MAX - totalSize()) { | ||
throw new UnsupportedOperationException( | ||
"Cannot grow internal buffer by size " + neededSize + " because the size after growing " + | ||
"exceeds size limitation " + ARRAY_MAX); | ||
} | ||
final int length = totalSize() + neededSize; | ||
if (buffer.length < length) { | ||
int newLength = length < ARRAY_MAX / 2 ? length * 2 : ARRAY_MAX; | ||
final byte[] tmp = new byte[newLength]; | ||
Platform.copyMemory( | ||
buffer, | ||
Platform.BYTE_ARRAY_OFFSET, | ||
tmp, | ||
Platform.BYTE_ARRAY_OFFSET, | ||
totalSize()); | ||
buffer = tmp; | ||
} | ||
} | ||
|
||
private int totalSize() { | ||
return cursor - Platform.BYTE_ARRAY_OFFSET; | ||
} | ||
|
||
public void append(UTF8String value) { | ||
grow(value.numBytes()); | ||
value.writeToMemory(buffer, cursor); | ||
cursor += value.numBytes(); | ||
} | ||
|
||
public void append(String value) { | ||
append(UTF8String.fromString(value)); | ||
} | ||
|
||
public UTF8String build() { | ||
return UTF8String.fromBytes(buffer, 0, totalSize()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters