Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-1366 HBASE-1342 broke splitting (broke build) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@771031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-05-03 06:21:21 +00:00
parent df6e6e4ba6
commit b15c63f8f7
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java
View File

@ -144,7 +144,8 @@ public abstract class HAbstractScanner implements InternalScanner {
this.wildCardmatch = true; this.wildCardmatch = true;
} else if (isRegexPattern.matcher(Bytes.toString(qualifier)).matches()) { } else if (isRegexPattern.matcher(Bytes.toString(qualifier)).matches()) {
this.matchType = MATCH_TYPE.REGEX; this.matchType = MATCH_TYPE.REGEX;
this.columnMatcher = Pattern.compile(Bytes.toString(columnWithoutDelimiter)); this.columnMatcher =
Pattern.compile(Bytes.toString(columnWithoutDelimiter));
this.wildCardmatch = true; this.wildCardmatch = true;
} else { } else {
this.matchType = MATCH_TYPE.SIMPLE; this.matchType = MATCH_TYPE.SIMPLE;

22
src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -247,7 +247,7 @@ public class HRegion implements HConstants {
this.historian = RegionHistorian.getInstance(); this.historian = RegionHistorian.getInstance();
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
// Write out region name as string and its encoded name. // Write out region name as string and its encoded name.
LOG.debug("Opening region " + this + "/" + LOG.debug("Opening region " + this + ", encoded=" +
this.regionInfo.getEncodedName()); this.regionInfo.getEncodedName());
} }
this.regionCompactionDir = this.regionCompactionDir =
@ -270,12 +270,9 @@ public class HRegion implements HConstants {
* @param reporter * @param reporter
* @throws IOException * @throws IOException
*/ */
public void initialize( Path initialFiles, final Progressable reporter) public void initialize(Path initialFiles, final Progressable reporter)
throws IOException { throws IOException {
Path oldLogFile = new Path(regiondir, HREGION_OLDLOGFILE_NAME); Path oldLogFile = new Path(regiondir, HREGION_OLDLOGFILE_NAME);
// Write HRI to a file in case we need to recover .META.
checkRegioninfoOnFilesystem();
// Move prefab HStore files into place (if any). This picks up split files // Move prefab HStore files into place (if any). This picks up split files
// and any merges from splits and merges dirs. // and any merges from splits and merges dirs.
@ -283,6 +280,9 @@ public class HRegion implements HConstants {
fs.rename(initialFiles, this.regiondir); fs.rename(initialFiles, this.regiondir);
} }
// Write HRI to a file in case we need to recover .META.
checkRegioninfoOnFilesystem();
// Load in all the HStores. // Load in all the HStores.
long maxSeqId = -1; long maxSeqId = -1;
long minSeqId = Integer.MAX_VALUE; long minSeqId = Integer.MAX_VALUE;
@ -2079,7 +2079,6 @@ public class HRegion implements HConstants {
activeScannerCount.incrementAndGet(); activeScannerCount.incrementAndGet();
} }
@SuppressWarnings("null")
public boolean next(List<KeyValue> results) public boolean next(List<KeyValue> results)
throws IOException { throws IOException {
boolean moreToFollow = false; boolean moreToFollow = false;
@ -2538,7 +2537,6 @@ public class HRegion implements HConstants {
Bytes.toString(endKey) + ">"); Bytes.toString(endKey) + ">");
// Move HStoreFiles under new region directory // Move HStoreFiles under new region directory
Map<byte [], List<StoreFile>> byFamily = Map<byte [], List<StoreFile>> byFamily =
new TreeMap<byte [], List<StoreFile>>(Bytes.BYTES_COMPARATOR); new TreeMap<byte [], List<StoreFile>>(Bytes.BYTES_COMPARATOR);
byFamily = filesByFamily(byFamily, a.close()); byFamily = filesByFamily(byFamily, a.close());
@ -2546,7 +2544,6 @@ public class HRegion implements HConstants {
for (Map.Entry<byte [], List<StoreFile>> es : byFamily.entrySet()) { for (Map.Entry<byte [], List<StoreFile>> es : byFamily.entrySet()) {
byte [] colFamily = es.getKey(); byte [] colFamily = es.getKey();
makeColumnFamilyDirs(fs, basedir, newRegionInfo, colFamily); makeColumnFamilyDirs(fs, basedir, newRegionInfo, colFamily);
// Because we compacted the source regions we should have no more than two // Because we compacted the source regions we should have no more than two
// HStoreFiles per family and there will be no reference store // HStoreFiles per family and there will be no reference store
List<StoreFile> srcFiles = es.getValue(); List<StoreFile> srcFiles = es.getValue();
@ -2606,13 +2603,6 @@ public class HRegion implements HConstants {
return byFamily; return byFamily;
} }
/*
* Method to list files in use by region
*/
static void listFiles(FileSystem fs, HRegion r) throws IOException {
listPaths(fs, r.getRegionDir());
}
/** /**
* @return True if needs a mojor compaction. * @return True if needs a mojor compaction.
* @throws IOException * @throws IOException
@ -2625,7 +2615,7 @@ public class HRegion implements HConstants {
} }
return false; return false;
} }
/* /*
* List the files under the specified directory * List the files under the specified directory
* *