incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1230561 - in /incubator/accumulo/branches/1.4/src: core/src/main/java/org/apache/accumulo/core/file/ core/src/main/java/org/apache/accumulo/core/file/map/ core/src/main/java/org/apache/accumulo/core/iterators/system/ core/src/test/java/org...
Date Thu, 12 Jan 2012 14:17:57 GMT
Author: vines
Date: Thu Jan 12 14:17:56 2012
New Revision: 1230561

URL: http://svn.apache.org/viewvc?rev=1230561&view=rev
Log:
fixes ACCUMULO-306

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
    incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
    incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
Thu Jan 12 14:17:56 2012
@@ -21,13 +21,13 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.file.blockfile.cache.BlockCache;
 import org.apache.accumulo.core.file.map.MapFileOperations;
-import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.file.rfile.RFileOperations;
 import org.apache.hadoop.conf.Configuration;
@@ -41,7 +41,7 @@ class DispatchingFileFactory extends Fil
     Path p = new Path(file);
     String name = p.getName();
     
-    if (name.startsWith(MyMapFile.EXTENSION + "_")) {
+    if (name.startsWith(Constants.MAPFILE_EXTENSION + "_")) {
       return new MapFileOperations();
     }
     
@@ -53,7 +53,7 @@ class DispatchingFileFactory extends Fil
     
     String extension = sp[1];
     
-    if (extension.equals(MyMapFile.EXTENSION) || extension.equals(MyMapFile.EXTENSION + "_tmp"))
{
+    if (extension.equals(Constants.MAPFILE_EXTENSION) || extension.equals(Constants.MAPFILE_EXTENSION
+ "_tmp")) {
       return new MapFileOperations();
     } else if (extension.equals(RFile.EXTENSION) || extension.equals(RFile.EXTENSION + "_tmp"))
{
       return new RFileOperations();
@@ -140,7 +140,7 @@ class DispatchingFileFactory extends Fil
 
 public abstract class FileOperations {
   
-  private static final HashSet<String> validExtensions = new HashSet<String>(Arrays.asList(MyMapFile.EXTENSION,
RFile.EXTENSION));
+  private static final HashSet<String> validExtensions = new HashSet<String>(Arrays.asList(Constants.MAPFILE_EXTENSION,
RFile.EXTENSION));
   
   public static Set<String> getValidExtensions() {
     return validExtensions;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
Thu Jan 12 14:17:56 2012
@@ -25,11 +25,12 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.Map.Entry;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.Key;
@@ -37,7 +38,6 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.map.MySequenceFile;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.system.MultiIterator;
@@ -51,6 +51,7 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.log4j.Logger;
 
+@SuppressWarnings("deprecation")
 public class FileUtil {
   
   public static class FileInfo {
@@ -120,7 +121,7 @@ public class FileUtil {
       
       start = end;
       
-      String newMapFile = String.format("%s/" + MyMapFile.EXTENSION + "_%04d", newDir, count++);
+      String newMapFile = String.format("%s/" + Constants.MAPFILE_EXTENSION + "_%04d", newDir,
count++);
       fs.mkdirs(new Path(newMapFile));
       
       Path outFile = new Path(String.format("%s/index", newMapFile));

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
Thu Jan 12 14:17:56 2012
@@ -41,6 +41,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile;
 
 public class MapFileOperations extends FileOperations {
   
@@ -144,7 +145,10 @@ public class MapFileOperations extends F
     return iter;
   }
   
-  @Override
+  /**
+   * @deprecated since 1.4
+   * @use org.apache.hadoop.io.MapFile.Writer
+   */
   public FileSKVWriter openWriter(final String file, final FileSystem fs, Configuration conf,
AccumuloConfiguration acuconf) throws IOException {
     final MyMapFile.Writer mfw = MapFileUtil.openMapFileWriter(acuconf, conf, fs, file);
     return new FileSKVWriter() {
@@ -193,9 +197,10 @@ public class MapFileOperations extends F
   
   @Override
   public long getFileSize(String file, FileSystem fs, Configuration conf, AccumuloConfiguration
acuconf) throws IOException {
-    return fs.getFileStatus(new Path(file + "/" + MyMapFile.DATA_FILE_NAME)).getLen();
+    return fs.getFileStatus(new Path(file + "/" + MapFile.DATA_FILE_NAME)).getLen();
   }
   
+  @SuppressWarnings("deprecation")
   @Override
   public FileSKVIterator openReader(String file, Range range, Set<ByteSequence> columnFamilies,
boolean inclusive, FileSystem fs, Configuration conf,
       AccumuloConfiguration tableConf) throws IOException {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
Thu Jan 12 14:17:56 2012
@@ -30,6 +30,13 @@ import org.apache.log4j.Logger;
 public class MapFileUtil {
   private static final Logger log = Logger.getLogger(MapFileUtil.class);
   
+  /**
+   * @deprecated since 1.4
+   * @param conf
+   * @param fs
+   * @param dirName
+   * @return
+   */
   public static boolean attemptToFixMapFile(Configuration conf, FileSystem fs, String dirName)
{
     boolean fixed = true;
     try {
@@ -49,6 +56,7 @@ public class MapFileUtil {
     return fixed;
   }
   
+  @SuppressWarnings("deprecation")
   public static MyMapFile.Reader openMapFile(AccumuloConfiguration acuconf, FileSystem fs,
String dirName, Configuration conf) throws IOException {
     MyMapFile.Reader mfr = null;
     try {
@@ -64,6 +72,7 @@ public class MapFileUtil {
     }
   }
   
+  @SuppressWarnings("deprecation")
   public static MySequenceFile.Reader openIndex(Configuration conf, FileSystem fs, Path mapFile)
throws IOException {
     Path indexPath = new Path(mapFile, MyMapFile.INDEX_FILE_NAME);
     MySequenceFile.Reader index = null;
@@ -80,6 +89,16 @@ public class MapFileUtil {
     }
   }
   
+  /**
+   * @deprecated sicne 1.4
+   * 
+   * @param acuTableConf
+   * @param conf
+   * @param fs
+   * @param dirname
+   * @return
+   * @throws IOException
+   */
   public static MyMapFile.Writer openMapFileWriter(AccumuloConfiguration acuTableConf, Configuration
conf, FileSystem fs, String dirname) throws IOException {
     MyMapFile.Writer mfw = null;
     int hbs = conf.getInt("io.seqfile.compress.blocksize", -1);

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
Thu Jan 12 14:17:56 2012
@@ -71,10 +71,18 @@ import org.apache.log4j.Logger;
  * <p>
  * Map files are created by adding entries in-order. To maintain a large 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 MySequenceFile.Sorter}.
+ * 
+ * 
+ * @deprecated since 1.4
+ * @use org.apache.accumulo.core.file.rfile.RFile
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MyMapFile {
   
+  /**
+   * @deprecated since 1.4
+   * @use org.apache.accumulo.core.Constants.MAPFILE_EXTENSION
+   */
   public static final String EXTENSION = "map";
   
   private static final Logger log = Logger.getLogger(MyMapFile.class);
@@ -113,7 +121,6 @@ public class MyMapFile {
     private WritableComparable lastKey;
     
     /** Create the named map for keys of the named class. */
-    @SuppressWarnings("deprecation")
     public Writer(Configuration conf, FileSystem fs, String dirName, Class keyClass, Class
valClass) throws IOException {
       this(conf, fs, dirName, WritableComparator.get(keyClass), valClass, MySequenceFile.getCompressionType(conf));
     }
@@ -136,7 +143,6 @@ public class MyMapFile {
     }
     
     /** Create the named map using the named key comparator. */
-    @SuppressWarnings("deprecation")
     public Writer(Configuration conf, FileSystem fs, String dirName, WritableComparator comparator,
Class valClass) throws IOException {
       this(conf, fs, dirName, comparator, valClass, MySequenceFile.getCompressionType(conf));
     }

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
Thu Jan 12 14:17:56 2012
@@ -192,6 +192,8 @@ import org.apache.hadoop.util.Reflection
  * </p>
  * 
  * @see CompressionCodec
+ * @deprecated since 1.4
+ * @use org.apache.accumulo.core.file.rfile.RFile
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MySequenceFile {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
Thu Jan 12 14:17:56 2012
@@ -32,6 +32,7 @@ import org.apache.accumulo.core.file.map
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
+@SuppressWarnings("deprecation")
 public class SequenceFileIterator implements FileSKVIterator {
   
   private Reader reader;

Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
Thu Jan 12 14:17:56 2012
@@ -20,14 +20,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Random;
 import java.util.Map.Entry;
+import java.util.Random;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.map.MySequenceFile;
 import org.apache.accumulo.core.file.map.MySequenceFile.CompressionType;
@@ -41,6 +38,9 @@ import org.apache.hadoop.io.LongWritable
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
+/**
+ * @deprecated since 1.4
+ */
 public class MapFileTest extends TestCase {
   private static final Logger log = Logger.getLogger(MapFileTest.class);
   

Modified: incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
(original)
+++ incubator/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
Thu Jan 12 14:17:56 2012
@@ -23,13 +23,12 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.map.MyMapFile.Reader;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 
+@SuppressWarnings("deprecation")
 public class DefaultIteratorEnvironment implements IteratorEnvironment {
   
   AccumuloConfiguration conf;

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
Thu Jan 12 14:17:56 2012
@@ -18,9 +18,6 @@ package org.apache.accumulo.examples.wik
 
 import java.io.IOException;
 
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
@@ -30,7 +27,10 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.util.CachedConfiguration;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 
+@SuppressWarnings("deprecation")
 public class DefaultIteratorEnvironment implements IteratorEnvironment {
   
   public Reader reserveMapFileReader(String mapFileName) throws IOException {

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
Thu Jan 12 14:17:56 2012
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.client.i
 import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.file.FileOperations;
-import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.util.CachedConfiguration;
@@ -64,6 +63,7 @@ import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 
@@ -208,10 +208,10 @@ public class BulkImport extends MasterRe
         }
       } else {
         // assume it is a map file
-        extension = MyMapFile.EXTENSION;
+        extension = Constants.MAPFILE_EXTENSION;
       }
       
-      if (extension.equals(MyMapFile.EXTENSION)) {
+      if (extension.equals(Constants.MAPFILE_EXTENSION)) {
         if (!fileStatus.isDir()) {
           log.warn(fileStatus.getPath() + " is not a map file, ignoring");
           continue;
@@ -222,7 +222,7 @@ public class BulkImport extends MasterRe
           continue;
         }
         try {
-          FileStatus dataStatus = fs.getFileStatus(new Path(fileStatus.getPath(), MyMapFile.DATA_FILE_NAME));
+          FileStatus dataStatus = fs.getFileStatus(new Path(fileStatus.getPath(), MapFile.DATA_FILE_NAME));
           if (dataStatus.isDir()) {
             log.warn(fileStatus.getPath() + " is not a map file, ignoring");
             continue;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/InMemoryMap.java
Thu Jan 12 14:17:56 2012
@@ -62,6 +62,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.log4j.Logger;
 
+@SuppressWarnings("deprecation")
 class MemKeyComparator implements Comparator<Key> {
   
   @Override
@@ -357,6 +358,7 @@ public class InMemoryMap {
           Configuration conf = CachedConfiguration.getInstance();
           FileSystem fs = TraceFileSystem.wrap(FileSystem.getLocal(conf));
           
+          @SuppressWarnings("deprecation")
           FileSKVIterator reader = new MapFileOperations.RangeIterator(new MyMapFile.Reader(fs,
memDumpFile, conf));
           
           readers.add(reader);
@@ -468,6 +470,7 @@ public class InMemoryMap {
   
   private boolean deleted = false;
   
+  @SuppressWarnings("deprecation")
   public void delete(long waitTime) {
     
     synchronized (this) {

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Thu Jan 12 14:17:56 2012
@@ -134,6 +134,7 @@ import cloudtrace.instrument.Trace;
  * 
  */
 
+@SuppressWarnings("deprecation")
 public class Tablet {
   
   enum MajorCompactionReason {

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
Thu Jan 12 14:17:56 2012
@@ -30,6 +30,10 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.Text;
 
+/**
+ * @deprecated since 1.4
+ * @see CreateRandomRFile
+ */
 public class CreateRandomMapFile {
   private static int num;
   private static String file;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java
Thu Jan 12 14:17:56 2012
@@ -24,9 +24,11 @@ import org.apache.accumulo.core.file.map
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-
 import org.apache.log4j.Logger;
 
+/**
+ * @deprecated since 1.4
+ */
 public class DumpMapFile {
   private static final Logger log = Logger.getLogger(DumpMapFile.class);
   

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
Thu Jan 12 14:17:56 2012
@@ -35,6 +35,9 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.Text;
 
+/**
+ * @deprecated since 1.4
+ */
 public class MMFITest {
   private static MyMapFile.Reader[] mapfiles = null;
   private static Text startRow;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java
Thu Jan 12 14:17:56 2012
@@ -36,6 +36,9 @@ import org.apache.hadoop.io.LongWritable
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableComparable;
 
+/**
+ * @deprecated since 1.4
+ */
 class MultipleIndexIterator2 {
   
   private MySequenceFile.Reader[] readers;
@@ -119,6 +122,9 @@ class MultipleIndexIterator2 {
   }
 }
 
+/**
+ * @deprecated since 1.4
+ */
 public class MidPointPerfTest2 {
   private static String dir;
   private static int numFiles;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
Thu Jan 12 14:17:56 2012
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.Random;
 import java.util.TreeSet;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
@@ -38,7 +39,6 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.FileOperations;
 import org.apache.accumulo.core.file.FileSKVWriter;
-import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
@@ -295,7 +295,7 @@ public class TestIngest {
       if (ingestArgs.outputToMapFile) {
         Configuration conf = CachedConfiguration.getInstance();
         FileSystem fs = FileSystem.get(conf);
-        writer = FileOperations.getInstance().openWriter(ingestArgs.outputFile + "." + MyMapFile.EXTENSION,
fs, conf,
+        writer = FileOperations.getInstance().openWriter(ingestArgs.outputFile + "." + Constants.MAPFILE_EXTENSION,
fs, conf,
             AccumuloConfiguration.getDefaultConfiguration());
         writer.startDefaultLocalityGroup();
       } else if (ingestArgs.outputToRFile) {

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkFileTest.java
Thu Jan 12 14:17:56 2012
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.file.FileOperations;
 import org.apache.accumulo.core.file.FileSKVWriter;
 import org.apache.accumulo.core.file.FileUtil;
-import org.apache.accumulo.core.file.map.MyMapFile;
 import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.trace.TraceFileSystem;
@@ -62,14 +61,16 @@ public class BulkFileTest extends Functi
     
     fs.delete(new Path(dir), true);
     
-    FileSKVWriter writer1 = FileOperations.getInstance().openWriter(dir + "/f1." + MyMapFile.EXTENSION,
fs, conf, ServerConfiguration.getSystemConfiguration());
+    FileSKVWriter writer1 = FileOperations.getInstance().openWriter(dir + "/f1." + Constants.MAPFILE_EXTENSION,
fs, conf,
+        ServerConfiguration.getSystemConfiguration());
     writer1.startDefaultLocalityGroup();
     writeData(writer1, 0, 333);
     writer1.close();
     
-    fs.rename(new Path(dir + "/f1." + MyMapFile.EXTENSION), new Path(dir + "/f1"));
+    fs.rename(new Path(dir + "/f1." + Constants.MAPFILE_EXTENSION), new Path(dir + "/f1"));
     
-    FileSKVWriter writer2 = FileOperations.getInstance().openWriter(dir + "/f2." + MyMapFile.EXTENSION,
fs, conf, ServerConfiguration.getSystemConfiguration());
+    FileSKVWriter writer2 = FileOperations.getInstance().openWriter(dir + "/f2." + Constants.MAPFILE_EXTENSION,
fs, conf,
+        ServerConfiguration.getSystemConfiguration());
     writer2.startDefaultLocalityGroup();
     writeData(writer2, 334, 999);
     writer2.close();

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
Thu Jan 12 14:17:56 2012
@@ -48,11 +48,12 @@ import org.apache.accumulo.server.tablet
 import org.apache.accumulo.server.util.MetadataTable;
 import org.apache.accumulo.server.zookeeper.IZooReaderWriter;
 import org.apache.accumulo.server.zookeeper.ZooLock;
-import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.server.zookeeper.ZooLock.LockLossReason;
 import org.apache.accumulo.server.zookeeper.ZooLock.LockWatcher;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.io.Text;
 
+@SuppressWarnings("deprecation")
 public class SplitRecoveryTest extends FunctionalTest {
   
   @Override

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java
Thu Jan 12 14:17:56 2012
@@ -30,6 +30,9 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
+/**
+ * @deprecated since 1.4
+ */
 public class CountDiskRows {
   
   private static final Logger log = Logger.getLogger(CountDiskRows.class);

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java
Thu Jan 12 14:17:56 2012
@@ -26,6 +26,9 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.Logger;
 
+/**
+ * @deprecated
+ */
 public class DumpMapFile {
   private static final Logger log = Logger.getLogger(DumpMapFile.class);
   

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java
Thu Jan 12 14:17:56 2012
@@ -29,6 +29,9 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.log4j.Logger;
 
+/**
+ * @deprecated since 1.4
+ */
 public class DumpTable {
   private static final Logger log = Logger.getLogger(DumpTable.class);
   

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java?rev=1230561&r1=1230560&r2=1230561&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java
Thu Jan 12 14:17:56 2012
@@ -43,6 +43,9 @@ import org.apache.hadoop.io.MapFile;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Text;
 
+/**
+ * @deprecated since 1.4
+ */
 public class MapFilePerformanceTest {
   
   public static String[] createMapFiles(String input, String output, int blocksize, int mapFiles)
throws IOException {



Mime
View raw message