aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorSun Rui <rui.sun@intel.com>2015-10-26 20:58:18 -0700
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2015-10-26 20:58:18 -0700
commitdc3220ce11c7513b1452c82ee82cb86e908bcc2d (patch)
treebfdf594afdf3731919cccd131363973c50df98cd /core
parent82464fb2e02ca4e4d425017815090497b79dc93f (diff)
downloadspark-dc3220ce11c7513b1452c82ee82cb86e908bcc2d.tar.gz
spark-dc3220ce11c7513b1452c82ee82cb86e908bcc2d.tar.bz2
spark-dc3220ce11c7513b1452c82ee82cb86e908bcc2d.zip
[SPARK-11209][SPARKR] Add window functions into SparkR [step 1].
Author: Sun Rui <rui.sun@intel.com> Closes #9193 from sun-rui/SPARK-11209.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala b/core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala
index 2a792d8199..0095548c46 100644
--- a/core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala
+++ b/core/src/main/scala/org/apache/spark/api/r/RBackendHandler.scala
@@ -224,7 +224,8 @@ private[r] class RBackendHandler(server: RBackend)
case _ => parameterType
}
}
- if (!parameterWrapperType.isInstance(args(i))) {
+ if ((parameterType.isPrimitive || args(i) != null) &&
+ !parameterWrapperType.isInstance(args(i))) {
argMatched = false
}
}