Updated Branches: refs/heads/1.6.0-SNAPSHOT 739718253 -> e647b1b1b
ACCUMULO-1009 Clean up javadocs and warnings from prior commits Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e647b1b1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e647b1b1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e647b1b1 Branch: refs/heads/1.6.0-SNAPSHOT Commit: e647b1b1ba3c66c8a0fccd21c879f70c31476a69 Parents: 7397182 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Nov 19 18:39:29 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Nov 19 18:39:29 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapred/AccumuloOutputFormat.java | 6 +----- .../core/client/mapred/AccumuloRowInputFormat.java | 10 +++++----- .../client/mapreduce/AccumuloMultiTableInputFormat.java | 9 ++++++--- .../core/client/mapreduce/AccumuloOutputFormat.java | 8 ++------ .../core/client/mapreduce/AccumuloRowInputFormat.java | 6 +++--- .../accumulo/examples/simple/reservations/ARS.java | 8 ++++---- .../apache/accumulo/minicluster/MiniAccumuloConfig.java | 11 ++++++----- .../org/apache/accumulo/server/util/TServerUtils.java | 4 ---- 8 files changed, 27 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java index 6b418d6..eae6780 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java @@ -193,13 +193,9 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> { /** * Configures a {@link ZooKeeperInstance} for this job. - * + * * @param job * the Hadoop job instance to be configured - * @param instanceName - * the Accumulo instance name - * @param zooKeepers - * a comma-separated list of zookeeper servers * @param clientConfig * client configuration for specifying connection timeouts, SSL connection options, etc. * @since 1.6.0 http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java index 9c6189b..35ce7c7 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java @@ -43,7 +43,7 @@ import org.apache.hadoop.mapred.Reporter; * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)} * <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)} * <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf, Authorizations)} - * <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(JobConf, String, String, ClientConfiguration)} OR {@link AccumuloRowInputFormat#setMockInstance(JobConf, String)} + * <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(JobConf, ClientConfiguration)} OR {@link AccumuloRowInputFormat#setMockInstance(JobConf, String)} * </ul> * * Other static methods are optional. @@ -54,13 +54,13 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator log.setLevel(getLogLevel(job)); RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>> recordReader = new RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>>() { RowIterator rowIterator; - + @Override public void initialize(InputSplit inSplit, JobConf job) throws IOException { super.initialize(inSplit, job); rowIterator = new RowIterator(scannerIterator); } - + @Override public boolean next(Text key, PeekingIterator<Entry<Key,Value>> value) throws IOException { if (!rowIterator.hasNext()) @@ -70,12 +70,12 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator key.set((currentKey = value.peek().getKey()).getRow()); return true; } - + @Override public Text createKey() { return new Text(); } - + @Override public PeekingIterator<Entry<Key,Value>> createValue() { return new PeekingIterator<Entry<Key,Value>>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java index bd15447..e59abae 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java @@ -25,8 +25,11 @@ import java.util.Map; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.conf.ClientConfiguration; 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.util.format.DefaultFormatter; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.Job; @@ -40,9 +43,9 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; * The user must specify the following via static configurator methods: * * <ul> - * <li>{@link AccumuloMultiTableInputFormat#setConnectorInfo(Job, String, org.apache.accumulo.core.client.security.tokens.AuthenticationToken)} - * <li>{@link AccumuloMultiTableInputFormat#setScanAuthorizations(Job, org.apache.accumulo.core.security.Authorizations)} - * <li>{@link AccumuloMultiTableInputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloInputFormat#setMockInstance(Job, String)} + * <li>{@link AccumuloMultiTableInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} + * <li>{@link AccumuloMultiTableInputFormat#setScanAuthorizations(Job, Authorizations)} + * <li>{@link AccumuloMultiTableInputFormat#setZooKeeperInstance(Job, ClientConfiguration)} OR {@link AccumuloInputFormat#setMockInstance(Job, String)} * <li>{@link AccumuloMultiTableInputFormat#setInputTableConfigs(Job, Map)} * </ul> * http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java index 6782b4b..afbedca 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java @@ -193,13 +193,9 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> { /** * Configures a {@link ZooKeeperInstance} for this job. - * + * * @param job * the Hadoop job instance to be configured - * @param instanceName - * the Accumulo instance name - * @param zooKeepers - * a comma-separated list of zookeeper servers * @param clientConfig * client configuration for specifying connection timeouts, SSL connection options, etc. * @since 1.6.0 @@ -228,7 +224,7 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> { * the Hadoop context for the configured job * @return an Accumulo instance * @since 1.5.0 - * @see #setZooKeeperInstance(Job, String, String, ClientConfiguration) + * @see #setZooKeeperInstance(Job, ClientConfiguration) * @see #setMockInstance(Job, String) */ protected static Instance getInstance(JobContext context) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java index a52b098..4734eda 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java @@ -43,7 +43,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} * <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)} * <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job, Authorizations)} - * <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(Job, String, String, ClientConfiguration)} OR {@link AccumuloRowInputFormat#setMockInstance(Job, String)} + * <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(Job, ClientConfiguration)} OR {@link AccumuloRowInputFormat#setMockInstance(Job, String)} * </ul> * * Other static methods are optional. @@ -55,7 +55,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator log.setLevel(getLogLevel(context)); return new RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>>() { RowIterator rowIterator; - + @Override public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IOException { super.initialize(inSplit, attempt); @@ -63,7 +63,7 @@ public class AccumuloRowInputFormat extends InputFormatBase<Text,PeekingIterator currentK = new Text(); currentV = null; } - + @Override public boolean nextKeyValue() throws IOException, InterruptedException { if (!rowIterator.hasNext()) http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java index 0c51843..12365b6 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/reservations/ARS.java @@ -30,6 +30,7 @@ import org.apache.accumulo.core.client.IsolatedScanner; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.ClientConfiguration; import org.apache.accumulo.core.data.Condition; import org.apache.accumulo.core.data.ConditionalMutation; import org.apache.accumulo.core.data.Key; @@ -219,8 +220,8 @@ public class ARS { public List<String> list(String what, String when) throws Exception { String row = what + ":" + when; - - //its important to use an isolated scanner so that only whole mutations are seen + + // its important to use an isolated scanner so that only whole mutations are seen Scanner scanner = new IsolatedScanner(conn.createScanner(rTable, Authorizations.EMPTY)); scanner.setRange(new Range(row)); scanner.fetchColumnFamily(new Text("res")); @@ -285,7 +286,7 @@ public class ARS { } else if (tokens[0].equals("quit") && tokens.length == 1) { break; } else if (tokens[0].equals("connect") && tokens.length == 6 && ars == null) { - ZooKeeperInstance zki = new ZooKeeperInstance(tokens[1], tokens[2]); + ZooKeeperInstance zki = new ZooKeeperInstance(new ClientConfiguration().withInstance(tokens[1]).withZkHosts(tokens[2])); Connector conn = zki.getConnector(tokens[3], new PasswordToken(tokens[4])); if (conn.tableOperations().exists(tokens[5])) { ars = new ARS(conn, tokens[5]); @@ -304,5 +305,4 @@ public class ARS { } } } - } http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java index 5c7050a..1af2a1e 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java @@ -361,7 +361,7 @@ public class MiniAccumuloConfig { /** * @return location of client conf file containing connection parameters for connecting to this minicluster - * + * * @since 1.6.0 */ public File getClientConfFile() { @@ -385,8 +385,8 @@ public class MiniAccumuloConfig { } /** - * @return sets system properties set for service processes - * + * sets system properties set for service processes + * * @since 1.6.0 */ public void setSystemProperties(Map<String,String> systemProperties) { @@ -395,17 +395,18 @@ public class MiniAccumuloConfig { /** * @return a copy of the system properties for service processes - * + * * @since 1.6.0 */ public Map<String,String> getSystemProperties() { return new HashMap<String,String>(systemProperties); } - /* + /** * Gets the classpath elements to use when spawning processes. * * @return the classpathItems, if set + * * @since 1.6.0 */ public String[] getClasspathItems() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/e647b1b1/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java index eec64ef..502cbe3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java @@ -81,10 +81,6 @@ public class TServerUtils { * the name of the class that is providing the service * @param threadName * name this service's thread for better debugging - * @param portSearchProperty - * @param minThreadProperty - * @param timeBetweenThreadChecksProperty - * @param generalSslEnabled * @return the server object created, and the port actually used * @throws UnknownHostException * when we don't know our own address
