You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/09/01 23:46:46 UTC

svn commit: r691069 - in /hadoop/hbase: branches/0.2/CHANGES.txt branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java trunk/CHANGES.txt trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java

Author: stack
Date: Mon Sep  1 14:46:46 2008
New Revision: 691069

URL: http://svn.apache.org/viewvc?rev=691069&view=rev
Log:
HBASE-860 IndexTableReduce doesnt write the column name as the lucene index field properly

Modified:
    hadoop/hbase/branches/0.2/CHANGES.txt
    hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java

Modified: hadoop/hbase/branches/0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/CHANGES.txt?rev=691069&r1=691068&r2=691069&view=diff
==============================================================================
--- hadoop/hbase/branches/0.2/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.2/CHANGES.txt Mon Sep  1 14:46:46 2008
@@ -8,6 +8,8 @@
    HBASE-822   Update thrift README and HBase.thrift to use thrift 20080411
 
   BUG FIXES
+   HBASE-860   Fixed Bug in IndexTableReduce where it concerns writing lucene 
+               index fields.
    HBASE-805   Remove unnecessary getRow overloads in HRS (Jonathan Gray via
                Jim Kellerman) (Fix whitespace changes in HRegionServer)
    HBASE-811   HTD is not fully copyable (Andrew Purtell via Jim Kellerman)

Modified: hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java?rev=691069&r1=691068&r2=691069&view=diff
==============================================================================
--- hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java (original)
+++ hadoop/hbase/branches/0.2/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java Mon Sep  1 14:46:46 2008
@@ -86,7 +86,7 @@
       // each column (name-value pair) is a field (name-value pair)
       for (Map.Entry<byte [], Cell> entry : value.entrySet()) {
         // name is already UTF-8 encoded
-        String column = entry.getKey().toString();
+        String column = Bytes.toString(entry.getKey());
         byte[] columnValue = entry.getValue().getValue();
         Field.Store store = indexConf.isStore(column)?
           Field.Store.YES: Field.Store.NO;
@@ -96,8 +96,8 @@
             Field.Index.NO;
 
         // UTF-8 encode value
-        Field field = new Field(column, new String(columnValue,
-          HConstants.UTF8_ENCODING), store, index);
+        Field field = new Field(column, Bytes.toString(columnValue), 
+          store, index);
         field.setBoost(indexConf.getBoost(column));
         field.setOmitNorms(indexConf.isOmitNorms(column));
 

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=691069&r1=691068&r2=691069&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Sep  1 14:46:46 2008
@@ -7,6 +7,8 @@
    HBASE-822   Update thrift README and HBase.thrift to use thrift 20080411
 
   BUG FIXES
+   HBASE-860   Fixed Bug in IndexTableReduce where it concerns writing lucene 
+               index fields.
    HBASE-805   Remove unnecessary getRow overloads in HRS (Jonathan Gray via
                Jim Kellerman) (Fix whitespace diffs in HRegionServer)
    HBASE-811   HTD is not fully copyable (Andrew Purtell via Jim Kellerman)

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java?rev=691069&r1=691068&r2=691069&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java Mon Sep  1 14:46:46 2008
@@ -86,7 +86,7 @@
       // each column (name-value pair) is a field (name-value pair)
       for (Map.Entry<byte [], Cell> entry : value.entrySet()) {
         // name is already UTF-8 encoded
-        String column = entry.getKey().toString();
+        String column = Bytes.toString(entry.getKey());
         byte[] columnValue = entry.getValue().getValue();
         Field.Store store = indexConf.isStore(column)?
           Field.Store.YES: Field.Store.NO;
@@ -96,8 +96,8 @@
             Field.Index.NO;
 
         // UTF-8 encode value
-        Field field = new Field(column, new String(columnValue,
-          HConstants.UTF8_ENCODING), store, index);
+        Field field = new Field(column, Bytes.toString(columnValue), 
+          store, index);
         field.setBoost(indexConf.getBoost(column));
         field.setOmitNorms(indexConf.isOmitNorms(column));