Author: stack
Date: Tue Aug 21 13:53:24 2007
New Revision: 568275
URL: http://svn.apache.org/viewvc?rev=568275&view=rev
Log:
HADOOP-1737 Make HColumnDescriptor data publically members settable
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
Use new HColumnDescriptor accessors rather than make direct accesses
M src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
(COMPRESSION_NONE, COMPRESSION_RECORD, COMPRESSION_BLOCK): Removed.
Use enum ordinals instead. Removed mapping between these defines and
enum equivalents. Made data members private and added accessors.
(DEFAULT_IN_MEMORY, DEFAULT_COMPRESSION_TYPE,
DEFAULT_BLOOM_FILTER_DESCRIPTOR, DEFAULT_MAX_VALUE_LENGTH): Added.
M hbase/src/test/org/apache/hadoop/hbase/TestToString.java
Fix because enum strings are upper-case (was expecting lowercase).
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=568275&r1=568274&r2=568275&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Aug 21 13:53:24 2007
@@ -16,6 +16,7 @@
HADOOP-1730 unexpected null value causes META scanner to exit (silently)
IMPROVEMENTS
+ HADOOP-1737 Make HColumnDescriptor data publically members settable
Below are the list of changes before 2007-08-18
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java?rev=568275&r1=568274&r2=568275&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
Tue Aug 21 13:53:24 2007
@@ -29,18 +29,16 @@
import org.apache.hadoop.io.WritableComparable;
/**
- * A HColumnDescriptor contains information about a column family such as the
+ * An HColumnDescriptor contains information about a column family such as the
* number of versions, compression settings, etc.
*/
public class HColumnDescriptor implements WritableComparable {
// For future backward compatibility
-
private static final byte COLUMN_DESCRIPTOR_VERSION = (byte)1;
// Legal family names can only contain 'word characters' and end in a colon.
-
- private static final Pattern LEGAL_FAMILY_NAME = Pattern.compile("\\w+:");
+ public static final Pattern LEGAL_FAMILY_NAME = Pattern.compile("\\w+:");
/**
* The type of compression.
@@ -55,22 +53,49 @@
BLOCK
}
- // Internal values for compression type used for serialization
+ /**
+ * Default compression type.
+ */
+ public static final CompressionType DEFAULT_COMPRESSION_TYPE =
+ CompressionType.NONE;
+
+ /**
+ * Default number of versions of a record to keep.
+ */
+ public static final int DEFAULT_N_VERSIONS = 3;
+
+ /**
+ * Default setting for whether to serve from memory or not.
+ */
+ public static final boolean DEFAULT_IN_MEMORY = false;
+
+ /**
+ * Default maximum length of cell contents.
+ */
+ public static final int DEFAULT_MAX_VALUE_LENGTH = Integer.MAX_VALUE;
+
+ /**
+ * Default bloom filter description.
+ */
+ public static final BloomFilterDescriptor DEFAULT_BLOOM_FILTER_DESCRIPTOR =
+ null;
- private static final byte COMPRESSION_NONE = (byte)0;
- private static final byte COMPRESSION_RECORD = (byte)1;
- private static final byte COMPRESSION_BLOCK = (byte)2;
-
- private static final int DEFAULT_N_VERSIONS = 3;
-
- Text name; // Column family name
- int maxVersions; // Number of versions to keep
- byte compressionType; // Compression setting if any
- boolean inMemory; // Serve reads from in-memory
cache
- int maxValueLength; // Maximum value size
- private boolean bloomFilterSpecified; // True if bloom filter was
specified
- BloomFilterDescriptor bloomFilter; // Descriptor of bloom filter
- byte versionNumber; // Version number of this class
+ // Column family name
+ private Text name;
+ // Number of versions to keep
+ private int maxVersions;
+ // Compression setting if any
+ private CompressionType compressionType;
+ // Serve reads from in-memory cache
+ private boolean inMemory;
+ // Maximum value size
+ private int maxValueLength;
+ // True if bloom filter was specified
+ private boolean bloomFilterSpecified;
+ // Descriptor of bloom filter
+ private BloomFilterDescriptor bloomFilter;
+ // Version number of this class
+ private byte versionNumber;
/**
* Default constructor. Must be present for Writable.
@@ -88,19 +113,20 @@
public HColumnDescriptor(String columnName) {
this(columnName == null || columnName.length() <= 0?
new Text(): new Text(columnName),
- DEFAULT_N_VERSIONS, CompressionType.NONE, false,
- Integer.MAX_VALUE, null);
+ DEFAULT_N_VERSIONS, DEFAULT_COMPRESSION_TYPE, DEFAULT_IN_MEMORY,
+ Integer.MAX_VALUE, DEFAULT_BLOOM_FILTER_DESCRIPTOR);
}
/**
- * Constructor - specify all parameters.
- * @param name - Column family name
- * @param maxVersions - Maximum number of versions to keep
- * @param compression - Compression type
- * @param inMemory - If true, column data should be kept in a
- * HRegionServer's cache
- * @param maxValueLength - Restrict values to <= this value
- * @param bloomFilter - Enable the specified bloom filter for this
column
+ * Constructor
+ * Specify all parameters.
+ * @param name Column family name
+ * @param maxVersions Maximum number of versions to keep
+ * @param compression Compression type
+ * @param inMemory If true, column data should be kept in an HRegionServer's
+ * cache
+ * @param maxValueLength Restrict values to <= this value
+ * @param bloomFilter Enable the specified bloom filter for this column
*
* @throws IllegalArgumentException if passed a family name that is made of
* other than 'word' characters: i.e. <code>[a-zA-Z_0-9]</code> and does not
@@ -129,24 +155,12 @@
throw new IllegalArgumentException("Maximum versions must be positive");
}
this.maxVersions = maxVersions;
-
- if(compression == CompressionType.NONE) {
- this.compressionType = COMPRESSION_NONE;
-
- } else if(compression == CompressionType.BLOCK) {
- this.compressionType = COMPRESSION_BLOCK;
-
- } else if(compression == CompressionType.RECORD) {
- this.compressionType = COMPRESSION_RECORD;
-
- } else {
- assert(false);
- }
this.inMemory = inMemory;
this.maxValueLength = maxValueLength;
this.bloomFilter = bloomFilter;
this.bloomFilterSpecified = this.bloomFilter == null ? false : true;
this.versionNumber = COLUMN_DESCRIPTOR_VERSION;
+ this.compressionType = compression;
}
/** @return name of column family */
@@ -156,21 +170,7 @@
/** @return compression type being used for the column family */
public CompressionType getCompression() {
- CompressionType value = null;
-
- if(this.compressionType == COMPRESSION_NONE) {
- value = CompressionType.NONE;
-
- } else if(this.compressionType == COMPRESSION_BLOCK) {
- value = CompressionType.BLOCK;
-
- } else if(this.compressionType == COMPRESSION_RECORD) {
- value = CompressionType.RECORD;
-
- } else {
- assert(false);
- }
- return value;
+ return this.compressionType;
}
/** @return maximum number of versions */
@@ -178,26 +178,40 @@
return this.maxVersions;
}
+ /**
+ * @return Compression type setting.
+ */
+ public CompressionType getCompressionType() {
+ return this.compressionType;
+ }
+
+ /**
+ * @return True if we are to keep all in use HRegionServer cache.
+ */
+ public boolean isInMemory() {
+ return this.inMemory;
+ }
+
+ /**
+ * @return Maximum value length.
+ */
+ public int getMaxValueLength() {
+ return this.maxValueLength;
+ }
+
+ /**
+ * @return Bloom filter descriptor or null if none set.
+ */
+ public BloomFilterDescriptor getBloomFilter() {
+ return this.bloomFilter;
+ }
+
/** [EMAIL PROTECTED] */
@Override
public String toString() {
- String compression = "none";
- switch(compressionType) {
- case COMPRESSION_NONE:
- break;
- case COMPRESSION_RECORD:
- compression = "record";
- break;
- case COMPRESSION_BLOCK:
- compression = "block";
- break;
- default:
- assert(false);
- }
-
return "(" + name + ", max versions: " + maxVersions + ", compression: "
- + compression + ", in memory: " + inMemory + ", max value length: "
- + maxValueLength + ", bloom filter: "
+ + this.compressionType + ", in memory: " + inMemory +
+ ", max value length: " + maxValueLength + ", bloom filter: "
+ (bloomFilterSpecified ? bloomFilter.toString() : "none") + ")";
}
@@ -212,7 +226,7 @@
public int hashCode() {
int result = this.name.hashCode();
result ^= Integer.valueOf(this.maxVersions).hashCode();
- result ^= Byte.valueOf(this.compressionType).hashCode();
+ result ^= this.compressionType.hashCode();
result ^= Boolean.valueOf(this.inMemory).hashCode();
result ^= Integer.valueOf(this.maxValueLength).hashCode();
result ^= Boolean.valueOf(this.bloomFilterSpecified).hashCode();
@@ -230,7 +244,8 @@
this.versionNumber = in.readByte();
this.name.readFields(in);
this.maxVersions = in.readInt();
- this.compressionType = in.readByte();
+ int ordinal = in.readInt();
+ this.compressionType = CompressionType.values()[ordinal];
this.inMemory = in.readBoolean();
this.maxValueLength = in.readInt();
this.bloomFilterSpecified = in.readBoolean();
@@ -246,7 +261,7 @@
out.writeByte(this.versionNumber);
this.name.write(out);
out.writeInt(this.maxVersions);
- out.writeByte(this.compressionType);
+ out.writeInt(this.compressionType.ordinal());
out.writeBoolean(this.inMemory);
out.writeInt(this.maxValueLength);
out.writeBoolean(this.bloomFilterSpecified);
@@ -274,8 +289,7 @@
}
if(result == 0) {
- result = Integer.valueOf(this.compressionType).compareTo(
- Integer.valueOf(other.compressionType));
+ result = this.compressionType.compareTo(other.compressionType);
}
if(result == 0) {
@@ -312,5 +326,4 @@
return result;
}
-
}
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java?rev=568275&r1=568274&r2=568275&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/HStore.java
Tue Aug 21 13:53:24 2007
@@ -157,7 +157,7 @@
fs.mkdirs(mapdir);
this.loginfodir = HStoreFile.getInfoDir(dir, regionName, familyName);
fs.mkdirs(loginfodir);
- if(family.bloomFilter == null) {
+ if(family.getBloomFilter() == null) {
this.filterDir = null;
this.bloomFilter = null;
} else {
@@ -329,7 +329,7 @@
LOG.debug("loading bloom filter for " + this.storeName);
}
- switch(family.bloomFilter.filterType) {
+ switch(family.getBloomFilter().filterType) {
case BloomFilterDescriptor.BLOOMFILTER:
bloomFilter = new BloomFilter();
@@ -351,21 +351,23 @@
LOG.debug("creating bloom filter for " + this.storeName);
}
- switch(family.bloomFilter.filterType) {
+ switch(family.getBloomFilter().filterType) {
case BloomFilterDescriptor.BLOOMFILTER:
- bloomFilter = new BloomFilter(family.bloomFilter.vectorSize,
- family.bloomFilter.nbHash);
+ bloomFilter = new BloomFilter(family.getBloomFilter().vectorSize,
+ family.getBloomFilter().nbHash);
break;
case BloomFilterDescriptor.COUNTING_BLOOMFILTER:
- bloomFilter = new CountingBloomFilter(family.bloomFilter.vectorSize,
- family.bloomFilter.nbHash);
+ bloomFilter =
+ new CountingBloomFilter(family.getBloomFilter().vectorSize,
+ family.getBloomFilter().nbHash);
break;
case BloomFilterDescriptor.RETOUCHED_BLOOMFILTER:
- bloomFilter = new RetouchedBloomFilter(family.bloomFilter.vectorSize,
- family.bloomFilter.nbHash);
+ bloomFilter =
+ new RetouchedBloomFilter(family.getBloomFilter().vectorSize,
+ family.getBloomFilter().nbHash);
}
}
}
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java?rev=568275&r1=568274&r2=568275&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestToString.java
Tue Aug 21 13:53:24 2007
@@ -48,20 +48,21 @@
htd.addFamily(new HColumnDescriptor("hankfamily:"));
htd.addFamily(new HColumnDescriptor(new Text("hankotherfamily:"), 10,
HColumnDescriptor.CompressionType.BLOCK, true, 1000, null));
+ System. out.println(htd.toString());
assertEquals("Table descriptor", "name: hank, families: "
- + "{hankfamily:=(hankfamily:, max versions: 3, compression: none, "
+ + "{hankfamily:=(hankfamily:, max versions: 3, compression: NONE, "
+ "in memory: false, max value length: 2147483647, bloom filter:
none), "
+ "hankotherfamily:=(hankotherfamily:, max versions: 10, "
- + "compression: block, in memory: true, max value length: 1000, "
+ + "compression: BLOCK, in memory: true, max value length: 1000, "
+ "bloom filter: none)}", htd.toString());
HRegionInfo hri = new HRegionInfo(-1, htd, new Text(), new Text("10"));
System.out.println(hri.toString());
assertEquals("HRegionInfo",
"regionname: hank,,-1, startKey: <>, tableDesc: {" + "name: hank, "
+ "families: {hankfamily:=(hankfamily:, max versions: 3, "
- + "compression: none, in memory: false, max value length: 2147483647, "
+ + "compression: NONE, in memory: false, max value length: 2147483647, "
+ "bloom filter: none), hankotherfamily:=(hankotherfamily:, "
- + "max versions: 10, compression: block, in memory: true, max value "
+ + "max versions: 10, compression: BLOCK, in memory: true, max value "
+ "length: 1000, bloom filter: none)}}",
hri.toString());
}
