Repository: spark Updated Branches: refs/heads/master fbca6b6ce -> a61aa669a
[Minor] Fix scala doc Minor fix for an obvious scala doc error. Author: Liang-Chi Hsieh <[email protected]> Closes #3751 from viirya/fix_scaladoc and squashes the following commits: 03fddaa [Liang-Chi Hsieh] Fix scala doc. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a61aa669 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a61aa669 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a61aa669 Branch: refs/heads/master Commit: a61aa669af474b4b82976541cf3a6d2787014a0b Parents: fbca6b6 Author: Liang-Chi Hsieh <[email protected]> Authored: Mon Dec 22 14:13:31 2014 -0800 Committer: Andrew Or <[email protected]> Committed: Mon Dec 22 14:13:31 2014 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/sql/hive/HiveInspectors.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a61aa669/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala index e114747..a156d6f 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveInspectors.scala @@ -105,9 +105,9 @@ import scala.collection.JavaConversions._ {{{ public interface PrimitiveObjectInspector { // Java Primitives (java.lang.Integer, java.lang.String etc.) - Object getPrimitiveWritableObject(Object o); + Object getPrimitiveJavaObject(Object o); // Writables (hadoop.io.IntWritable, hadoop.io.Text etc.) - Object getPrimitiveJavaObject(Object o); + Object getPrimitiveWritableObject(Object o); // ObjectInspector only inspect the `writable` always return true, we need to check it // before invoking the methods above. boolean preferWritable(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
