You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/02/28 23:31:03 UTC
svn commit: r1451401 [4/11] - in /accumulo/branches/1.5: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/cli/
core/src/main/java/org/apache/accumulo/core/client/
core/src/main/java/org/apache/accumulo/core/client/admin/
core/src/main/jav...
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java Thu Feb 28 22:31:00 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.format.DefaultFormatter;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.InputFormat;
@@ -37,7 +38,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, byte[])} OR {@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)} OR {@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
* <li>{@link AccumuloInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloInputFormat#setMockInstance(JobConf, String)}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java Thu Feb 28 22:31:00 2013
@@ -41,7 +41,7 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -61,7 +61,7 @@ import org.apache.log4j.Logger;
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, String, byte[])}
+ * <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)}
* <li>{@link AccumuloOutputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloOutputFormat#setMockInstance(JobConf, String)}
* </ul>
*
@@ -85,10 +85,10 @@ public class AccumuloOutputFormat implem
* a valid Accumulo user name (user must have Table.CREATE permission if {@link #setCreateTables(JobConf, boolean)} is set to true)
* @param token
* the user's password
- * @throws AccumuloSecurityException
+ * @throws AccumuloSecurityException
* @since 1.5.0
*/
- public static void setConnectorInfo(JobConf job, String principal, SecurityToken token) throws AccumuloSecurityException {
+ public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token) throws AccumuloSecurityException {
OutputConfigurator.setConnectorInfo(CLASS, job, principal, token);
}
@@ -96,12 +96,13 @@ public class AccumuloOutputFormat implem
* Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
* the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
* {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link TokenHelper#asBase64String(AccumuloToken)}.
+ * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
*
* @param job
* the Hadoop job instance to be configured
* @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AccumuloToken} with the user's authentication
+ * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
+ * authentication
* @since 1.5.0
*/
public static void setConnectorInfo(JobConf job, Path path) {
@@ -115,7 +116,7 @@ public class AccumuloOutputFormat implem
* the Hadoop context for the configured job
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, byte[])
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static Boolean isConnectorInfoSet(JobConf job) {
@@ -129,7 +130,7 @@ public class AccumuloOutputFormat implem
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, SecurityToken)
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static String getPrincipal(JobConf job) {
@@ -143,7 +144,7 @@ public class AccumuloOutputFormat implem
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, SecurityToken)
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static String getTokenClass(JobConf job) {
@@ -158,7 +159,7 @@ public class AccumuloOutputFormat implem
* the Hadoop context for the configured job
* @return the decoded user password
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, byte[])
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
*/
protected static byte[] getToken(JobConf job) {
return OutputConfigurator.getToken(CLASS, job);
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java Thu Feb 28 22:31:00 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.client.R
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -39,7 +40,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String, byte[])} OR {@link AccumuloRowInputFormat#setConnectorInfo(JobConf, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)} OR {@link AccumuloRowInputFormat#setConnectorInfo(JobConf, Path)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloRowInputFormat#setMockInstance(JobConf, String)}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java Thu Feb 28 22:31:00 2013
@@ -55,8 +55,8 @@ import org.apache.accumulo.core.data.Val
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.Credential;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.filecache.DistributedCache;
@@ -98,10 +98,10 @@ public abstract class InputFormatBase<K,
* a valid Accumulo user name (user must have Table.CREATE permission)
* @param token
* the user's password
- * @throws AccumuloSecurityException
+ * @throws AccumuloSecurityException
* @since 1.5.0
*/
- public static void setConnectorInfo(JobConf job, String principal, SecurityToken token) throws AccumuloSecurityException {
+ public static void setConnectorInfo(JobConf job, String principal, AuthenticationToken token) throws AccumuloSecurityException {
InputConfigurator.setConnectorInfo(CLASS, job, principal, token);
}
@@ -109,12 +109,13 @@ public abstract class InputFormatBase<K,
* Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
* the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
* {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link TokenHelper#asBase64String(AccumuloToken)}.
+ * {@link CredentialHelper#asBase64String(TCredentials)}.
*
* @param job
* the Hadoop job instance to be configured
* @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AccumuloToken} with the user's authentication
+ * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
+ * authentication
* @since 1.5.0
*/
public static void setConnectorInfo(JobConf job, Path path) {
@@ -128,7 +129,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, byte[])
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static Boolean isConnectorInfoSet(JobConf job) {
@@ -142,7 +143,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, SecurityToken)
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static String getUsername(JobConf job) {
@@ -156,7 +157,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, SecurityToken)
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
* @see #setConnectorInfo(JobConf, Path)
*/
protected static String getTokenClass(JobConf job) {
@@ -171,7 +172,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the decoded user password
* @since 1.5.0
- * @see #setConnectorInfo(JobConf, String, byte[])
+ * @see #setConnectorInfo(JobConf, String, AuthenticationToken)
*/
protected static byte[] getPassword(JobConf job) {
return InputConfigurator.getToken(CLASS, job);
@@ -593,8 +594,8 @@ public abstract class InputFormatBase<K,
log.debug("Creating scanner for table: " + getInputTableName(job));
log.debug("Authorizations are: " + authorizations);
if (isOfflineScan(job)) {
- scanner = new OfflineScanner(instance, new Credential(user, tokenClass, ByteBuffer.wrap(password), instance.getInstanceID()), Tables.getTableId(instance,
- getInputTableName(job)), authorizations);
+ scanner = new OfflineScanner(instance, new TCredentials(user, tokenClass, ByteBuffer.wrap(password), instance.getInstanceID()), Tables.getTableId(
+ instance, getInputTableName(job)), authorizations);
} else {
scanner = conn.createScanner(getInputTableName(job), authorizations);
}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java Thu Feb 28 22:31:00 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.format.DefaultFormatter;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapreduce.InputFormat;
@@ -37,7 +38,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, String, byte[])} OR {@link AccumuloInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloInputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloInputFormat#setMockInstance(Job, String)}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Thu Feb 28 22:31:00 2013
@@ -42,8 +42,8 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.tokens.PasswordToken;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.Path;
@@ -65,7 +65,7 @@ import org.apache.log4j.Logger;
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, String, byte[])} OR {@link AccumuloOutputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloOutputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloOutputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloOutputFormat#setMockInstance(Job, String)}
* </ul>
*
@@ -89,10 +89,10 @@ public class AccumuloOutputFormat extend
* a valid Accumulo user name (user must have Table.CREATE permission if {@link #setCreateTables(Job, boolean)} is set to true)
* @param token
* the user's password
- * @throws AccumuloSecurityException
+ * @throws AccumuloSecurityException
* @since 1.5.0
*/
- public static void setConnectorInfo(Job job, String principal, SecurityToken token) throws AccumuloSecurityException {
+ public static void setConnectorInfo(Job job, String principal, AuthenticationToken token) throws AccumuloSecurityException {
OutputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(), principal, token);
}
@@ -100,12 +100,13 @@ public class AccumuloOutputFormat extend
* Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
* the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
* {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link TokenHelper#asBase64String(AccumuloToken)}.
+ * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
*
* @param job
* the Hadoop job instance to be configured
* @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AccumuloToken} with the user's authentication
+ * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
+ * authentication
* @since 1.5.0
*/
public static void setConnectorInfo(Job job, Path path) {
@@ -119,7 +120,7 @@ public class AccumuloOutputFormat extend
* the Hadoop context for the configured job
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(Job, AccumuloToken)
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static Boolean isConnectorInfoSet(JobContext context) {
@@ -133,7 +134,7 @@ public class AccumuloOutputFormat extend
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, SecurityToken)
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static String getPrincipal(JobContext context) {
@@ -147,7 +148,7 @@ public class AccumuloOutputFormat extend
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, SecurityToken)
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static String getTokenClass(JobContext context) {
@@ -162,7 +163,7 @@ public class AccumuloOutputFormat extend
* the Hadoop context for the configured job
* @return the decoded user password
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, byte[])
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
*/
protected static byte[] getToken(JobContext context) {
return OutputConfigurator.getToken(CLASS, context.getConfiguration());
@@ -543,13 +544,13 @@ public class AccumuloOutputFormat extend
// ----------------------------------------------------------------------------------------------------
/**
- * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, byte[])}, {@link #setConnectorInfo(Job, Path)}, {@link #setCreateTables(Job, boolean)},
- * and {@link #setDefaultTableName(Job, String)} instead.
+ * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, AuthenticationToken)}, {@link #setConnectorInfo(Job, Path)},
+ * {@link #setCreateTables(Job, boolean)}, and {@link #setDefaultTableName(Job, String)} instead.
*/
@Deprecated
public static void setOutputInfo(Configuration conf, String user, byte[] passwd, boolean createTables, String defaultTable) {
try {
- OutputConfigurator.setConnectorInfo(CLASS, conf, user, new PasswordToken().setPassword(passwd));
+ OutputConfigurator.setConnectorInfo(CLASS, conf, user, new PasswordToken(passwd));
} catch (AccumuloSecurityException e) {
throw new RuntimeException(e);
}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java Thu Feb 28 22:31:00 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.client.R
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
@@ -39,7 +40,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, byte[])} OR {@link AccumuloRowInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloRowInputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloRowInputFormat#setMockInstance(Job, String)}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Thu Feb 28 22:31:00 2013
@@ -64,9 +64,9 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.tokens.PasswordToken;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.conf.Configuration;
@@ -111,10 +111,10 @@ public abstract class InputFormatBase<K,
* a valid Accumulo user name (user must have Table.CREATE permission)
* @param token
* the user's password
- * @throws AccumuloSecurityException
+ * @throws AccumuloSecurityException
* @since 1.5.0
*/
- public static void setConnectorInfo(Job job, String principal, SecurityToken token) throws AccumuloSecurityException {
+ public static void setConnectorInfo(Job job, String principal, AuthenticationToken token) throws AccumuloSecurityException {
InputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(), principal, token);
}
@@ -122,12 +122,13 @@ public abstract class InputFormatBase<K,
* Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
* the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
* {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link TokenHelper#asBase64String(AccumuloToken)}.
+ * {@link CredentialHelper#asBase64String(TCredentials)}.
*
* @param job
* the Hadoop job instance to be configured
* @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AccumuloToken} with the user's authentication
+ * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
+ * authentication
* @since 1.5.0
*/
public static void setConnectorInfo(Job job, Path path) {
@@ -141,7 +142,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, byte[])
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static Boolean isConnectorInfoSet(JobContext context) {
@@ -155,7 +156,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, SecurityToken)
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static String getPrincipal(JobContext context) {
@@ -169,7 +170,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the user name
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, SecurityToken)
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
* @see #setConnectorInfo(Job, Path)
*/
protected static String getTokenClass(JobContext context) {
@@ -184,7 +185,7 @@ public abstract class InputFormatBase<K,
* the Hadoop context for the configured job
* @return the decoded user password
* @since 1.5.0
- * @see #setConnectorInfo(Job, String, byte[])
+ * @see #setConnectorInfo(Job, String, AuthenticationToken)
*/
protected static byte[] getToken(JobContext context) {
return InputConfigurator.getToken(CLASS, context.getConfiguration());
@@ -609,8 +610,8 @@ public abstract class InputFormatBase<K,
log.debug("Creating scanner for table: " + getInputTableName(attempt));
log.debug("Authorizations are: " + authorizations);
if (isOfflineScan(attempt)) {
- scanner = new OfflineScanner(instance, new Credential(principal, tokenClass, ByteBuffer.wrap(token), instance.getInstanceID()), Tables.getTableId(instance,
- getInputTableName(attempt)), authorizations);
+ scanner = new OfflineScanner(instance, new TCredentials(principal, tokenClass, ByteBuffer.wrap(token), instance.getInstanceID()), Tables.getTableId(
+ instance, getInputTableName(attempt)), authorizations);
} else {
scanner = conn.createScanner(getInputTableName(attempt), authorizations);
}
@@ -1006,13 +1007,13 @@ public abstract class InputFormatBase<K,
}
/**
- * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, byte[])}, {@link #setInputTableName(Job, String)}, and
+ * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, AuthenticationToken)}, {@link #setInputTableName(Job, String)}, and
* {@link #setScanAuthorizations(Job, Authorizations)} instead.
*/
@Deprecated
public static void setInputInfo(Configuration conf, String user, byte[] passwd, String table, Authorizations auths) {
try {
- InputConfigurator.setConnectorInfo(CLASS, conf, user, new PasswordToken().setPassword(passwd));
+ InputConfigurator.setConnectorInfo(CLASS, conf, user, new PasswordToken(passwd));
} catch (AccumuloSecurityException e) {
throw new RuntimeException(e);
}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java Thu Feb 28 22:31:00 2013
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.I
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
@@ -95,10 +95,11 @@ public class ConfiguratorBase {
* a valid Accumulo user name
* @param token
* the user's password
- * @throws AccumuloSecurityException
+ * @throws AccumuloSecurityException
* @since 1.5.0
*/
- public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, String principal, SecurityToken token) throws AccumuloSecurityException {
+ public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, String principal, AuthenticationToken token)
+ throws AccumuloSecurityException {
if (isConnectorInfoSet(implementingClass, conf))
throw new IllegalStateException("Connector info for " + implementingClass.getSimpleName() + " can only be set once per job");
@@ -113,14 +114,15 @@ public class ConfiguratorBase {
* Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
* the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
* {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link TokenHelper#asBase64String(AccumuloToken)}.
+ * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
*
* @param implementingClass
* the class whose name will be used as a prefix for the property configuration key
* @param conf
* the Hadoop configuration object to configure
* @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AccumuloToken} with the user's authentication
+ * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
+ * authentication
* @since 1.5.0
*/
public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, Path path) {
@@ -144,7 +146,7 @@ public class ConfiguratorBase {
* the Hadoop configuration object to configure
* @return true if the connector info has already been set, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(Class, Configuration, String, byte[])
+ * @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
* @see #setConnectorInfo(Class, Configuration, Path)
*/
public static Boolean isConnectorInfoSet(Class<?> implementingClass, Configuration conf) {
@@ -160,13 +162,13 @@ public class ConfiguratorBase {
* the Hadoop configuration object to configure
* @return the principal
* @since 1.5.0
- * @see #setConnectorInfo(Class, Configuration, String, SecurityToken)
+ * @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
* @see #setConnectorInfo(Class, Configuration, Path)
*/
public static String getPrincipal(Class<?> implementingClass, Configuration conf) {
return conf.get(enumToConfKey(implementingClass, ConnectorInfo.PRINCIPAL));
}
-
+
/**
* Gets the serialized token class from the configuration.
*
@@ -176,7 +178,7 @@ public class ConfiguratorBase {
* the Hadoop configuration object to configure
* @return the principal
* @since 1.5.0
- * @see #setConnectorInfo(Class, Configuration, String, SecurityToken)
+ * @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
* @see #setConnectorInfo(Class, Configuration, Path)
*/
public static String getTokenClass(Class<?> implementingClass, Configuration conf) {
@@ -193,7 +195,7 @@ public class ConfiguratorBase {
* the Hadoop configuration object to configure
* @return the decoded principal's authentication token
* @since 1.5.0
- * @see #setConnectorInfo(Class, Configuration, String, byte[])
+ * @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
*/
public static byte[] getToken(Class<?> implementingClass, Configuration conf) {
return Base64.decodeBase64(conf.get(enumToConfKey(implementingClass, ConnectorInfo.TOKEN), "").getBytes(Charset.forName("UTF-8")));
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java Thu Feb 28 22:31:00 2013
@@ -48,7 +48,7 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.core.security.thrift.Credential;
+import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.TextUtil;
@@ -486,7 +486,7 @@ public class InputConfigurator extends C
String tokenClass = getTokenClass(implementingClass, conf);
byte[] token = getToken(implementingClass, conf);
String tableName = getInputTableName(implementingClass, conf);
- return TabletLocator.getInstance(instance, new Credential(principal, tokenClass, ByteBuffer.wrap(token), instance.getInstanceID()),
+ return TabletLocator.getInstance(instance, new TCredentials(principal, tokenClass, ByteBuffer.wrap(token), instance.getInstanceID()),
new Text(Tables.getTableId(instance, tableName)));
}
@@ -511,7 +511,7 @@ public class InputConfigurator extends C
// validate that we can connect as configured
try {
Connector c = getInstance(implementingClass, conf).getConnector(
- new Credential(getPrincipal(implementingClass, conf), getTokenClass(implementingClass, conf), ByteBuffer.wrap(getToken(implementingClass, conf)),
+ new TCredentials(getPrincipal(implementingClass, conf), getTokenClass(implementingClass, conf), ByteBuffer.wrap(getToken(implementingClass, conf)),
getInstance(implementingClass, conf).getInstanceID()));
if (!c.securityOperations().authenticateUser(getPrincipal(implementingClass, conf), CredentialHelper.extractToken(getTokenClass(implementingClass, conf), getToken(implementingClass, conf))))
throw new IOException("Unable to authenticate user");
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java Thu Feb 28 22:31:00 2013
@@ -30,8 +30,8 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.security.tokens.PasswordToken;
-import org.apache.hadoop.io.Text;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.io.Text;
public class MockAccumulo {
final Map<String,MockTable> tables = new HashMap<String,MockTable>();
@@ -44,7 +44,7 @@ public class MockAccumulo {
}
{
- MockUser root = new MockUser("root", new PasswordToken().setPassword(new byte[0]), Constants.NO_AUTHS);
+ MockUser root = new MockUser("root", new PasswordToken(new byte[0]), Constants.NO_AUTHS);
root.permissions.add(SystemPermission.SYSTEM);
users.put(root.name, root);
createTable("root", Constants.METADATA_TABLE_NAME, true, TimeType.LOGICAL);
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java Thu Feb 28 22:31:00 2013
@@ -38,13 +38,11 @@ public class MockConnector extends Conne
private final MockAccumulo acu;
private final Instance instance;
- MockConnector(String username, Instance instance) {
+ MockConnector(String username, MockInstance instance) {
this(username, new MockAccumulo(MockInstance.getDefaultFileSystem()), instance);
}
- @SuppressWarnings("deprecation")
- // Not really deprecated, just discouraging client use.
- MockConnector(String username, MockAccumulo acu, Instance instance) {
+ MockConnector(String username, MockAccumulo acu, MockInstance instance) {
this.username = username;
this.acu = acu;
this.instance = instance;
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java Thu Feb 28 22:31:00 2013
@@ -31,10 +31,10 @@ import org.apache.accumulo.core.conf.Acc
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.handler.ZKAuthenticator;
import org.apache.accumulo.core.security.thrift.AuthInfo;
-import org.apache.accumulo.core.security.thrift.Credential;
import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.tokens.PasswordToken;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.TextUtil;
@@ -118,7 +118,7 @@ public class MockInstance implements Ins
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
- return getConnector(user, new PasswordToken().setPassword(pass));
+ return getConnector(user, new PasswordToken(pass));
}
@Override
@@ -145,6 +145,7 @@ public class MockInstance implements Ins
this.conf = conf;
}
+ @Deprecated
@Override
public Connector getConnector(AuthInfo auth) throws AccumuloException, AccumuloSecurityException {
return getConnector(auth.user, auth.password);
@@ -156,17 +157,17 @@ public class MockInstance implements Ins
}
@Override
- public Connector getConnector(String principal, SecurityToken token) throws AccumuloException, AccumuloSecurityException {
+ public Connector getConnector(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
Connector conn = new MockConnector(principal, acu, this);
if (!acu.users.containsKey(principal))
- conn.securityOperations().createUser(principal, token);
+ conn.securityOperations().createLocalUser(principal, (PasswordToken) token);
else if (!acu.users.get(principal).token.equals(token))
- throw new AccumuloSecurityException(principal, SecurityErrorCode.BAD_CREDENTIALS);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.BAD_CREDENTIALS);
return conn;
}
@Override
- public Connector getConnector(Credential credential) throws AccumuloException, AccumuloSecurityException {
+ public Connector getConnector(TCredentials credential) throws AccumuloException, AccumuloSecurityException {
return getConnector(credential.principal, CredentialHelper.extractToken(credential));
}
}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java Thu Feb 28 22:31:00 2013
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.tokens.PasswordToken;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
public class MockSecurityOperations implements SecurityOperations {
@@ -37,135 +37,149 @@ public class MockSecurityOperations impl
this.acu = acu;
}
- /**
- * @deprecated Use {@link #createUser(String,byte[])} instead
- */
+ @Deprecated
@Override
public void createUser(String user, byte[] password, Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
- this.acu.users.put(user, new MockUser(user, new PasswordToken().setPassword(password), authorizations));
+ createLocalUser(user, new PasswordToken(password));
+ changeUserAuthorizations(user, authorizations);
}
@Override
- public void createUser(String user, SecurityToken token) throws AccumuloException, AccumuloSecurityException {
- this.acu.users.put(user, new MockUser(user, token, new Authorizations()));
+ public void createLocalUser(String principal, PasswordToken password) throws AccumuloException, AccumuloSecurityException {
+ this.acu.users.put(principal, new MockUser(principal, password, new Authorizations()));
}
+ @Deprecated
+ @Override
public void dropUser(String user) throws AccumuloException, AccumuloSecurityException {
- this.acu.users.remove(user);
+ dropLocalUser(user);
+ }
+
+ @Override
+ public void dropLocalUser(String principal) throws AccumuloException, AccumuloSecurityException {
+ this.acu.users.remove(principal);
}
+ @Deprecated
@Override
- public boolean authenticateUser(String name, byte[] password) throws AccumuloException, AccumuloSecurityException {
- return authenticateUser(name, new PasswordToken().setPassword(password));
+ public boolean authenticateUser(String user, byte[] password) throws AccumuloException, AccumuloSecurityException {
+ return authenticateUser(user, new PasswordToken(password));
}
@Override
- public boolean authenticateUser(String name, SecurityToken token) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public boolean authenticateUser(String principal, AuthenticationToken token) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user == null)
return false;
return user.token.equals(token);
}
+ @Deprecated
@Override
- public void changeLoginInfo(String name, SecurityToken token) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
- if (user != null)
- user.token = token.clone();
- else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ public void changeUserPassword(String user, byte[] password) throws AccumuloException, AccumuloSecurityException {
+ changeLocalUserPassword(user, new PasswordToken(password));
}
@Override
- public void changeUserPassword(String name, byte[] password) throws AccumuloException, AccumuloSecurityException {
- changeLoginInfo(name, new PasswordToken().setPassword(password));
+ public void changeLocalUserPassword(String principal, PasswordToken token) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
+ if (user != null)
+ user.token = token.clone();
+ else
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public void changeUserAuthorizations(String name, Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public void changeUserAuthorizations(String principal, Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user != null)
user.authorizations = authorizations;
else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public Authorizations getUserAuthorizations(String name) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public Authorizations getUserAuthorizations(String principal) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user != null)
return user.authorizations;
else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public boolean hasSystemPermission(String name, SystemPermission perm) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public boolean hasSystemPermission(String principal, SystemPermission perm) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user != null)
return user.permissions.contains(perm);
else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public boolean hasTablePermission(String name, String tableName, TablePermission perm) throws AccumuloException, AccumuloSecurityException {
+ public boolean hasTablePermission(String principal, String tableName, TablePermission perm) throws AccumuloException, AccumuloSecurityException {
MockTable table = acu.tables.get(tableName);
if (table == null)
throw new AccumuloSecurityException(tableName, SecurityErrorCode.TABLE_DOESNT_EXIST);
- EnumSet<TablePermission> perms = table.userPermissions.get(name);
+ EnumSet<TablePermission> perms = table.userPermissions.get(principal);
if (perms == null)
return false;
return perms.contains(perm);
}
@Override
- public void grantSystemPermission(String name, SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public void grantSystemPermission(String principal, SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user != null)
user.permissions.add(permission);
else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public void grantTablePermission(String name, String tableName, TablePermission permission) throws AccumuloException, AccumuloSecurityException {
- if (acu.users.get(name) == null)
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ public void grantTablePermission(String principal, String tableName, TablePermission permission) throws AccumuloException, AccumuloSecurityException {
+ if (acu.users.get(principal) == null)
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
MockTable table = acu.tables.get(tableName);
if (table == null)
throw new AccumuloSecurityException(tableName, SecurityErrorCode.TABLE_DOESNT_EXIST);
- EnumSet<TablePermission> perms = table.userPermissions.get(name);
+ EnumSet<TablePermission> perms = table.userPermissions.get(principal);
if (perms == null)
- table.userPermissions.put(name, EnumSet.of(permission));
+ table.userPermissions.put(principal, EnumSet.of(permission));
else
perms.add(permission);
}
@Override
- public void revokeSystemPermission(String name, SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
- MockUser user = acu.users.get(name);
+ public void revokeSystemPermission(String principal, SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
+ MockUser user = acu.users.get(principal);
if (user != null)
user.permissions.remove(permission);
else
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
}
@Override
- public void revokeTablePermission(String name, String tableName, TablePermission permission) throws AccumuloException, AccumuloSecurityException {
- if (acu.users.get(name) == null)
- throw new AccumuloSecurityException(name, SecurityErrorCode.USER_DOESNT_EXIST);
+ public void revokeTablePermission(String principal, String tableName, TablePermission permission) throws AccumuloException, AccumuloSecurityException {
+ if (acu.users.get(principal) == null)
+ throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST);
MockTable table = acu.tables.get(tableName);
if (table == null)
throw new AccumuloSecurityException(tableName, SecurityErrorCode.TABLE_DOESNT_EXIST);
- EnumSet<TablePermission> perms = table.userPermissions.get(name);
+ EnumSet<TablePermission> perms = table.userPermissions.get(principal);
if (perms != null)
perms.remove(permission);
}
+ @Deprecated
@Override
public Set<String> listUsers() throws AccumuloException, AccumuloSecurityException {
+ return listLocalUsers();
+ }
+
+ @Override
+ public Set<String> listLocalUsers() throws AccumuloException, AccumuloSecurityException {
return acu.users.keySet();
}
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java Thu Feb 28 22:31:00 2013
@@ -20,15 +20,15 @@ import java.util.EnumSet;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.SystemPermission;
-import org.apache.accumulo.core.security.tokens.SecurityToken;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
public class MockUser {
final EnumSet<SystemPermission> permissions;
final String name;
- SecurityToken token;
+ AuthenticationToken token;
Authorizations authorizations;
- MockUser(String principal, SecurityToken token, Authorizations auths) {
+ MockUser(String principal, AuthenticationToken token, Authorizations auths) {
this.name = principal;
this.token = token.clone();
this.authorizations = auths;
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Thu Feb 28 22:31:00 2013
@@ -37,18 +37,17 @@ import com.beust.jcommander.Parameter;
public class PrintInfo {
static class Opts extends Help {
- @Parameter(names={"-d", "--dump"}, description="dump the key/value pairs")
+ @Parameter(names = {"-d", "--dump"}, description = "dump the key/value pairs")
boolean dump = false;
- @Parameter(names={"--historgram"}, description="print a histogram of the key-value sizes")
+ @Parameter(names = {"--historgram"}, description = "print a histogram of the key-value sizes")
boolean histogram = false;
- @Parameter(description=" <file> { <file> ... }")
+ @Parameter(description = " <file> { <file> ... }")
List<String> files = new ArrayList<String>();
}
public static void main(String[] args) throws Exception {
Configuration conf = new Configuration();
@SuppressWarnings("deprecation")
- //Not for client use
FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration());
Opts opts = new Opts();
opts.parseArgs(PrintInfo.class.getName(), args);
@@ -60,7 +59,7 @@ public class PrintInfo {
long countBuckets[] = new long[11];
long sizeBuckets[] = new long[countBuckets.length];
long totalSize = 0;
-
+
for (String arg : opts.files) {
Path path = new Path(arg);
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Thu Feb 28 22:31:00 2013
@@ -34,29 +34,28 @@ public class PrintInfo {
FSDataInputStream fsin = fs.open(path);
BCFile.Reader bcfr = null;
try {
- bcfr = new BCFile.Reader(fsin, fs.getFileStatus(path).getLen(), conf);
-
- Set<Entry<String,MetaIndexEntry>> es = bcfr.metaIndex.index.entrySet();
-
- for (Entry<String,MetaIndexEntry> entry : es) {
- PrintStream out = System.out;
- out.println("Meta block : " + entry.getKey());
- out.println(" Raw size : " + String.format("%,d", entry.getValue().getRegion().getRawSize()) + " bytes");
- out.println(" Compressed size : " + String.format("%,d", entry.getValue().getRegion().getCompressedSize()) + " bytes");
- out.println(" Compression type : " + entry.getValue().getCompressionAlgorithm().getName());
- out.println();
- }
+ bcfr = new BCFile.Reader(fsin, fs.getFileStatus(path).getLen(), conf);
+
+ Set<Entry<String,MetaIndexEntry>> es = bcfr.metaIndex.index.entrySet();
+
+ for (Entry<String,MetaIndexEntry> entry : es) {
+ PrintStream out = System.out;
+ out.println("Meta block : " + entry.getKey());
+ out.println(" Raw size : " + String.format("%,d", entry.getValue().getRegion().getRawSize()) + " bytes");
+ out.println(" Compressed size : " + String.format("%,d", entry.getValue().getRegion().getCompressedSize()) + " bytes");
+ out.println(" Compression type : " + entry.getValue().getCompressionAlgorithm().getName());
+ out.println();
+ }
} finally {
- if (bcfr != null) {
- bcfr.close();
- }
+ if (bcfr != null) {
+ bcfr.close();
+ }
}
}
public static void main(String[] args) throws Exception {
Configuration conf = new Configuration();
@SuppressWarnings("deprecation")
- // Not for client use
FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration());
Path path = new Path(args[0]);
printMetaBlockInfo(conf, fs, path);
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1451401&r1=1451400&r2=1451401&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java Thu Feb 28 22:31:00 2013
@@ -50,13 +50,13 @@ import org.slf4j.LoggerFactory;
public interface Iface {
- public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException;
}
public interface AsyncIface {
- public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getStatus_call> resultHandler) throws org.apache.thrift.TException;
+ public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getStatus_call> resultHandler) throws org.apache.thrift.TException;
}
@@ -80,17 +80,17 @@ import org.slf4j.LoggerFactory;
super(iprot, oprot);
}
- public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
{
- send_getStatus(tinfo, credential);
+ send_getStatus(tinfo, credentials);
return recv_getStatus();
}
- public void send_getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential) throws org.apache.thrift.TException
+ public void send_getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
{
getStatus_args args = new getStatus_args();
args.setTinfo(tinfo);
- args.setCredential(credential);
+ args.setCredentials(credentials);
sendBase("getStatus", args);
}
@@ -125,27 +125,27 @@ import org.slf4j.LoggerFactory;
super(protocolFactory, clientManager, transport);
}
- public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential, org.apache.thrift.async.AsyncMethodCallback<getStatus_call> resultHandler) throws org.apache.thrift.TException {
+ public void getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getStatus_call> resultHandler) throws org.apache.thrift.TException {
checkReady();
- getStatus_call method_call = new getStatus_call(tinfo, credential, resultHandler, this, ___protocolFactory, ___transport);
+ getStatus_call method_call = new getStatus_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.accumulo.trace.thrift.TInfo tinfo;
- private org.apache.accumulo.core.security.thrift.Credential credential;
- public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.Credential credential, org.apache.thrift.async.AsyncMethodCallback<getStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ private org.apache.accumulo.core.security.thrift.TCredentials credentials;
+ public getStatus_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getStatus_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.tinfo = tinfo;
- this.credential = credential;
+ this.credentials = credentials;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getStatus", org.apache.thrift.protocol.TMessageType.CALL, 0));
getStatus_args args = new getStatus_args();
args.setTinfo(tinfo);
- args.setCredential(credential);
+ args.setCredentials(credentials);
args.write(prot);
prot.writeMessageEnd();
}
@@ -193,7 +193,7 @@ import org.slf4j.LoggerFactory;
public getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
getStatus_result result = new getStatus_result();
try {
- result.success = iface.getStatus(args.tinfo, args.credential);
+ result.success = iface.getStatus(args.tinfo, args.credentials);
} catch (org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) {
result.sec = sec;
}
@@ -207,7 +207,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatus_args");
private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.protocol.TField CREDENTIAL_FIELD_DESC = new org.apache.thrift.protocol.TField("credential", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -216,12 +216,12 @@ import org.slf4j.LoggerFactory;
}
public org.apache.accumulo.trace.thrift.TInfo tinfo; // required
- public org.apache.accumulo.core.security.thrift.Credential credential; // required
+ public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)2, "tinfo"),
- CREDENTIAL((short)1, "credential");
+ CREDENTIALS((short)1, "credentials");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -238,8 +238,8 @@ import org.slf4j.LoggerFactory;
switch(fieldId) {
case 2: // TINFO
return TINFO;
- case 1: // CREDENTIAL
- return CREDENTIAL;
+ case 1: // CREDENTIALS
+ return CREDENTIALS;
default:
return null;
}
@@ -285,8 +285,8 @@ import org.slf4j.LoggerFactory;
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class)));
- tmpMap.put(_Fields.CREDENTIAL, new org.apache.thrift.meta_data.FieldMetaData("credential", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.Credential.class)));
+ tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatus_args.class, metaDataMap);
}
@@ -296,11 +296,11 @@ import org.slf4j.LoggerFactory;
public getStatus_args(
org.apache.accumulo.trace.thrift.TInfo tinfo,
- org.apache.accumulo.core.security.thrift.Credential credential)
+ org.apache.accumulo.core.security.thrift.TCredentials credentials)
{
this();
this.tinfo = tinfo;
- this.credential = credential;
+ this.credentials = credentials;
}
/**
@@ -310,8 +310,8 @@ import org.slf4j.LoggerFactory;
if (other.isSetTinfo()) {
this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo);
}
- if (other.isSetCredential()) {
- this.credential = new org.apache.accumulo.core.security.thrift.Credential(other.credential);
+ if (other.isSetCredentials()) {
+ this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
}
}
@@ -322,7 +322,7 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
this.tinfo = null;
- this.credential = null;
+ this.credentials = null;
}
public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
@@ -349,27 +349,27 @@ import org.slf4j.LoggerFactory;
}
}
- public org.apache.accumulo.core.security.thrift.Credential getCredential() {
- return this.credential;
+ public org.apache.accumulo.core.security.thrift.TCredentials getCredentials() {
+ return this.credentials;
}
- public getStatus_args setCredential(org.apache.accumulo.core.security.thrift.Credential credential) {
- this.credential = credential;
+ public getStatus_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
+ this.credentials = credentials;
return this;
}
- public void unsetCredential() {
- this.credential = null;
+ public void unsetCredentials() {
+ this.credentials = null;
}
- /** Returns true if field credential is set (has been assigned a value) and false otherwise */
- public boolean isSetCredential() {
- return this.credential != null;
+ /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
+ public boolean isSetCredentials() {
+ return this.credentials != null;
}
- public void setCredentialIsSet(boolean value) {
+ public void setCredentialsIsSet(boolean value) {
if (!value) {
- this.credential = null;
+ this.credentials = null;
}
}
@@ -383,11 +383,11 @@ import org.slf4j.LoggerFactory;
}
break;
- case CREDENTIAL:
+ case CREDENTIALS:
if (value == null) {
- unsetCredential();
+ unsetCredentials();
} else {
- setCredential((org.apache.accumulo.core.security.thrift.Credential)value);
+ setCredentials((org.apache.accumulo.core.security.thrift.TCredentials)value);
}
break;
@@ -399,8 +399,8 @@ import org.slf4j.LoggerFactory;
case TINFO:
return getTinfo();
- case CREDENTIAL:
- return getCredential();
+ case CREDENTIALS:
+ return getCredentials();
}
throw new IllegalStateException();
@@ -415,8 +415,8 @@ import org.slf4j.LoggerFactory;
switch (field) {
case TINFO:
return isSetTinfo();
- case CREDENTIAL:
- return isSetCredential();
+ case CREDENTIALS:
+ return isSetCredentials();
}
throw new IllegalStateException();
}
@@ -443,12 +443,12 @@ import org.slf4j.LoggerFactory;
return false;
}
- boolean this_present_credential = true && this.isSetCredential();
- boolean that_present_credential = true && that.isSetCredential();
- if (this_present_credential || that_present_credential) {
- if (!(this_present_credential && that_present_credential))
+ boolean this_present_credentials = true && this.isSetCredentials();
+ boolean that_present_credentials = true && that.isSetCredentials();
+ if (this_present_credentials || that_present_credentials) {
+ if (!(this_present_credentials && that_present_credentials))
return false;
- if (!this.credential.equals(that.credential))
+ if (!this.credentials.equals(that.credentials))
return false;
}
@@ -478,12 +478,12 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCredential()).compareTo(typedOther.isSetCredential());
+ lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetCredential()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credential, typedOther.credential);
+ if (isSetCredentials()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
if (lastComparison != 0) {
return lastComparison;
}
@@ -516,11 +516,11 @@ import org.slf4j.LoggerFactory;
}
first = false;
if (!first) sb.append(", ");
- sb.append("credential:");
- if (this.credential == null) {
+ sb.append("credentials:");
+ if (this.credentials == null) {
sb.append("null");
} else {
- sb.append(this.credential);
+ sb.append(this.credentials);
}
first = false;
sb.append(")");
@@ -533,8 +533,8 @@ import org.slf4j.LoggerFactory;
if (tinfo != null) {
tinfo.validate();
}
- if (credential != null) {
- credential.validate();
+ if (credentials != null) {
+ credentials.validate();
}
}
@@ -581,11 +581,11 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 1: // CREDENTIAL
+ case 1: // CREDENTIALS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.credential = new org.apache.accumulo.core.security.thrift.Credential();
- struct.credential.read(iprot);
- struct.setCredentialIsSet(true);
+ struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+ struct.credentials.read(iprot);
+ struct.setCredentialsIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -605,9 +605,9 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.credential != null) {
- oprot.writeFieldBegin(CREDENTIAL_FIELD_DESC);
- struct.credential.write(oprot);
+ if (struct.credentials != null) {
+ oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
+ struct.credentials.write(oprot);
oprot.writeFieldEnd();
}
if (struct.tinfo != null) {
@@ -636,15 +636,15 @@ import org.slf4j.LoggerFactory;
if (struct.isSetTinfo()) {
optionals.set(0);
}
- if (struct.isSetCredential()) {
+ if (struct.isSetCredentials()) {
optionals.set(1);
}
oprot.writeBitSet(optionals, 2);
if (struct.isSetTinfo()) {
struct.tinfo.write(oprot);
}
- if (struct.isSetCredential()) {
- struct.credential.write(oprot);
+ if (struct.isSetCredentials()) {
+ struct.credentials.write(oprot);
}
}
@@ -658,9 +658,9 @@ import org.slf4j.LoggerFactory;
struct.setTinfoIsSet(true);
}
if (incoming.get(1)) {
- struct.credential = new org.apache.accumulo.core.security.thrift.Credential();
- struct.credential.read(iprot);
- struct.setCredentialIsSet(true);
+ struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+ struct.credentials.read(iprot);
+ struct.setCredentialsIsSet(true);
}
}
}