commit a7ec073e2d598e55184893dc82eeec1e37328c02
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Mar 10 16:01:06 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Mar 11 23:21:58 2014 -0700
tree 9aa417bbf0467e0178cab7dfa0e0c7e058cd2741
parent 1d6a22a0b6aee1679a9db5cfeb672f734ef003e0

Switch RAMCloud to Stanford release version

- Switch RAMCloud source code to 1.0 release + patches
- WARN: RAMCloud binary is going to be built to obj.master instead of obj.blueprint-java
- Fix JNI code to follow TableEnumerator related API change
- Build JNI library inside ONOS directory
- Remove non-source code artifact related to BluePrint
- Output ZooKeeper log to onos-logs

Change-Id: Id6fbf9418d6b3ce2e560bbf24b405c4ccc80a8e6

src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc

diff --git a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
index 41d87a5..a0dd0ce 100644
--- a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
+++ b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
@@ -17,7 +17,6 @@
 #include <TableEnumerator.h>
 #include <Object.h>
 #include "edu_stanford_ramcloud_JRamCloud.h"
-#include "edu_stanford_ramcloud_JRamCloud_TableEnumerator.h"
 
 using namespace RAMCloud;
 
@@ -635,7 +634,7 @@
     const static jfieldID fieldId = env->GetFieldID(cls, "ramCloudObjectPointer", "J");
     RamCloud* ramcloud = reinterpret_cast<RamCloud*>(env->GetLongField(jTableEnumerator, fieldId));
 
-    return reinterpret_cast<jlong>(new TableEnumerator(*ramcloud, jTableId));
+    return reinterpret_cast<jlong>(new TableEnumerator(*ramcloud, jTableId, false));
 }
 
 /*
@@ -727,7 +726,7 @@
     bool done = false;
 
     while (true) {
-        jTabletNextHash = ramcloud->enumerateTable(jTableId, jTabletNextHash, state, objects);
+        jTabletNextHash = ramcloud->enumerateTable(jTableId, false, jTabletNextHash, state, objects);
         if (objects.getTotalLength() > 0) {
             break;
         }