mnemonic-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject incubator-mnemonic git commit: MNEMONIC-244: Explicitly specify the type of allocator for function argument
Date Mon, 24 Apr 2017 21:18:08 GMT
Repository: incubator-mnemonic
Updated Branches:
  refs/heads/master 09fae08b1 -> 0292d5894


MNEMONIC-244: Explicitly specify the type of allocator for function argument


Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/0292d589
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/0292d589
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/0292d589

Branch: refs/heads/master
Commit: 0292d5894ad4992d7b4be8abdbb106121861cd13
Parents: 09fae08
Author: Wang, Gang(Gary) <gang1.wang@intel.com>
Authored: Mon Apr 24 14:17:23 2017 -0700
Committer: Wang, Gang(Gary) <gang1.wang@intel.com>
Committed: Mon Apr 24 14:17:23 2017 -0700

----------------------------------------------------------------------
 .../org/apache/mnemonic/spark/rdd/DurableRDD.scala    | 14 +++++++-------
 .../mnemonic/spark/rdd/DurableRDDFunctions.scala      |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0292d589/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDD.scala
----------------------------------------------------------------------
diff --git a/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDD.scala
b/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDD.scala
index 8cdb7be..a8462be 100644
--- a/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDD.scala
+++ b/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDD.scala
@@ -25,12 +25,12 @@ import org.apache.spark.{ Partition, TaskContext }
 import scala.reflect.{ classTag, ClassTag }
 import scala.collection.mutable.HashMap
 import scala.collection.JavaConverters._
-import org.apache.mnemonic.ConfigurationException;
-import org.apache.mnemonic.DurableType;
-import org.apache.mnemonic.EntityFactoryProxy;
-import org.apache.mnemonic.NonVolatileMemAllocator;
-import org.apache.mnemonic.sessions.DurableInputSession;
-import org.apache.mnemonic.sessions.SessionIterator;
+import org.apache.mnemonic.ConfigurationException
+import org.apache.mnemonic.DurableType
+import org.apache.mnemonic.EntityFactoryProxy
+import org.apache.mnemonic.NonVolatileMemAllocator
+import org.apache.mnemonic.sessions.DurableInputSession
+import org.apache.mnemonic.sessions.SessionIterator
 import org.apache.mnemonic.sessions.ObjectCreator
 import org.apache.mnemonic.spark.MneDurableInputSession
 import org.apache.mnemonic.spark.MneDurableOutputSession
@@ -40,7 +40,7 @@ class DurableRDD[D: ClassTag, T: ClassTag](
   serviceName: String, durableTypes: Array[DurableType],
   entityFactoryProxies: Array[EntityFactoryProxy], slotKeyId: Long,
   partitionPoolSize: Long, baseDir: Path,
-  f: (T, ObjectCreator[D, _]) => Option[D],
+  f: (T, ObjectCreator[D, NonVolatileMemAllocator]) => Option[D],
   preservesPartitioning: Boolean = false)
     extends RDD[D](prev) {
 

http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/0292d589/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDDFunctions.scala
----------------------------------------------------------------------
diff --git a/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDDFunctions.scala
b/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDDFunctions.scala
index c06b05b..3b7800f 100644
--- a/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDDFunctions.scala
+++ b/mnemonic-spark/mnemonic-spark-core/src/main/scala/org/apache/mnemonic/spark/rdd/DurableRDDFunctions.scala
@@ -22,8 +22,9 @@ import org.apache.spark.rdd.RDD
 import org.apache.spark.TaskContext
 import scala.reflect.ClassTag
 import scala.language.implicitConversions
+import org.apache.mnemonic.NonVolatileMemAllocator
 import org.apache.mnemonic.DurableType
-import org.apache.mnemonic.EntityFactoryProxy;
+import org.apache.mnemonic.EntityFactoryProxy
 import org.apache.mnemonic.sessions.ObjectCreator
 
 class DurableRDDFunctions[T: ClassTag](rdd: RDD[T]) extends Serializable {
@@ -35,7 +36,7 @@ class DurableRDDFunctions[T: ClassTag](rdd: RDD[T]) extends Serializable
{
     slotKeyId: Long,
     partitionPoolSize: Long,
     baseDir: Path,
-    f: (T, ObjectCreator[D, _]) => Option[D],
+    f: (T, ObjectCreator[D, NonVolatileMemAllocator]) => Option[D],
     preservesPartitioning: Boolean = false) =
     new DurableRDD[D, T](rdd,
       serviceName, durableTypes, entityFactoryProxies, slotKeyId,


Mime
View raw message