Upgrade Krati to 0.3.6

voldemort · Jan 16, 2011 · 06bb3ef · 06bb3ef
1 parent ededaf4
commit 06bb3ef
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.classpath b/.classpath
@@ -49,7 +49,7 @@
 	<classpathentry kind="lib" path="lib/jackson-core-asl-1.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/avro-modified-jdk5-1.3.0.jar"/>
 	<classpathentry kind="lib" path="contrib/hadoop/lib/pig-0.7.1-dev-core.jar"/>
-	<classpathentry kind="lib" path="contrib/krati/lib/krati-0.3.4.jar"/>
+	<classpathentry kind="lib" path="contrib/krati/lib/krati-0.3.6.jar"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
     <classpathentry kind="lib" path="lib/mockito-all-1.8.5.jar" />
     <classpathentry kind="output" path="classes"/>

diff --git a/contrib/krati/lib/krati-0.3.4.jar b/contrib/krati/lib/krati-0.3.4.jar
diff --git a/contrib/krati/lib/krati-0.3.6.jar b/contrib/krati/lib/krati-0.3.6.jar
diff --git a/contrib/krati/src/java/voldemort/store/krati/KratiStorageConfiguration.java b/contrib/krati/src/java/voldemort/store/krati/KratiStorageConfiguration.java
@@ -2,9 +2,8 @@
 
 import java.io.File;
 
-import krati.cds.impl.segment.MappedSegmentFactory;
-import krati.cds.impl.segment.SegmentFactory;
-
+import krati.core.segment.MappedSegmentFactory;
+import krati.core.segment.SegmentFactory;
 import org.apache.log4j.Logger;
 
 import voldemort.server.VoldemortConfig;

diff --git a/contrib/krati/src/java/voldemort/store/krati/KratiStorageEngine.java b/contrib/krati/src/java/voldemort/store/krati/KratiStorageEngine.java
@@ -12,9 +12,9 @@
 import java.util.List;
 import java.util.Map;
 
-import krati.cds.array.DataArray;
-import krati.cds.impl.segment.SegmentFactory;
-import krati.cds.impl.store.DynamicDataStore;
+import krati.array.DataArray;
+import krati.core.segment.SegmentFactory;
+import krati.store.DynamicDataStore;
 import krati.util.FnvHashFunction;
 
 import org.apache.log4j.Logger;
@@ -108,7 +108,7 @@ public ClosableIterator<Pair<ByteArray, Versioned<byte[]>>> entries() {
         List<Pair<ByteArray, Versioned<byte[]>>> returnedList = new ArrayList<Pair<ByteArray, Versioned<byte[]>>>();
         DataArray array = datastore.getDataArray();
         for(int index = 0; index < array.length(); index++) {
-            byte[] returnedBytes = array.getData(index);
+            byte[] returnedBytes = array.get(index);
             if(returnedBytes != null) {
                 // Extract the key value pair from this
                 // TODO: Move to DynamicDataStore code

diff --git a/contrib/krati/test/voldemort/store/krati/KratiStorageEngineTest.java b/contrib/krati/test/voldemort/store/krati/KratiStorageEngineTest.java
@@ -2,7 +2,7 @@
 
 import java.io.File;
 
-import krati.cds.impl.segment.MappedSegmentFactory;
+import krati.core.segment.MappedSegmentFactory;
 import voldemort.TestUtils;
 import voldemort.store.AbstractStorageEngineTest;
 import voldemort.store.StorageEngine;