Index: org/apache/hadoop/hbase/regionserver/HRegion.java =================================================================== --- org/apache/hadoop/hbase/regionserver/HRegion.java (revision 5504) +++ org/apache/hadoop/hbase/regionserver/HRegion.java (working copy) @@ -1211,6 +1211,41 @@ this.updatesLock.readLock().lock(); try { + + for (Map.Entry> e : familyMap.entrySet()) { + + byte[] family = e.getKey(); + List kvs = e.getValue(); + + Store store = getStore(family); + for (KeyValue kv: kvs) { + // Check if time is LATEST, change to time of most recent addition if so + // This is expensive. + if (kv.isLatestTimestamp() && kv.isDeleteType()) { + List result = new ArrayList(1); + Get g = new Get(kv.getRow()); + NavigableSet qualifiers = + new TreeSet(Bytes.BYTES_COMPARATOR); + byte [] q = kv.getQualifier(); + if(q == null) q = HConstants.EMPTY_BYTE_ARRAY; + qualifiers.add(q); + get(store, g, qualifiers, result); + if (result.isEmpty()) { + // Nothing to delete + continue; + } + if (result.size() > 1) { + throw new RuntimeException("Unexpected size: " + result.size()); + } + KeyValue getkv = result.get(0); + Bytes.putBytes(kv.getBuffer(), kv.getTimestampOffset(), + getkv.getBuffer(), getkv.getTimestampOffset(), Bytes.SIZEOF_LONG); + } else { + kv.updateLatestStamp(byteNow); + } + } + } + if (writeToWAL) { // // write/sync to WAL should happen before we touch memstore. @@ -1250,30 +1285,6 @@ Store store = getStore(family); for (KeyValue kv: kvs) { - // Check if time is LATEST, change to time of most recent addition if so - // This is expensive. - if (kv.isLatestTimestamp() && kv.isDeleteType()) { - List result = new ArrayList(1); - Get g = new Get(kv.getRow()); - NavigableSet qualifiers = - new TreeSet(Bytes.BYTES_COMPARATOR); - byte [] q = kv.getQualifier(); - if(q == null) q = HConstants.EMPTY_BYTE_ARRAY; - qualifiers.add(q); - get(store, g, qualifiers, result); - if (result.isEmpty()) { - // Nothing to delete - continue; - } - if (result.size() > 1) { - throw new RuntimeException("Unexpected size: " + result.size()); - } - KeyValue getkv = result.get(0); - Bytes.putBytes(kv.getBuffer(), kv.getTimestampOffset(), - getkv.getBuffer(), getkv.getTimestampOffset(), Bytes.SIZEOF_LONG); - } else { - kv.updateLatestStamp(byteNow); - } size = this.memstoreSize.addAndGet(store.delete(kv)); } } Index: org/apache/hadoop/hbase/io/hfile/HFile.java =================================================================== --- org/apache/hadoop/hbase/io/hfile/HFile.java (revision 5504) +++ org/apache/hadoop/hbase/io/hfile/HFile.java (working copy) @@ -1744,7 +1744,7 @@ KeyValue kv = scanner.getKeyValue(); // dump key value if (printKeyValue) { - System.out.println("K: " + Bytes.toStringBinary(kv.getKey()) + + System.out.println("K: " + kv + " V: " + Bytes.toStringBinary(kv.getValue())); } // check if rows are in order