Author: jgray
Date: Thu Jan 6 22:47:49 2011
New Revision: 1056107
URL: http://svn.apache.org/viewvc?rev=1056107&view=rev
Log:
HBASE-3418 Increment operations can break when qualifiers are split between
memstore/snapshot and storefiles
Added:
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1056107&r1=1056106&r2=1056107&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Jan 6 22:47:49 2011
@@ -784,6 +784,8 @@ Release 0.90.0 - Unreleased
Andrew Purtell)
HBASE-3407 hbck should pause between fixing and re-checking state
HBASE-3401 Region IPC operations should be high priority
+ HBASE-3418 Increment operations can break when qualifiers are split
+ between memstore/snapshot and storefiles
IMPROVEMENTS
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1056107&r1=1056106&r2=1056107&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Thu Jan 6 22:47:49 2011
@@ -29,6 +29,7 @@ import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -2933,6 +2934,7 @@ public class HRegion implements HeapSize
// combine and return
results.addAll(fileResults);
+ Collections.sort(results, KeyValue.COMPARATOR);
return results;
}
Added:
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java?rev=1056107&view=auto
==============================================================================
---
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
(added)
+++
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
Thu Jan 6 22:47:49 2011
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.Increment;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.Test;
+
+public class TestResettingCounters {
+
+ @Test
+ public void testResettingCounters() throws Exception {
+
+ HBaseTestingUtility htu = new HBaseTestingUtility();
+ Configuration conf = htu.getConfiguration();
+ FileSystem fs = FileSystem.get(conf);
+ byte [] table = Bytes.toBytes("table");
+ byte [][] families = new byte [][] {
+ Bytes.toBytes("family1"),
+ Bytes.toBytes("family2"),
+ Bytes.toBytes("family3")
+ };
+ int numQualifiers = 10;
+ byte [][] qualifiers = new byte [numQualifiers][];
+ for (int i=0; i<numQualifiers; i++) qualifiers[i] = Bytes.toBytes("qf" +
i);
+ int numRows = 10;
+ byte [][] rows = new byte [numRows][];
+ for (int i=0; i<numRows; i++) rows[i] = Bytes.toBytes("r" + i);
+
+ HTableDescriptor htd = new HTableDescriptor(table);
+ for (byte [] family : families) htd.addFamily(new
HColumnDescriptor(family));
+
+ HRegionInfo hri = new HRegionInfo(htd, null, null, false);
+ String testDir = HBaseTestingUtility.getTestDir() +
"/TestResettingCounters/";
+ Path path = new Path(testDir);
+ if (fs.exists(path)) {
+ if (!fs.delete(path, true)) {
+ throw new IOException("Failed delete of " + path);
+ }
+ }
+ HRegion region = HRegion.createHRegion(hri, path, conf);
+
+ Increment odd = new Increment(rows[0]);
+ Increment even = new Increment(rows[0]);
+ Increment all = new Increment(rows[0]);
+ for (int i=0;i<numQualifiers;i++) {
+ if (i % 2 == 0) even.addColumn(families[0], qualifiers[i], 1);
+ else odd.addColumn(families[0], qualifiers[i], 1);
+ all.addColumn(families[0], qualifiers[i], 1);
+ }
+
+ // increment odd qualifiers 5 times and flush
+ for (int i=0;i<5;i++) region.increment(odd, null, false);
+ region.flushcache();
+
+ // increment even qualifiers 5 times
+ for (int i=0;i<5;i++) region.increment(even, null, false);
+
+ // increment all qualifiers, should have value=6 for all
+ Result result = region.increment(all, null, false);
+ assertEquals(numQualifiers, result.size());
+ KeyValue [] kvs = result.raw();
+ for (int i=0;i<kvs.length;i++) {
+ System.out.println(kvs[i].toString());
+ assertTrue(Bytes.equals(kvs[i].getQualifier(), qualifiers[i]));
+ assertEquals(6, Bytes.toLong(kvs[i].getValue()));
+ }
+ }
+}
