incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1187055 - in /incubator/accumulo/trunk/src: core/src/main/java/org/apache/accumulo/core/Constants.java core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
Date Thu, 20 Oct 2011 21:28:45 GMT
Author: ecn
Date: Thu Oct 20 21:28:44 2011
New Revision: 1187055

URL: http://svn.apache.org/viewvc?rev=1187055&view=rev
Log:
ACCUMULO-47: put the classname aliases in trunk

Modified:
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1187055&r1=1187054&r2=1187055&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/Constants.java
Thu Oct 20 21:28:44 2011
@@ -151,7 +151,8 @@ public class Constants {
   public static final int CLIENT_RETRIES = 5;
   public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
   public static final String CORE_PACKAGE_NAME = "accumulo.core";
-  final public static String VALID_TABLE_NAME_REGEX = "^\\w+$";
+  public static final String OLD_PACKAGE_NAME = "cloudbase";
+  public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
   
   public static String getBaseDir(AccumuloConfiguration conf) {
     return conf.get(Property.INSTANCE_DFS_DIR);

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java?rev=1187055&r1=1187054&r2=1187055&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
Thu Oct 20 21:28:44 2011
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -50,6 +51,7 @@ import org.apache.hadoop.io.LongWritable
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
+import org.apache.hadoop.io.WritableName;
 import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.hadoop.io.compress.DefaultCodec;
 import org.apache.hadoop.util.Progressable;
@@ -252,6 +254,11 @@ public class MyMapFile {
   /** Provide access to an existing map. */
   public static class Reader implements FileSKVIterator {
     
+    static {
+      WritableName.setName(Key.class, Constants.OLD_PACKAGE_NAME + ".core.data.Key");
+      WritableName.setName(Value.class, Constants.OLD_PACKAGE_NAME + ".core.data.Value");
+    }
+    
     /**
      * Number of index entries to skip between each entry. Zero by default. Setting this
to values larger than zero can facilitate opening large map files using
      * less memory.

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java?rev=1187055&r1=1187054&r2=1187055&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
Thu Oct 20 21:28:44 2011
@@ -40,6 +40,7 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+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.KeyExtent;
@@ -66,6 +67,7 @@ import org.apache.hadoop.io.SequenceFile
 import org.apache.hadoop.io.SequenceFile.Metadata;
 import org.apache.hadoop.io.SequenceFile.Reader;
 import org.apache.hadoop.io.SequenceFile.Writer;
+import org.apache.hadoop.io.WritableName;
 import org.apache.hadoop.io.compress.DefaultCodec;
 import org.apache.thrift.TException;
 
@@ -79,6 +81,11 @@ import cloudtrace.thrift.TInfo;
 class LogWriter implements MutationLogger.Iface {
   static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LogWriter.class);
   
+  static {
+    WritableName.setName(LogFileKey.class, Constants.OLD_PACKAGE_NAME + ".server.logger.LogFileKey");
+    WritableName.setName(LogFileValue.class, Constants.OLD_PACKAGE_NAME + ".server.logger.LogFileValue");
+  }
+  
   static class LogWriteException extends RuntimeException {
     /**
          * 



Mime
View raw message