Skip to content

Commit 6f99a97

Browse files
author
Davies Liu
committed
fix catalyst test
1 parent defe931 commit 6f99a97

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

sql/catalyst/src/main/java/org/apache/spark/sql/BaseMutableRow.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@
1919

2020
import org.apache.spark.sql.catalyst.InternalRow;
2121
import org.apache.spark.sql.catalyst.expressions.MutableRow;
22+
import org.apache.spark.unsafe.types.UTF8String;
2223

2324
public abstract class BaseMutableRow extends InternalRow implements MutableRow {
2425

25-
@Override
26-
public void update(int ordinal, Object value) {
27-
throw new UnsupportedOperationException();
28-
}
29-
3026
@Override
3127
public void setInt(int ordinal, int value) {
3228
throw new UnsupportedOperationException();
@@ -64,6 +60,6 @@ public void setFloat(int ordinal, float value) {
6460

6561
@Override
6662
public void setString(int ordinal, String value) {
67-
throw new UnsupportedOperationException();
63+
update(ordinal, UTF8String.fromString(value));
6864
}
6965
}

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/InternalRow.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ import org.apache.spark.unsafe.types.UTF8String
2727
*/
2828
abstract class InternalRow extends Row {
2929

30+
// default implementation for codegen (for a Row which does not have those types)
31+
override def getBoolean(i: Int): Boolean = throw new UnsupportedOperationException
32+
override def getByte(i: Int): Byte = throw new UnsupportedOperationException
33+
override def getShort(i: Int): Short = throw new UnsupportedOperationException
34+
override def getInt(i: Int): Int = throw new UnsupportedOperationException
35+
override def getLong(i: Int): Long = throw new UnsupportedOperationException
36+
override def getFloat(i: Int): Float = throw new UnsupportedOperationException
37+
override def getDouble(i: Int): Double = throw new UnsupportedOperationException
38+
3039
// This is only use for test
3140
override def getString(i: Int): String = getAs[UTF8String](i).toString
3241

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateProjection.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ object GenerateProjection extends CodeGenerator[Seq[Expression], Projection] {
173173
$initColumns
174174
}
175175

176-
public int size() { return ${expressions.length};}
176+
public int length() { return ${expressions.length};}
177177
protected boolean[] nullBits = new boolean[${expressions.length}];
178178
public void setNullAt(int i) { nullBits[i] = true; }
179179
public boolean isNullAt(int i) { return nullBits[i]; }

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystTypeConvertersSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class CatalystTypeConvertersSuite extends SparkFunSuite {
4040
val convertToScala = CatalystTypeConverters.createToScalaConverter(schema)
4141

4242
val scalaRow = Row.fromSeq(Seq.fill(simpleTypes.length)(null))
43-
println(s"${scalaRow.getClass} ${convertToScala(convertToCatalyst(scalaRow)).getClass} ")
4443
assert(convertToScala(convertToCatalyst(scalaRow)) === scalaRow)
4544
}
4645

0 commit comments

Comments
 (0)