From 65852deff9539aba7fa3595a8abff7057ea3df7b Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 1 Sep 2008 21:46:46 +0000 Subject: [PATCH] HBASE-860 IndexTableReduce doesnt write the column name as the lucene index field properly git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@691069 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ .../org/apache/hadoop/hbase/mapred/IndexTableReduce.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 180481a09d3..e566b7ec61a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,8 @@ Release 0.18.0 - Unreleased 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) diff --git a/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java b/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java index b5fbf7ba0fc..be60d6a9018 100644 --- a/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java +++ b/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java @@ -86,7 +86,7 @@ public class IndexTableReduce extends MapReduceBase implements // each column (name-value pair) is a field (name-value pair) for (Map.Entry 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 @@ public class IndexTableReduce extends MapReduceBase implements 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));