svn commit: r718803 - in /hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase: HStoreKey.java HTableDescriptor.java

[st...@apache.org]

Author: stack
Date: Tue Nov 18 15:51:07 2008
New Revision: 718803

URL: http://svn.apache.org/viewvc?rev=718803&view=rev
Log:
HBASE-883 Secondary indices; remove unused comparators

Modified:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreKey.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreKey.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreKey.java?rev=718803&r1=718802&r2=718803&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreKey.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HStoreKey.java Tue Nov 18 15:51:07 2008
@@ -529,9 +529,6 @@
       if(rowCompare == 0)
         rowCompare = Bytes.compareTo(keysA[1], KeysB[1]);
       return rowCompare;
-    } 
-    if (regionInfo != null && regionInfo.getTableDesc().getRowKeyComparator() != null) {
-      return regionInfo.getTableDesc().getRowKeyComparator().compare(rowA, rowB);
     }
     return Bytes.compareTo(rowA, rowB);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=718803&r1=718802&r2=718803&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java Tue Nov 18 15:51:07 2008
@@ -19,12 +19,8 @@
  */
 package org.apache.hadoop.hbase;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
-import java.io.DataInputStream;
 import java.io.DataOutput;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,7 +32,6 @@
 import org.apache.hadoop.hbase.client.tableindexed.IndexSpecification;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.io.ObjectWritable;
 import org.apache.hadoop.io.WritableComparable;
 
 /**
@@ -431,47 +426,7 @@
     setValue(MEMCACHE_FLUSHSIZE_KEY,
       Bytes.toBytes(Integer.toString(memcacheFlushSize)));
   }
-  
-  
-  public void setRowKeyComparator(WritableComparator<byte[]> newComparator) {
-    if (newComparator == null) {
-      return;
-    }
     
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    DataOutputStream dos = new DataOutputStream(bos);
-    HBaseConfiguration conf = new HBaseConfiguration();
-    try {
-      ObjectWritable.writeObject(dos, newComparator, WritableComparator.class, conf);
-      dos.close();
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-    setValue(ROW_KEY_COMPARATOR.getBytes(), bos.toByteArray());
-    this.comparator = newComparator;
-  }
-  
-  private WritableComparator<byte[]> comparator = null;
-  public WritableComparator<byte[]> getRowKeyComparator() {
-    if (comparator != null) {
-      return comparator;
-    }
-    byte[] bytes = getValue(ROW_KEY_COMPARATOR.getBytes());
-    if (bytes == null) {
-      return null;
-    }
-    ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-    DataInputStream in = new DataInputStream(bis);
-    HBaseConfiguration conf = new HBaseConfiguration();
-    try {
-      comparator = (WritableComparator<byte[]>) ObjectWritable.readObject(in, conf);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-    return comparator;
-  }
-  
-  
   public Collection<IndexSpecification> getIndexes() {
     return indexes.values();
   }
@@ -708,4 +663,4 @@
           new HColumnDescriptor(HConstants.COLUMN_FAMILY_HISTORIAN,
             HConstants.ALL_VERSIONS, HColumnDescriptor.CompressionType.NONE,
             false, false, Integer.MAX_VALUE, HConstants.WEEK_IN_SECONDS, false)});
-}
+}
\ No newline at end of file