add storage level code

Author: zhgwen

c++/spark/Class.o

@@ -22,7 +22,8 @@ OBJS = convert.o \
 	   cpairrdd.o \
 	   csparkcontext.o \
 	   Class.o \
-	   mapping.o
+	   mapping.o \
+	   storageLevel.o
 
 
 TARGET = libsparkAPI.so

c++/spark/Makefile

@@ -13,6 +13,7 @@
 #include "spark/require.hpp"
 #include "spark/convert.hpp"
 #include "spark/Class.h"
+#include "spark/storageLevel.h"
 
 using namespace std;
 
@@ -36,25 +37,23 @@ CRDD& CRDD::cache() {
 	jobject obj = env->CallObjectMethod(rdd, mid);
 	assure(obj != NULL, env);
 
-	CRDD result(env, obj, sparkctx);
-	return result;
-	/*rdd = obj;
-	return *this;*/
+	rdd = obj;
+	return *this;
 }
 
 CRDD& CRDD::persist() {
 	return persist(MEMORY_ONLY);
 }
 
 CRDD& CRDD::persist(const StorageLevel newlevel) {
-	/*if (level != NONE && newlevel != level) {
+	if (level != NONE && newlevel != level) {
 		cerr
 				<< "Cannot change storage level of an RDD after it was already assigned a level"
 				<< endl;
 	}
 
 	level = newlevel;
-	char* ss = "";//getStorageLevel(level);
+	char* ss = getStorageLevel(level);
 
 	jclass storagecls = env->FindClass("spark/api/java/StorageLevel");
 	assert(storagecls != NULL);
@@ -73,7 +72,7 @@ CRDD& CRDD::persist(const StorageLevel newlevel) {
 	jobject obj = env->CallObjectMethod(rdd, mid, levelObj);
 	assert(obj != NULL);
 
-	rdd = obj;*/
+	rdd = obj;
 	return *this;
 }
 

c++/spark/convert.o

@@ -0,0 +1,33 @@
+#include <iostream>
+#include "spark/storageLevel.h"
+
+using namespace std;
+
+char* getStorageLevel(StorageLevel level) {
+	switch(level) {
+	case NONE:
+		return "NONE";
+	case DISK_ONLY:
+		return "DISK_ONLY";
+	case DISK_ONLY_2:
+		return "DISK_ONLY_2";
+	case MEMORY_ONLY:
+		return "MEMORY_ONLY";
+	case MEMORY_ONLY_2:
+		return "MEMORY_ONLY_2";
+	case MEMORY_ONLY_SER:
+		return "MEMORY_ONLY_SER";
+	case MEMORY_ONLY_SER_2:
+		return "MEMORY_ONLY_SER_2";
+	case MEMORY_AND_DISK:
+		return "MEMORY_AND_DISK";
+	case MEMORY_AND_DISK_2:
+		return "MEMORY_AND_DISK_2";
+	case MEMORY_AND_DISK_SER:
+		return "MEMORY_AND_DISK_SER";
+	case MEMORY_AND_DISK_SER_2:
+		return "MEMORY_AND_DISK_SER_2";
+	default:
+		return "MEMORY_ONLY";
+	}
+}