Return-Path: Delivered-To: apmail-hadoop-hbase-commits-archive@minotaur.apache.org Received: (qmail 44717 invoked from network); 31 Jan 2009 17:47:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Jan 2009 17:47:46 -0000 Received: (qmail 22295 invoked by uid 500); 31 Jan 2009 17:47:45 -0000 Delivered-To: apmail-hadoop-hbase-commits-archive@hadoop.apache.org Received: (qmail 22276 invoked by uid 500); 31 Jan 2009 17:47:45 -0000 Mailing-List: contact hbase-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hbase-dev@hadoop.apache.org Delivered-To: mailing list hbase-commits@hadoop.apache.org Received: (qmail 22267 invoked by uid 99); 31 Jan 2009 17:47:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Jan 2009 09:47:45 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Jan 2009 17:47:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F5FB238889C; Sat, 31 Jan 2009 17:47:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r739578 - in /hadoop/hbase/trunk: ./ src/java/org/apache/hadoop/hbase/io/ src/java/org/apache/hadoop/hbase/regionserver/ src/test/org/apache/hadoop/hbase/regionserver/ Date: Sat, 31 Jan 2009 17:47:16 -0000 To: hbase-commits@hadoop.apache.org From: jimk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090131174717.3F5FB238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jimk Date: Sat Jan 31 17:47:16 2009 New Revision: 739578 URL: http://svn.apache.org/viewvc?rev=739578&view=rev Log: HBASE-1164 Remove HBase private copy of SequenceFile (revert changes) Added: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/SequenceFile.java - copied unchanged from r736503, hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/SequenceFile.java Modified: hadoop/hbase/trunk/CHANGES.txt hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HBaseMapFile.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/MapFile.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java Modified: hadoop/hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/CHANGES.txt (original) +++ hadoop/hbase/trunk/CHANGES.txt Sat Jan 31 17:47:16 2009 @@ -33,7 +33,6 @@ HBASE-5121 Fix shell usage for format.width HBASE-845 HCM.isTableEnabled doesn't really tell if it is, or not HBASE-903 [shell] Can't set table descriptor attributes when I alter a table - HBASE-1164 Remove HBase private copy of SequenceFile HBASE-1166 saveVersion.sh doesn't work with git (Nitay Joffe via Stack) HBASE-1167 JSP doesn't work in a git checkout (Nitay Joffe via Andrew Purtell) Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java Sat Jan 31 17:47:16 2009 @@ -28,10 +28,10 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.hbase.util.Hash; +import org.apache.hadoop.hbase.io.SequenceFile; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.onelab.filter.BloomFilter; Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HBaseMapFile.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HBaseMapFile.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HBaseMapFile.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HBaseMapFile.java Sat Jan 31 17:47:16 2009 @@ -25,7 +25,6 @@ import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HStoreKey; import org.apache.hadoop.io.Writable; @@ -89,7 +88,7 @@ } @Override - protected SequenceFile.Reader createDataFileReader( + protected org.apache.hadoop.hbase.io.SequenceFile.Reader createDataFileReader( FileSystem fs, Path dataFile, Configuration conf) throws IOException { if (!blockCacheEnabled) { Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/MapFile.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/MapFile.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/MapFile.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/MapFile.java Sat Jan 31 17:47:16 2009 @@ -24,9 +24,9 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.*; import org.apache.hadoop.conf.*; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hadoop.hbase.io.SequenceFile.CompressionType; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Writable; @@ -52,7 +52,7 @@ * database, perform updates by copying the previous version of a database and * merging in a sorted change list, to create a new version of the database in * a new file. Sorting large change lists can be done with {@link - * org.apache.hadoop.io.SequenceFile.Sorter}. + * SequenceFile.Sorter}. */ public class MapFile { private static final Log LOG = LogFactory.getLog(MapFile.class); @@ -95,7 +95,7 @@ /** Create the named map for keys of the named class. */ public Writer(Configuration conf, FileSystem fs, String dirName, Class keyClass, Class valClass, - SequenceFile.CompressionType compress, Progressable progress) + CompressionType compress, Progressable progress) throws IOException { this(conf, fs, dirName, WritableComparator.get(keyClass), valClass, compress, progress); @@ -104,7 +104,7 @@ /** Create the named map for keys of the named class. */ public Writer(Configuration conf, FileSystem fs, String dirName, Class keyClass, Class valClass, - SequenceFile.CompressionType compress, CompressionCodec codec, + CompressionType compress, CompressionCodec codec, Progressable progress) throws IOException { this(conf, fs, dirName, WritableComparator.get(keyClass), valClass, @@ -114,7 +114,7 @@ /** Create the named map for keys of the named class. */ public Writer(Configuration conf, FileSystem fs, String dirName, Class keyClass, Class valClass, - SequenceFile.CompressionType compress) + CompressionType compress) throws IOException { this(conf, fs, dirName, WritableComparator.get(keyClass), valClass, compress); } @@ -168,7 +168,7 @@ this.index = SequenceFile.createWriter (fs, conf, indexFile, keyClass, LongWritable.class, - SequenceFile.CompressionType.BLOCK, progress); + CompressionType.BLOCK, progress); } /** The number of entries that are added before an index entry is added.*/ Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java Sat Jan 31 17:47:16 2009 @@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; @@ -59,6 +58,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.io.MapFile; +import org.apache.hadoop.hbase.io.SequenceFile; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.StringUtils; Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java (original) +++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java Sat Jan 31 17:47:16 2009 @@ -30,7 +30,6 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -39,6 +38,7 @@ import org.apache.hadoop.hbase.io.Reference; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.io.MapFile; +import org.apache.hadoop.hbase.io.SequenceFile; /** * A HStore data file. HStores usually have one or more of these files. They Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java?rev=739578&r1=739577&r2=739578&view=diff ============================================================================== --- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java (original) +++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java Sat Jan 31 17:47:16 2009 @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -32,6 +31,7 @@ import org.apache.hadoop.hbase.io.HalfMapFileReader; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.io.MapFile; +import org.apache.hadoop.hbase.io.SequenceFile; import org.apache.hadoop.hbase.io.Reference; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hdfs.MiniDFSCluster;