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 2009/07/23 06:11:25 UTC
svn commit: r796939 - in
/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen: ./
onelab/filter/
Author: stack
Date: Thu Jul 23 04:11:25 2009
New Revision: 796939
URL: http://svn.apache.org/viewvc?rev=796939&view=rev
Log:
HBASE-1215 fix for jon currently migrating
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java Thu Jul 23 04:11:25 2009
@@ -123,10 +123,14 @@
throw new IOException(family.toString() + " has " + familyStatus.length +
" files.");
}
- // If we got here, then this is good. Add the mapfile to out
- String str = familyStatus[0].getPath().makeQualified(fs).toString();
- LOG.info(str);
- out.write(Bytes.toBytes(str + "\n"));
+ if (familyStatus.length == 1) {
+ // If we got here, then this is good. Add the mapfile to out
+ String str = familyStatus[0].getPath().makeQualified(fs).toString();
+ LOG.info(str);
+ out.write(Bytes.toBytes(str + "\n"));
+ } else {
+ LOG.warn("Empty store " + family.toString());
+ }
}
}
}
@@ -154,4 +158,4 @@
FileOutputFormat.setOutputPath(job, output);
System.exit(job.waitForCompletion(true) ? 0 : 1);
}
-}
\ No newline at end of file
+}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java Thu Jul 23 04:11:25 2009
@@ -70,10 +70,6 @@
* contract <a href="http://www.one-lab.org">European Commission One-Lab Project 034819</a>.
*
* @version 1.0 - 2 Feb. 07
- *
- * @see org.onelab.filter.Filter The general behavior of a filter
- *
- * @see <a href="http://portal.acm.org/citation.cfm?id=362692&dl=ACM&coll=portal">Space/Time Trade-Offs in Hash Coding with Allowable Errors</a>
*/
public class BloomFilter extends Filter {
private static final byte[] bitvalues = new byte[] {
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java Thu Jul 23 04:11:25 2009
@@ -66,9 +66,6 @@
*
* @version 1.1 - 19 Jan. 08
*
- * @see org.onelab.filter.Filter The general behavior of a filter
- *
- * @see <a href="http://portal.acm.org/citation.cfm?id=343571.343572">Summary cache: a scalable wide-area web cache sharing protocol</a>
*/
public final class CountingBloomFilter extends Filter {
/** Storage for the counting buckets */
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java Thu Jul 23 04:11:25 2009
@@ -81,10 +81,6 @@
*
* @version 1.0 - 6 Feb. 07
*
- * @see org.onelab.filter.Filter The general behavior of a filter
- * @see org.onelab.filter.BloomFilter A Bloom filter
- *
- * @see <a href="http://www.cse.fau.edu/~jie/research/publications/Publication_files/infocom2006.pdf">Theory and Network Applications of Dynamic Bloom Filters</a>
*/
public class DynamicBloomFilter extends Filter {
/**
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java Thu Jul 23 04:11:25 2009
@@ -69,12 +69,7 @@
* <p>
* It must be extended in order to define the real behavior.
*
- * @see org.onelab.filter.Filter The general behavior of a filter
- *
* @version 1.0 - 2 Feb. 07
- *
- * @see org.onelab.filter.Key The general behavior of a key
- * @see org.onelab.filter.HashFunction A hash function
*/
public abstract class Filter implements Writable {
private static final int VERSION = -1; // negative to accommodate for old format
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java Thu Jul 23 04:11:25 2009
@@ -56,14 +56,7 @@
* <p>
* It is based on the SHA-1 algorithm.
*
- * @see org.onelab.filter.Filter The general behavior of a filter
- *
* @version 1.0 - 2 Feb. 07
- *
- * @see org.onelab.filter.Key The general behavior of a key being stored in a filter
- * @see org.onelab.filter.Filter The general behavior of a filter
- *
- * @see <a href="http://www.itl.nist.gov/fipspubs/fip180-1.htm">SHA-1 algorithm</a>
*/
public final class HashFunction {
/** The number of hashed values. */
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java Thu Jul 23 04:11:25 2009
@@ -55,8 +55,6 @@
/**
* The general behavior of a key that must be stored in a filter.
- *
- * @see org.onelab.filter.Filter The general behavior of a filter
*/
public class Key implements WritableComparable {
/** Byte value of key */
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java?rev=796939&r1=796938&r2=796939&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java Thu Jul 23 04:11:25 2009
@@ -69,11 +69,6 @@
*
* @version 1.0 - 7 Feb. 07
*
- * @see org.onelab.filter.Filter The general behavior of a filter
- * @see org.onelab.filter.BloomFilter A Bloom filter
- * @see org.onelab.filter.RemoveScheme The different selective clearing algorithms
- *
- * @see <a href="http://www-rp.lip6.fr/site_npa/site_rp/_publications/740-rbf_cameraready.pdf">Retouched Bloom Filters: Allowing Networked Applications to Trade Off Selected False Positives Against False Negatives</a>
*/
public final class RetouchedBloomFilter extends BloomFilter
implements RemoveScheme {