Skip to content

[SPARK-50092][SQL] Fix PostgreSQL connector behaviour for multidimensional arrays #48625

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

Closed
PetarVasiljevic-DB wants to merge 9 commits into from
Closed

[SPARK-50092][SQL] Fix PostgreSQL connector behaviour for multidimensional arrays #48625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0ed91f
initial commit
PetarVasiljevic-DB Oct 23, 2024
63e756d
initial commit
PetarVasiljevic-DB Oct 23, 2024
600600b
fix perf
PetarVasiljevic-DB Oct 24, 2024
86d0201
change flag name
PetarVasiljevic-DB Oct 24, 2024
7ff3d67
remove config
PetarVasiljevic-DB Oct 25, 2024
e699710
revert
PetarVasiljevic-DB Oct 28, 2024
55dd1f6
add fallback
PetarVasiljevic-DB Oct 29, 2024
f008d41
refactor
PetarVasiljevic-DB Oct 30, 2024
5475b9f
refactor
PetarVasiljevic-DB Nov 12, 2024
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
76 changes: 64 additions & 12 deletions ...egration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,46 @@ class PostgresIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCT
connection.prepareStatement("CREATE TABLE array_timestamptz (col timestamptz[])")
.executeUpdate()

connection.prepareStatement("INSERT INTO array_int VALUES (array[array[10]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_bigint VALUES (array[array[10]])")
connection.prepareStatement("INSERT INTO array_int VALUES (array[10]), (array[array[10]])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_smallint VALUES (array[array[10]])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_boolean VALUES (array[array[true]])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_float VALUES (array[array[10.5]])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_double VALUES (array[array[10.1]])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_timestamp VALUES (" +
"array[array['2022-01-01 09:15'::timestamp]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_bigint VALUES (array[10]), " +
"(array[array[10]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_smallint VALUES (array[10]), " +
"(array[array[10]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_boolean VALUES (array[true]), " +
"(array[array[true]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_float VALUES (array[10.5]), " +
"(array[array[10.5]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_double VALUES (array[10.1]), " +
"(array[array[10.1]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_timestamp VALUES " +
"(array['2022-01-01 09:15'::timestamp]), " +
"(array[array['2022-01-01 09:15'::timestamp]])").executeUpdate()
connection.prepareStatement("INSERT INTO array_timestamptz VALUES " +
"(array['2022-01-01 09:15'::timestamptz]), " +
"(array[array['2022-01-01 09:15'::timestamptz]])").executeUpdate()
connection.prepareStatement(
"CREATE TABLE datetime (name VARCHAR(32), date1 DATE, time1 TIMESTAMP)")
.executeUpdate()

connection.prepareStatement("CREATE TABLE array_of_int (col int[])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_of_int " +
"VALUES (array[1])").executeUpdate()
connection.prepareStatement("CREATE TABLE ctas_array_of_int " +
"AS SELECT * FROM array_of_int").executeUpdate()

connection.prepareStatement("CREATE TABLE array_of_array_of_int (col int[][])")
.executeUpdate()
connection.prepareStatement("INSERT INTO array_of_array_of_int " +
"VALUES (array[array[1],array[2]])").executeUpdate()
connection.prepareStatement("CREATE TABLE ctas_array_of_array_of_int " +
"AS SELECT * FROM array_of_array_of_int").executeUpdate()

connection.prepareStatement("CREATE TABLE unsupported_array_of_array_of_int (col int[][])")
.executeUpdate()
connection.prepareStatement("INSERT INTO unsupported_array_of_array_of_int " +
"VALUES (array[array[1],array[2]]), (array[3])").executeUpdate()
}

test("Test multi-dimensional column types") {
Expand Down Expand Up @@ -302,4 +324,34 @@ class PostgresIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCT
assert(rows10(0).getString(0) === "amy")
assert(rows10(1).getString(0) === "alex")
}

test("Test reading 2d array from table created via CTAS command - positive test") {
val dfNoCTASTable = sql(s"SELECT * FROM $catalogName.array_of_int")
val dfWithCTASTable = sql(s"SELECT * FROM $catalogName.ctas_array_of_int")

checkAnswer(dfWithCTASTable, dfNoCTASTable.collect())
}

test("Test reading 2d array from table created via CTAS command - negative test") {
val dfNoCTASTable = sql(s"SELECT * FROM $catalogName.array_of_int")

checkError(
exception = intercept[org.apache.spark.SparkSQLException] {
// This should fail as only 1D CTAS tables are supported
sql(s"SELECT * FROM $catalogName.ctas_array_of_array_of_int").collect()
},
condition = "COLUMN_ARRAY_ELEMENT_TYPE_MISMATCH",
parameters = Map("pos" -> "0", "type" -> "\"ARRAY<INT>\"")
)
}

test("Test reading multiple dimension array from table created via CTAS command") {
checkError(
exception = intercept[org.apache.spark.SparkSQLException] {
sql(s"SELECT * FROM $catalogName.unsupported_array_of_array_of_int").collect()
},
condition = "COLUMN_ARRAY_ELEMENT_TYPE_MISMATCH",
parameters = Map("pos" -> "0", "type" -> "\"ARRAY<ARRAY<INT>>\"")
)
}
}
4 changes: 3 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,9 @@ private case class PostgresDialect()
try {
Using.resource(conn.createStatement()) { stmt =>
Using.resource(stmt.executeQuery(query)) { rs =>
if (rs.next()) metadata.putLong("arrayDimension", rs.getLong(1))
// Metadata can return 0 for CTAS tables. For such tables, we are always reading
// them as 1D array
if (rs.next()) metadata.putLong("arrayDimension", Math.max(1L, rs.getLong(1)))
}
}
} catch {
Expand Down