svn commit: r1139584 - in /incubator/gora/branches/0.1.1-incubating/gora-hbase: ivy/ivy.xml src/main/java/org/apache/gora/hbase/store/HBaseMapping.java src/main/java/org/apache/gora/hbase/store/HBaseStore.java

[ma...@apache.org]

Author: mattmann
Date: Sat Jun 25 18:38:35 2011
New Revision: 1139584

URL: http://svn.apache.org/viewvc?rev=1139584&view=rev
Log:
Backport GORA-25 to 0.1.1-incubating branch.

Modified:
    incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml
    incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
    incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java

Modified: incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml?rev=1139584&r1=1139583&r2=1139584&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-hbase/ivy/ivy.xml Sat Jun 25 18:38:35 2011
@@ -39,6 +39,9 @@
 
     <!-- test dependencies -->
     <dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="test->default"/>
+    <dependency org="org.apache.hbase" name="hbase" rev="0.90.0" conf="*->default">
+        <exclude org="org.apache.thrift"/>
+    </dependency>
 
   </dependencies>
     

Modified: incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java?rev=1139584&r1=1139583&r2=1139584&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseMapping.java Sat Jun 25 18:38:35 2011
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.io.hfile.Compression.Algorithm;
+import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
 import org.apache.hadoop.hbase.util.Bytes;
 
 /**
@@ -68,7 +69,7 @@ public class HBaseMapping {
   
   public void addColumnFamily(String tableName, String familyName
       , String compression, String blockCache, String blockSize, String bloomFilter
-      , String maxVersions, String timeToLive, String inMemory, String mapFileIndexInterval) {
+      , String maxVersions, String timeToLive, String inMemory) {
     
     HColumnDescriptor columnDescriptor = addColumnFamily(tableName, familyName);
     
@@ -79,15 +80,13 @@ public class HBaseMapping {
     if(blockSize != null)
       columnDescriptor.setBlocksize(Integer.parseInt(blockSize));
     if(bloomFilter != null)
-      columnDescriptor.setBloomfilter(Boolean.parseBoolean(bloomFilter));
+      columnDescriptor.setBloomFilterType(BloomType.valueOf(bloomFilter));
     if(maxVersions != null)
       columnDescriptor.setMaxVersions(Integer.parseInt(maxVersions));
     if(timeToLive != null)
       columnDescriptor.setTimeToLive(Integer.parseInt(timeToLive));
     if(inMemory != null)
       columnDescriptor.setInMemory(Boolean.parseBoolean(inMemory));
-    if(mapFileIndexInterval != null)
-      columnDescriptor.setMapFileIndexInterval(Integer.parseInt(mapFileIndexInterval));
     
     getTable(tableName).addFamily(columnDescriptor);
   }

Modified: incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL: http://svn.apache.org/viewvc/incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1139584&r1=1139583&r2=1139584&view=diff
==============================================================================
--- incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java (original)
+++ incubator/gora/branches/0.1.1-incubating/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java Sat Jun 25 18:38:35 2011
@@ -544,10 +544,9 @@ implements Configurable {
           String maxVersions = fieldElement.getAttributeValue("maxVersions");
           String timeToLive  = fieldElement.getAttributeValue("timeToLive");
           String inMemory    = fieldElement.getAttributeValue("inMemory");
-          String mapFileIndexInterval  = tableElement.getAttributeValue("mapFileIndexInterval");
 
           mapping.addColumnFamily(tableName, familyName, compression, blockCache, blockSize
-              , bloomFilter, maxVersions, timeToLive, inMemory, mapFileIndexInterval);
+              , bloomFilter, maxVersions, timeToLive, inMemory);
         }
       }