From 924cc198b9cac5d42ba6d2dc85b0f531fe24c787 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 23 Jul 2009 04:11:25 +0000 Subject: [PATCH] HBASE-1215 fix for jon currently migrating git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@796939 13f79535-47bb-0310-9956-ffa450edef68 --- .../migration/nineteen/HStoreFileToStoreFile.java | 14 +++++++++----- .../nineteen/onelab/filter/BloomFilter.java | 4 ---- .../onelab/filter/CountingBloomFilter.java | 3 --- .../nineteen/onelab/filter/DynamicBloomFilter.java | 4 ---- .../migration/nineteen/onelab/filter/Filter.java | 5 ----- .../nineteen/onelab/filter/HashFunction.java | 7 ------- .../migration/nineteen/onelab/filter/Key.java | 2 -- .../onelab/filter/RetouchedBloomFilter.java | 5 ----- 8 files changed, 9 insertions(+), 35 deletions(-) diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java index 6081121002c..d14cafe73f9 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/HStoreFileToStoreFile.java @@ -123,10 +123,14 @@ public class HStoreFileToStoreFile { 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 @@ public class HStoreFileToStoreFile { FileOutputFormat.setOutputPath(job, output); System.exit(job.waitForCompletion(true) ? 0 : 1); } -} \ No newline at end of file +} diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java index c92eadc0754..ef82a272194 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/BloomFilter.java @@ -70,10 +70,6 @@ import org.apache.hadoop.hbase.util.Hash; * contract European Commission One-Lab Project 034819. * * @version 1.0 - 2 Feb. 07 - * - * @see org.onelab.filter.Filter The general behavior of a filter - * - * @see Space/Time Trade-Offs in Hash Coding with Allowable Errors */ public class BloomFilter extends Filter { private static final byte[] bitvalues = new byte[] { diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java index fe0efb37ca0..9e99cb4315b 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/CountingBloomFilter.java @@ -66,9 +66,6 @@ import org.apache.hadoop.hbase.util.Hash; * * @version 1.1 - 19 Jan. 08 * - * @see org.onelab.filter.Filter The general behavior of a filter - * - * @see Summary cache: a scalable wide-area web cache sharing protocol */ public final class CountingBloomFilter extends Filter { /** Storage for the counting buckets */ diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java index 81d671bff43..cb62c73b541 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/DynamicBloomFilter.java @@ -81,10 +81,6 @@ import org.apache.hadoop.hbase.util.Hash; * * @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 Theory and Network Applications of Dynamic Bloom Filters */ public class DynamicBloomFilter extends Filter { /** diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java index 1a95d635353..1401479cf4b 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Filter.java @@ -69,12 +69,7 @@ import org.apache.hadoop.io.Writable; *

* 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 diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java index f0b8cc1fd45..bd1adbe5e6b 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/HashFunction.java @@ -56,14 +56,7 @@ import org.apache.hadoop.hbase.util.Hash; *

* 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 SHA-1 algorithm */ public final class HashFunction { /** The number of hashed values. */ diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java index 772390ace86..5576c4bbcee 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/Key.java @@ -55,8 +55,6 @@ import org.apache.hadoop.io.WritableComparable; /** * 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 */ diff --git a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java index e678b05e005..083d8f361ef 100644 --- a/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java +++ b/src/java/org/apache/hadoop/hbase/migration/nineteen/onelab/filter/RetouchedBloomFilter.java @@ -69,11 +69,6 @@ import org.apache.hadoop.hbase.util.Hash; * * @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 Retouched Bloom Filters: Allowing Networked Applications to Trade Off Selected False Positives Against False Negatives */ public final class RetouchedBloomFilter extends BloomFilter implements RemoveScheme {