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 2012/06/04 21:17:20 UTC
svn commit: r1346096 - in
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver:
HRegion.java SplitTransaction.java
Author: stack
Date: Mon Jun 4 19:17:19 2012
New Revision: 1346096
URL: http://svn.apache.org/viewvc?rev=1346096&view=rev
Log:
HBASE-6158 Data loss if the words 'merges' or 'splits' are used as Column Family name
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1346096&r1=1346095&r2=1346096&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Mon Jun 4 19:17:19 2012
@@ -172,7 +172,7 @@ import com.google.common.collect.Mutable
*/
public class HRegion implements HeapSize { // , Writable{
public static final Log LOG = LogFactory.getLog(HRegion.class);
- static final String MERGEDIR = "merges";
+ private static final String MERGEDIR = ".merges";
final AtomicBoolean closed = new AtomicBoolean(false);
/* Closing can take some time; use the closing flag if there is stuff we don't
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1346096&r1=1346095&r2=1346096&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Mon Jun 4 19:17:19 2012
@@ -84,7 +84,7 @@ import com.google.common.util.concurrent
*/
public class SplitTransaction {
private static final Log LOG = LogFactory.getLog(SplitTransaction.class);
- private static final String SPLITDIR = "splits";
+ private static final String SPLITDIR = ".splits";
/*
* Region to split