Skip to content

Fix: Fix null handling in CometVector implementations #2643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix: Fix null handling in CometVector implementations #2643

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f8d823
Fix: Return null for null entries in CometPlainVector.getBinary
cfmcgrady Oct 24, 2025
2b5efc1
rebase main
cfmcgrady Oct 24, 2025
b06fb5b
address comment
cfmcgrady Oct 24, 2025
af75384
Align with the APIs documentation of ColumnVector's get methods
cfmcgrady Oct 28, 2025
910501a
fix array_insert
cfmcgrady Oct 30, 2025
c12b5b7
comment
cfmcgrady Oct 30, 2025
3d1b288
add ut
cfmcgrady Oct 30, 2025
557293b
fix rs style
cfmcgrady Oct 30, 2025
aa7287b
fix rs style
cfmcgrady Oct 30, 2025
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
3 changes: 3 additions & 0 deletions common/src/main/java/org/apache/comet/vector/CometPlainVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public UTF8String getUTF8String(int rowId) {

@Override
public byte[] getBinary(int rowId) {
if (isNullAt(rowId)) {
return null;
}
int offset;
int length;
if (valueVector instanceof BaseVariableWidthVector) {
Expand Down
23 changes: 23 additions & 0 deletions spark/src/test/scala/org/apache/comet/CometArrayExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.apache.hadoop.fs.Path
import org.apache.spark.sql.CometTestBase
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
import org.apache.spark.sql.functions._
import org.apache.spark.sql.types.ArrayType

import org.apache.comet.CometSparkSessionExtensions.{isSpark35Plus, isSpark40Plus}
import org.apache.comet.DataTypeSupport.isComplexType
Expand Down Expand Up @@ -777,4 +778,26 @@ class CometArrayExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelp
}
}
}

test("array_reverse 2") {
withTempDir { dir =>
val path = new Path(dir.toURI.toString, "test.parquet")
val filename = path.toString
val random = new Random(42)
withSQLConf(CometConf.COMET_ENABLED.key -> "false") {
val schemaOptions =
SchemaGenOptions(generateArray = true, generateStruct = false, generateMap = false)
val dataOptions = DataGenOptions(allowNull = true, generateNegativeZero = false)
ParquetGenerator.makeParquetFile(random, spark, filename, 100, schemaOptions, dataOptions)
}
withTempView("t1") {
val table = spark.read.parquet(filename)
table.createOrReplaceTempView("t1")
for (field <- table.schema.fields.filter(_.dataType.isInstanceOf[ArrayType])) {
val sql = s"SELECT ${field.name}, reverse(${field.name}) FROM t1 ORDER BY ${field.name}"
checkSparkAnswer(sql)
}
}
}
}
}
Loading