accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1456748 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/security/tokens/ core/src/mai...
Date Fri, 15 Mar 2013 02:29:40 GMT
Author: kturner
Date: Fri Mar 15 02:29:40 2013
New Revision: 1456748

URL: http://svn.apache.org/r1456748
Log:
ACCUMULO-765 Marked some of the new 1.5 APIs with @since javadoc tags

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/NullToken.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/SystemToken.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1456740-1456747

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1456740-1456747

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1456740-1456747

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java Fri
Mar 15 02:29:40 2013
@@ -57,6 +57,7 @@ public interface BatchScanner extends Sc
    * @param timeout
    * @param timeUnit
    *          determines how timeout is interpreted
+   * @since 1.5.0
    */
   @Override
   void setTimeout(long timeout, TimeUnit timeUnit);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
Fri Mar 15 02:29:40 2013
@@ -29,6 +29,8 @@ import org.apache.hadoop.util.StringUtil
 
 /**
  * This object holds configuration settings used to instantiate a {@link BatchWriter}
+ * 
+ * @since 1.5.0
  */
 public class BatchWriterConfig implements Writable {
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Connector.java Fri Mar
15 02:29:40 2013
@@ -88,6 +88,7 @@ public abstract class Connector {
    *          configuration used to create batch writer
    * @return BatchDeleter object for configuring and deleting
    * @throws TableNotFoundException
+   * @since 1.5.0
    */
   
   public abstract BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations,
int numQueryThreads, BatchWriterConfig config)
@@ -122,6 +123,7 @@ public abstract class Connector {
    *          configuration used to create batch writer
    * @return BatchWriter object for configuring and writing data to
    * @throws TableNotFoundException
+   * @since 1.5.0
    */
   
   public abstract BatchWriter createBatchWriter(String tableName, BatchWriterConfig config)
throws TableNotFoundException;
@@ -150,6 +152,7 @@ public abstract class Connector {
    * @param config
    *          configuration used to create multi-table batch writer
    * @return MultiTableBatchWriter object for configuring and writing data to
+   * @since 1.5.0
    */
   
   public abstract MultiTableBatchWriter createMultiTableBatchWriter(BatchWriterConfig config);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java Fri Mar
15 02:29:40 2013
@@ -155,7 +155,8 @@ public interface Instance {
   /**
    * @return the canonical name of the helper class for the security token from the authenticator,
if one exists.
    * @throws AccumuloException
-   * @throws AccumuloSecurityException 
+   * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   public abstract String getAuthenticatorClassName() throws AccumuloException, AccumuloSecurityException;
   
@@ -166,6 +167,7 @@ public interface Instance {
    *          {@link Authenticator#login(Properties)}
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException,
AccumuloSecurityException;
   
@@ -176,6 +178,7 @@ public interface Instance {
    *          The properties necessary to construct an AuthenticationToken in the current
security configuration
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   Connector getConnector(String principal, Properties props) throws AccumuloException, AccumuloSecurityException;
   
@@ -185,6 +188,7 @@ public interface Instance {
    *         required properties {@link Authenticator#getProperties()}
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   Authenticator getAuthenticator() throws AccumuloException, AccumuloSecurityException;
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
Fri Mar 15 02:29:40 2013
@@ -190,6 +190,9 @@ public class IteratorSetting implements 
     this(priority, name, iteratorClass.getName());
   }
   
+  /**
+   * @since 1.5.0
+   */
   public IteratorSetting(DataInput din) throws IOException {
     this.properties = new HashMap<String,String>();
     this.readFields(din);
@@ -308,6 +311,9 @@ public class IteratorSetting implements 
     
   }
   
+  /**
+   * @since 1.5.0
+   */
   @Override
   public void readFields(DataInput din) throws IOException {
     priority = WritableUtils.readVInt(din);
@@ -321,6 +327,9 @@ public class IteratorSetting implements 
     }
   }
   
+  /**
+   * @since 1.5.0
+   */
   @Override
   public void write(DataOutput dout) throws IOException {
     WritableUtils.writeVInt(dout, priority);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
Fri Mar 15 02:29:40 2013
@@ -93,8 +93,8 @@ public class MutationsRejectedException 
   }
   
   /**
-   * 
    * @return the internal mapping of keyextent mappings to SecurityErrorCode
+   * @since 1.5.0
    */
   public Map<KeyExtent,Set<SecurityErrorCode>> getAuthorizationFailuresMap()
{
     return af;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java Fri
Mar 15 02:29:40 2013
@@ -110,6 +110,7 @@ public interface ScannerBase extends Ite
    * @param timeOut
    * @param timeUnit
    *          determines how timeout is interpreted
+   * @since 1.5.0
    */
   public void setTimeout(long timeOut, TimeUnit timeUnit);
   
@@ -117,11 +118,13 @@ public interface ScannerBase extends Ite
    * Returns the setting for how long a scanner will automatically retry when a failure occurs.
    * 
    * @return the timeout configured for this scanner
+   * @since 1.5.0
    */
   public long getTimeout(TimeUnit timeUnit);
 
   /**
    * Closes any underlying connections on the scanner
+   * @since 1.5.0
    */
   public void close();
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
Fri Mar 15 02:29:40 2013
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.Set;
 
 /**
- * 
+ * @since 1.5.0
  */
 public class TimedOutException extends RuntimeException {
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
Fri Mar 15 02:29:40 2013
@@ -30,6 +30,7 @@ import org.apache.accumulo.core.data.thr
 
 /**
  * 
+ * @since 1.5.0
  */
 public class ActiveCompaction {
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
Fri Mar 15 02:29:40 2013
@@ -162,6 +162,7 @@ public class ActiveScan {
   
   /**
    * @return the authorizations being used for this scan
+   * @since 1.5.0
    */
   
   public Authorizations getAuthorizations() {
@@ -170,6 +171,7 @@ public class ActiveScan {
   
   /**
    * @return the time this scan has been idle in the tablet server
+   * @since 1.5.0
    */
   public long getIdleTime() {
     return idle;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
Fri Mar 15 02:29:40 2013
@@ -85,6 +85,7 @@ public interface InstanceOperations {
    * @return the list of active compactions
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   
   public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException,
AccumuloSecurityException;
@@ -95,6 +96,7 @@ public interface InstanceOperations {
    * @param tserver
    *          The tablet server address should be of the form <ip address>:<port>
    * @throws AccumuloException
+   * @since 1.5.0
    */
   public void ping(String tserver) throws AccumuloException;
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
Fri Mar 15 02:29:40 2013
@@ -107,6 +107,7 @@ public interface TableOperations {
    * @throws TableExistsException
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   public void importTable(String tableName, String importDir) throws TableExistsException,
AccumuloException, AccumuloSecurityException;
   
@@ -124,6 +125,7 @@ public interface TableOperations {
    * @throws TableNotFoundException
    * @throws AccumuloException
    * @throws AccumuloSecurityException
+   * @since 1.5.0
    */
   public void exportTable(String tableName, String exportDir) throws TableNotFoundException,
AccumuloException, AccumuloSecurityException;
 
@@ -162,7 +164,7 @@ public interface TableOperations {
    *           if a general error occurs
    * @throws AccumuloSecurityException
    *           if the user does not have permission
-   * @since 1.5
+   * @since 1.5.0
    */
   public Collection<Text> listSplits(String tableName) throws TableNotFoundException,
AccumuloSecurityException, AccumuloException;
   
@@ -189,6 +191,7 @@ public interface TableOperations {
    *           if the user does not have permission
    * @return the split points (end-row names) for the table's current split profile, grouped
into fewer splits so as not to exceed maxSplits
    * @throws TableNotFoundException
+   * @since 1.5.0
    */
   public Collection<Text> listSplits(String tableName, int maxSplits) throws TableNotFoundException,
AccumuloSecurityException, AccumuloException;
   
@@ -272,6 +275,7 @@ public interface TableOperations {
    *          when true, table memory is flushed before compaction starts
    * @param wait
    *          when true, the call will not return until compactions are finished
+   * @since 1.5.0
    */
   public void compact(String tableName, Text start, Text end, List<IteratorSetting>
iterators, boolean flush, boolean wait) throws AccumuloSecurityException,
       TableNotFoundException, AccumuloException;
@@ -289,6 +293,7 @@ public interface TableOperations {
    *           if the table does not exist
    * @throws AccumuloSecurityException
    *           if the user does not have permission
+   * @since 1.5.0
    */
   public void cancelCompaction(String tableName) throws AccumuloSecurityException, TableNotFoundException,
AccumuloException;
   
@@ -644,6 +649,7 @@ public interface TableOperations {
    * @throws AccumuloSecurityException
    *           thrown if the user doesn't have permission to add the constraint
    * @throws TableNotFoundException
+   * @since 1.5.0
    */
   public int addConstraint(String tableName, String constraintClassName) throws AccumuloException,
AccumuloSecurityException, TableNotFoundException;
   
@@ -657,6 +663,7 @@ public interface TableOperations {
    * @throws AccumuloException
    * @throws AccumuloSecurityException
    *           thrown if the user doesn't have permission to remove the constraint
+   * @since 1.5.0
    */
   public void removeConstraint(String tableName, int number) throws AccumuloException, AccumuloSecurityException;
   
@@ -669,6 +676,7 @@ public interface TableOperations {
    * @throws AccumuloException
    *           thrown if there are errors in the configuration of existing constraints
    * @throws TableNotFoundException
+   * @since 1.5.0
    */
   public Map<String,Integer> listConstraints(String tableName) throws AccumuloException,
TableNotFoundException;
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/AuthenticationToken.java
Fri Mar 15 02:29:40 2013
@@ -20,6 +20,9 @@ import javax.security.auth.Destroyable;
 
 import org.apache.hadoop.io.Writable;
 
+/**
+ * @since 1.5.0
+ */
 public interface AuthenticationToken extends Writable, Destroyable, Cloneable {
   public AuthenticationToken clone();
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/NullToken.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/NullToken.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/NullToken.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/NullToken.java
Fri Mar 15 02:29:40 2013
@@ -23,7 +23,7 @@ import java.io.IOException;
 import javax.security.auth.DestroyFailedException;
 
 /**
- * 
+ * @since 1.5.0
  */
 public class NullToken implements AuthenticationToken {
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
Fri Mar 15 02:29:40 2013
@@ -29,6 +29,10 @@ import org.apache.accumulo.core.util.Byt
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 
+/**
+ * @since 1.5.0
+ */
+
 public class PasswordToken implements AuthenticationToken {
   private byte[] password = null;
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/SystemToken.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/SystemToken.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/SystemToken.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/tokens/SystemToken.java
Fri Mar 15 02:29:40 2013
@@ -17,8 +17,9 @@
 package org.apache.accumulo.core.client.security.tokens;
 
 /**
- * 
+ * @since 1.5.0
  */
+
 public class SystemToken extends PasswordToken {
   
   public SystemToken(byte[] systemPassword) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java Fri Mar 15 02:29:40
2013
@@ -483,6 +483,7 @@ public class Key implements WritableComp
    * WARNING: using this method may inhibit performance since a new ColumnVisibility object
is created on every call.
    * 
    * @return A new object representing the column visibility field
+   * @since 1.5.0
    */
   public final ColumnVisibility getColumnVisibilityParsed() {
     return new ColumnVisibility(colVisibility);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Mutation.java?rev=1456748&r1=1456747&r2=1456748&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Mutation.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Mutation.java Fri Mar
15 02:29:40 2013
@@ -192,13 +192,19 @@ public class Mutation implements Writabl
     }
   }
   
-  public Mutation(byte[] byteBuffer) {
-    this(byteBuffer, 0, byteBuffer.length);
+  /**
+   * @since 1.5.0
+   */
+  public Mutation(byte[] row) {
+    this(row, 0, row.length);
   }
   
-  public Mutation(byte[] byteBuffer, int start, int length) {
+  /**
+   * @since 1.5.0
+   */
+  public Mutation(byte[] row, int start, int length) {
     this.row = new byte[length];
-    System.arraycopy(byteBuffer, start, this.row, 0, length);
+    System.arraycopy(row, start, this.row, 0, length);
     buffer = new ByteBuffer();
   }
   
@@ -231,13 +237,6 @@ public class Mutation implements Writabl
     return row;
   }
   
-  public static String toHexString(byte[] ba) {
-    StringBuilder str = new StringBuilder();
-    for (int i = 0; i < ba.length; i++)
-      str.append(String.format("%x", ba[i]));
-    return str.toString();
-  }
-
   private void put(byte b[]) {
     put(b, b.length);
   }
@@ -390,34 +389,58 @@ public class Mutation implements Writabl
     put(columnFamily, columnQualifier, columnVisibility.getExpression(), true, timestamp,
false, value);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void put(byte[] columnFamily, byte[] columnQualifier, byte[] value) {
     put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, false, value);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void put(byte[] columnFamily, byte[] columnQualifier, ColumnVisibility columnVisibility,
byte[] value) {
     put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, false,
value);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void put(byte[] columnFamily, byte[] columnQualifier, long timestamp, byte[] value)
{
     put(columnFamily, columnQualifier, EMPTY_BYTES, true, timestamp, false, value);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void put(byte[] columnFamily, byte[] columnQualifier, ColumnVisibility columnVisibility,
long timestamp, byte[] value) {
     put(columnFamily, columnQualifier, columnVisibility.getExpression(), true, timestamp,
false, value);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier) {
     put(columnFamily, columnQualifier, EMPTY_BYTES, false, 0l, true, EMPTY_BYTES);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier, ColumnVisibility columnVisibility)
{
     put(columnFamily, columnQualifier, columnVisibility.getExpression(), false, 0l, true,
EMPTY_BYTES);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier, long timestamp) {
     put(columnFamily, columnQualifier, EMPTY_BYTES, true, timestamp, true, EMPTY_BYTES);
   }
   
+  /**
+   * @since 1.5.0
+   */
   public void putDelete(byte[] columnFamily, byte[] columnQualifier, ColumnVisibility columnVisibility,
long timestamp) {
     put(columnFamily, columnQualifier, columnVisibility.getExpression(), true, timestamp,
true, EMPTY_BYTES);
   }

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1456740-1456747

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1456740-1456747

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1456740-1456747

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1456740-1456747

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1456740-1456747



Mime
View raw message