From 0b1f9529f3cd4f19a510e3ad6f27d965a18eaef6 Mon Sep 17 00:00:00 2001 From: Kent Yao Date: Thu, 4 Jul 2024 19:09:54 +0800 Subject: [PATCH 1/2] [SPARK-48808][SQL] Fix NPE when connecting thriftserver through Hive 1.2.1 and 0 column outputs --- .../org/apache/spark/sql/hive/thriftserver/RowSetUtils.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/RowSetUtils.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/RowSetUtils.scala index 66319fff2468a..2cc7745018164 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/RowSetUtils.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/RowSetUtils.scala @@ -76,11 +76,12 @@ object RowSetUtils { val tRowSet = new TRowSet(startRowOffSet, new java.util.ArrayList[TRow](rowSize)) var i = 0 val columnSize = schema.length + val columns = new java.util.ArrayList[TColumn](columnSize) while (i < columnSize) { - val tColumn = toTColumn(rows, i, schema(i), timeFormatters, binaryFormatter) - tRowSet.addToColumns(tColumn) + columns.add(i, toTColumn(rows, i, schema(i), timeFormatters, binaryFormatter)) i += 1 } + tRowSet.setColumns(columns) tRowSet } From ad84042faddf8433bad4748140f22e1a6a1d9778 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Thu, 4 Jul 2024 19:14:56 +0800 Subject: [PATCH 2/2] ci