You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/10/10 06:42:24 UTC
[1/4] git commit: add Function3 and WrappedFunction3
Updated Branches:
refs/heads/branch-0.8 dfc62e294 -> 64fae16ec
add Function3 and WrappedFunction3
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a7d0f2ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a7d0f2ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a7d0f2ff
Branch: refs/heads/branch-0.8
Commit: a7d0f2ff14ed7608cba5a80a84e17b97a965598d
Parents: f930dd4
Author: Xi Liu <xi...@conviva.com>
Authored: Wed Oct 9 12:26:10 2013 -0700
Committer: Xi Liu <xi...@conviva.com>
Committed: Wed Oct 9 12:26:10 2013 -0700
----------------------------------------------------------------------
.../spark/api/java/function/Function3.java | 38 ++++++++++++++++++++
.../api/java/function/WrappedFunction3.scala | 32 +++++++++++++++++
2 files changed, 70 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a7d0f2ff/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function3.java b/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
new file mode 100644
index 0000000..6c1ce4c
--- /dev/null
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.api.java.function;
+
+import scala.reflect.ClassManifest;
+import scala.reflect.ClassManifest$;
+import scala.runtime.AbstractFunction3;
+
+import java.io.Serializable;
+
+/**
+ * A three-argument function that takes arguments of type T1, T2, and T3 and returns an R.
+ */
+public abstract class Function3<T1, T2, T3, R> extends WrappedFunction3<T1, T2, T3, R>
+ implements Serializable {
+
+ public abstract R call(T1 t1, T2 t2, T3 t3) throws Exception;
+
+ public ClassManifest<R> returnType() {
+ return (ClassManifest<R>) ClassManifest$.MODULE$.fromClass(Object.class);
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a7d0f2ff/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction3.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction3.scala b/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction3.scala
new file mode 100644
index 0000000..f8c2b6c
--- /dev/null
+++ b/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction3.scala
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.api.java.function
+
+import scala.runtime.AbstractFunction3
+
+/**
+ * Subclass of Function3 for ease of calling from Java. The main thing it does is re-expose the
+ * apply() method as call() and declare that it can throw Exception (since AbstractFunction3.apply
+ * isn't marked to allow that).
+ */
+private[spark] abstract class WrappedFunction3[T1, T2, T3, R] extends AbstractFunction3[T1, T2, T3, R] {
+ @throws(classOf[Exception])
+ def call(t1: T1, t2: T2, t3: T3): R
+
+ final def apply(t1: T1, t2: T2, t3: T3): R = call(t1, t2, t3)
+}
[2/4] git commit: fix formating
Posted by ma...@apache.org.
fix formating
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/987c6139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/987c6139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/987c6139
Branch: refs/heads/branch-0.8
Commit: 987c613999e18c6ed27eff1402e3769521907788
Parents: a7d0f2f
Author: Xi Liu <xi...@conviva.com>
Authored: Wed Oct 9 13:21:42 2013 -0700
Committer: Xi Liu <xi...@conviva.com>
Committed: Wed Oct 9 13:21:42 2013 -0700
----------------------------------------------------------------------
.../org/apache/spark/api/java/function/Function3.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/987c6139/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function3.java b/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
index 6c1ce4c..7d822d1 100644
--- a/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function3.java
@@ -27,12 +27,12 @@ import java.io.Serializable;
* A three-argument function that takes arguments of type T1, T2, and T3 and returns an R.
*/
public abstract class Function3<T1, T2, T3, R> extends WrappedFunction3<T1, T2, T3, R>
- implements Serializable {
+ implements Serializable {
- public abstract R call(T1 t1, T2 t2, T3 t3) throws Exception;
+ public abstract R call(T1 t1, T2 t2, T3 t3) throws Exception;
- public ClassManifest<R> returnType() {
- return (ClassManifest<R>) ClassManifest$.MODULE$.fromClass(Object.class);
- }
+ public ClassManifest<R> returnType() {
+ return (ClassManifest<R>) ClassManifest$.MODULE$.fromClass(Object.class);
+ }
}
[4/4] git commit: Merge pull request #47 from xiliu82/branch-0.8
Posted by ma...@apache.org.
Merge pull request #47 from xiliu82/branch-0.8
add Function3 and WrappedFunction3
I need these two to add more API to spark streaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/64fae16e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/64fae16e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/64fae16e
Branch: refs/heads/branch-0.8
Commit: 64fae16ec4cfcee6865c8b16905e14318e23d399
Parents: dfc62e2 de291c6
Author: Matei Zaharia <ma...@eecs.berkeley.edu>
Authored: Wed Oct 9 21:42:18 2013 -0700
Committer: Matei Zaharia <ma...@eecs.berkeley.edu>
Committed: Wed Oct 9 21:42:18 2013 -0700
----------------------------------------------------------------------
.../spark/api/java/function/Function3.java | 38 ++++++++++++++++++++
.../spark/api/java/function/Function4.java | 38 ++++++++++++++++++++
.../api/java/function/WrappedFunction3.scala | 32 +++++++++++++++++
.../api/java/function/WrappedFunction4.scala | 32 +++++++++++++++++
4 files changed, 140 insertions(+)
----------------------------------------------------------------------
[3/4] git commit: Add Function4 and WrappedFunction4
Posted by ma...@apache.org.
Add Function4 and WrappedFunction4
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/de291c68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/de291c68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/de291c68
Branch: refs/heads/branch-0.8
Commit: de291c68879a79271dba060f7214db5759049a74
Parents: 987c613
Author: Xi Liu <xi...@conviva.com>
Authored: Wed Oct 9 14:58:51 2013 -0700
Committer: Xi Liu <xi...@conviva.com>
Committed: Wed Oct 9 14:58:51 2013 -0700
----------------------------------------------------------------------
.../spark/api/java/function/Function4.java | 38 ++++++++++++++++++++
.../api/java/function/WrappedFunction4.scala | 32 +++++++++++++++++
2 files changed, 70 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/de291c68/core/src/main/scala/org/apache/spark/api/java/function/Function4.java
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/Function4.java b/core/src/main/scala/org/apache/spark/api/java/function/Function4.java
new file mode 100644
index 0000000..94621d7
--- /dev/null
+++ b/core/src/main/scala/org/apache/spark/api/java/function/Function4.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.api.java.function;
+
+import scala.reflect.ClassManifest;
+import scala.reflect.ClassManifest$;
+import scala.runtime.AbstractFunction3;
+
+import java.io.Serializable;
+
+/**
+ * A four-argument function that takes arguments of type T1, T2, T3, and T4 and returns an R.
+ */
+public abstract class Function4<T1, T2, T3, T4, R> extends WrappedFunction4<T1, T2, T3, T4, R>
+ implements Serializable {
+
+ public abstract R call(T1 t1, T2 t2, T3 t3, T4 t4) throws Exception;
+
+ public ClassManifest<R> returnType() {
+ return (ClassManifest<R>) ClassManifest$.MODULE$.fromClass(Object.class);
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/de291c68/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction4.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction4.scala b/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction4.scala
new file mode 100644
index 0000000..29ba67f
--- /dev/null
+++ b/core/src/main/scala/org/apache/spark/api/java/function/WrappedFunction4.scala
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.api.java.function
+
+import scala.runtime.AbstractFunction4
+
+/**
+ * Subclass of Function4 for ease of calling from Java. The main thing it does is re-expose the
+ * apply() method as call() and declare that it can throw Exception (since AbstractFunction3.apply
+ * isn't marked to allow that).
+ */
+private[spark] abstract class WrappedFunction4[T1, T2, T3, T4, R] extends AbstractFunction4[T1, T2, T3, T4, R] {
+ @throws(classOf[Exception])
+ def call(t1: T1, t2: T2, t3: T3, t4: T4): R
+
+ final def apply(t1: T1, t2: T2, t3: T3, t4: T4): R = call(t1, t2, t3, t4)
+}