svn commit: r950124 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/
Author: elserj Date: Tue May 5 03:54:11 2015 New Revision: 950124 Log: Publishing svnmucc operation to accumulo site by elserj Added: websites/production/accumulo/content/ - copied from r950123, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r950123, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r950123, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r950123, websites/production/accumulo/content/1.6/apidocs/
svn commit: r950123 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot Date: Tue May 5 03:51:00 2015 New Revision: 950123 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue May 5 03:51:00 2015 @@ -1 +1 @@ -1672228 +1677735 Modified: websites/staging/accumulo/trunk/content/people.html == --- websites/staging/accumulo/trunk/content/people.html (original) +++ websites/staging/accumulo/trunk/content/people.html Tue May 5 03:51:00 2015 @@ -281,6 +281,7 @@ Latest 1.5 release: 1.5.2Tim Halloran Tim Reardon Travis Pinney + Tristen Georgiouhttp://phemi.com";>PHEMIPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) Vicky Kak Vikram Srivastavahttp://www.cloudera.com";>ClouderaPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7)
svn commit: r1677735 - /accumulo/site/trunk/content/people.mdtext
Author: elserj Date: Tue May 5 03:50:46 2015 New Revision: 1677735 URL: http://svn.apache.org/r1677735 Log: Add Tristen Georgiou to contributors Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1677735&r1=1677734&r2=1677735&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue May 5 03:50:46 2015 @@ -111,6 +111,7 @@ Contributors Tim Halloran Tim Reardon Travis Pinney + Tristen Georgiouhttp://phemi.com";>PHEMIPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) Vicky Kak Vikram Srivastavahttp://www.cloudera.com";>ClouderaPT (http://www.timeanddate.com/library/abbreviations/timezones/na/pst.html>-8 / http://www.timeanddate.com/library/abbreviations/timezones/na/pdt.html>-7) \ No newline at end of file
[1/2] accumulo git commit: ACCUMULO-3756 Remove extension of impl type by API type
Repository: accumulo
Updated Branches:
refs/heads/master ca02e85d1 -> 8cbaa0576
ACCUMULO-3756 Remove extension of impl type by API type
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83d1b838
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83d1b838
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83d1b838
Branch: refs/heads/master
Commit: 83d1b8388ad807d678c9a3a922e5025faa9a5933
Parents: 0bbc675
Author: Keith Turner
Authored: Thu Apr 30 19:37:02 2015 -0400
Committer: Keith Turner
Committed: Mon May 4 15:56:27 2015 -0400
--
.../core/client/mapred/AbstractInputFormat.java | 83 ++--
.../core/client/mapred/AccumuloInputFormat.java | 4 +-
.../client/mapreduce/AbstractInputFormat.java | 78 ++--
.../client/mapreduce/AccumuloInputFormat.java | 5 +-
.../core/client/mapreduce/RangeInputSplit.java | 411 +++--
.../mapreduce/impl/AccumuloInputSplit.java | 436 ---
.../client/mapreduce/impl/BatchInputSplit.java | 47 +-
.../core/client/mapreduce/impl/SplitUtils.java | 43 +-
8 files changed, 540 insertions(+), 567 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83d1b838/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index f2e3a79..cb3ef11 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -53,7 +53,6 @@ import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.client.impl.TabletLocator;
import org.apache.accumulo.core.client.mapred.impl.BatchInputSplit;
import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
-import org.apache.accumulo.core.client.mapreduce.impl.AccumuloInputSplit;
import org.apache.accumulo.core.client.mapreduce.impl.SplitUtils;
import org.apache.accumulo.core.client.mapreduce.lib.impl.ConfiguratorBase;
import org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator;
@@ -396,7 +395,7 @@ public abstract class AbstractInputFormat implements
InputFormat {
protected long numKeysRead;
protected Iterator> scannerIterator;
protected RangeInputSplit split;
-private org.apache.accumulo.core.client.mapreduce.impl.AccumuloInputSplit
aiSplit;
+private org.apache.accumulo.core.client.mapreduce.RangeInputSplit
baseSplit;
protected ScannerBase scannerBase;
@@ -423,7 +422,7 @@ public abstract class AbstractInputFormat implements
InputFormat {
* the table name for which the scanner is configured
* @since 1.7.0
*/
-private void setupIterators(JobConf job, ScannerBase scanner, String
tableName, AccumuloInputSplit split) {
+private void setupIterators(JobConf job, ScannerBase scanner, String
tableName, org.apache.accumulo.core.client.mapreduce.RangeInputSplit split) {
List iterators = null;
if (null == split) {
@@ -453,60 +452,75 @@ public abstract class AbstractInputFormat implements
InputFormat {
*/
@Deprecated
protected void setupIterators(JobConf job, Scanner scanner, String
tableName, RangeInputSplit split) {
- setupIterators(job, (ScannerBase) scanner, tableName,
(AccumuloInputSplit) split);
+ setupIterators(job, (ScannerBase) scanner, tableName, split);
}
/**
* Initialize a scanner over the given input split using this task attempt
configuration.
*/
public void initialize(InputSplit inSplit, JobConf job) throws IOException
{
- aiSplit = (AccumuloInputSplit) inSplit;
- log.debug("Initializing input split: " + aiSplit.toString());
+ baseSplit = (org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
inSplit;
+ log.debug("Initializing input split: " + baseSplit.toString());
- Instance instance = aiSplit.getInstance(getClientConfiguration(job));
+ Instance instance = baseSplit.getInstance(getClientConfiguration(job));
if (null == instance) {
instance = getInstance(job);
}
- String principal = aiSplit.getPrincipal();
+ String principal = baseSplit.getPrincipal();
if (null == principal) {
principal = getPrincipal(job);
}
- AuthenticationToken token = aiSplit.getToken();
+ AuthenticationToken token = baseSplit.getToken();
if (null == token) {
token = getAuthenticationToken(job);
}
- Authorizations authorizations = aiSplit.getAuths();
+ Authoriza
[2/2] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cbaa057 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8cbaa057 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8cbaa057 Branch: refs/heads/master Commit: 8cbaa05765d296b6799f47cfc7bd6fb313f40524 Parents: ca02e85 83d1b83 Author: Keith Turner Authored: Mon May 4 16:23:50 2015 -0400 Committer: Keith Turner Committed: Mon May 4 16:23:50 2015 -0400 -- .../core/client/mapred/AbstractInputFormat.java | 83 ++-- .../core/client/mapred/AccumuloInputFormat.java | 4 +- .../client/mapreduce/AbstractInputFormat.java | 78 ++-- .../client/mapreduce/AccumuloInputFormat.java | 5 +- .../core/client/mapreduce/RangeInputSplit.java | 411 +++-- .../mapreduce/impl/AccumuloInputSplit.java | 436 --- .../client/mapreduce/impl/BatchInputSplit.java | 47 +- .../core/client/mapreduce/impl/SplitUtils.java | 43 +- 8 files changed, 540 insertions(+), 567 deletions(-) --
accumulo git commit: ACCUMULO-3756 Remove extension of impl type by API type
Repository: accumulo
Updated Branches:
refs/heads/1.7 0bbc67594 -> 83d1b8388
ACCUMULO-3756 Remove extension of impl type by API type
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83d1b838
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83d1b838
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83d1b838
Branch: refs/heads/1.7
Commit: 83d1b8388ad807d678c9a3a922e5025faa9a5933
Parents: 0bbc675
Author: Keith Turner
Authored: Thu Apr 30 19:37:02 2015 -0400
Committer: Keith Turner
Committed: Mon May 4 15:56:27 2015 -0400
--
.../core/client/mapred/AbstractInputFormat.java | 83 ++--
.../core/client/mapred/AccumuloInputFormat.java | 4 +-
.../client/mapreduce/AbstractInputFormat.java | 78 ++--
.../client/mapreduce/AccumuloInputFormat.java | 5 +-
.../core/client/mapreduce/RangeInputSplit.java | 411 +++--
.../mapreduce/impl/AccumuloInputSplit.java | 436 ---
.../client/mapreduce/impl/BatchInputSplit.java | 47 +-
.../core/client/mapreduce/impl/SplitUtils.java | 43 +-
8 files changed, 540 insertions(+), 567 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83d1b838/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index f2e3a79..cb3ef11 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -53,7 +53,6 @@ import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.client.impl.TabletLocator;
import org.apache.accumulo.core.client.mapred.impl.BatchInputSplit;
import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
-import org.apache.accumulo.core.client.mapreduce.impl.AccumuloInputSplit;
import org.apache.accumulo.core.client.mapreduce.impl.SplitUtils;
import org.apache.accumulo.core.client.mapreduce.lib.impl.ConfiguratorBase;
import org.apache.accumulo.core.client.mapreduce.lib.impl.InputConfigurator;
@@ -396,7 +395,7 @@ public abstract class AbstractInputFormat implements
InputFormat {
protected long numKeysRead;
protected Iterator> scannerIterator;
protected RangeInputSplit split;
-private org.apache.accumulo.core.client.mapreduce.impl.AccumuloInputSplit
aiSplit;
+private org.apache.accumulo.core.client.mapreduce.RangeInputSplit
baseSplit;
protected ScannerBase scannerBase;
@@ -423,7 +422,7 @@ public abstract class AbstractInputFormat implements
InputFormat {
* the table name for which the scanner is configured
* @since 1.7.0
*/
-private void setupIterators(JobConf job, ScannerBase scanner, String
tableName, AccumuloInputSplit split) {
+private void setupIterators(JobConf job, ScannerBase scanner, String
tableName, org.apache.accumulo.core.client.mapreduce.RangeInputSplit split) {
List iterators = null;
if (null == split) {
@@ -453,60 +452,75 @@ public abstract class AbstractInputFormat implements
InputFormat {
*/
@Deprecated
protected void setupIterators(JobConf job, Scanner scanner, String
tableName, RangeInputSplit split) {
- setupIterators(job, (ScannerBase) scanner, tableName,
(AccumuloInputSplit) split);
+ setupIterators(job, (ScannerBase) scanner, tableName, split);
}
/**
* Initialize a scanner over the given input split using this task attempt
configuration.
*/
public void initialize(InputSplit inSplit, JobConf job) throws IOException
{
- aiSplit = (AccumuloInputSplit) inSplit;
- log.debug("Initializing input split: " + aiSplit.toString());
+ baseSplit = (org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
inSplit;
+ log.debug("Initializing input split: " + baseSplit.toString());
- Instance instance = aiSplit.getInstance(getClientConfiguration(job));
+ Instance instance = baseSplit.getInstance(getClientConfiguration(job));
if (null == instance) {
instance = getInstance(job);
}
- String principal = aiSplit.getPrincipal();
+ String principal = baseSplit.getPrincipal();
if (null == principal) {
principal = getPrincipal(job);
}
- AuthenticationToken token = aiSplit.getToken();
+ AuthenticationToken token = baseSplit.getToken();
if (null == token) {
token = getAuthenticationToken(job);
}
- Authorizations authorizations = aiSplit.getAuths();
+ Authorizations
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bbc6759
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bbc6759
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bbc6759
Branch: refs/heads/master
Commit: 0bbc67594b25954ed2cb3a2f04e45789a1c7691c
Parents: 12366d4 2b168f8
Author: Josh Elser
Authored: Mon May 4 14:09:31 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 14:09:31 2015 -0400
--
.../org/apache/accumulo/shell/commands/DUCommand.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bbc6759/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
index 3e851d4,000..2adcc81
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
@@@ -1,126 -1,0 +1,129 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.shell.commands;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.DiskUsage;
+import org.apache.accumulo.core.client.impl.Namespaces;
+import org.apache.accumulo.core.util.NumUtil;
+import org.apache.accumulo.shell.Shell;
+import org.apache.accumulo.shell.Shell.Command;
+import org.apache.accumulo.shell.ShellOptions;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+public class DUCommand extends Command {
+
+ private Option optTablePattern, optHumanReadble, optNamespace;
+
+ @Override
+ public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException, TableNotFoundException,
+ NamespaceNotFoundException {
+
+final SortedSet tables = new
TreeSet(Arrays.asList(cl.getArgs()));
+
+if (cl.hasOption(ShellOptions.tableOption)) {
- String tableName = cl.getOptionValue(ShellOptions.tableOption);
- if (!shellState.getConnector().tableOperations().exists(tableName)) {
- throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
- }
- tables.add(tableName);
++ tables.add(cl.getOptionValue(ShellOptions.tableOption));
+}
+
+if (cl.hasOption(optNamespace.getOpt())) {
+ Instance instance = shellState.getInstance();
+ String namespaceId = Namespaces.getNamespaceId(instance,
cl.getOptionValue(optNamespace.getOpt()));
+ tables.addAll(Namespaces.getTableNames(instance, namespaceId));
+}
+
+boolean prettyPrint = cl.hasOption(optHumanReadble.getOpt()) ? true :
false;
+
+// Add any patterns
+if (cl.hasOption(optTablePattern.getOpt())) {
+ for (String table : shellState.getConnector().tableOperations().list())
{
+if (table.matches(cl.getOptionValue(optTablePattern.getOpt( {
+ tables.add(table);
+}
+ }
+}
+
+// If we didn't get any tables, and we have a table selected, add the
current table
+if (tables.isEmpty() && !shellState.getTableName().isEmpty()) {
+ tables.add(shellState.getTableName());
+}
+
++// sanity check...make sure the user-specified tables exist
++for (String tableName : tables) {
++ if (!shellState.getConnector().tableOperations().exists(tableName)) {
++throw new TableNotFoundException(tableName, tableName, "specified
t
[6/6] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca02e85d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca02e85d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca02e85d Branch: refs/heads/master Commit: ca02e85d11b332edaef72cc64789cad9b73ceaba Parents: 5e15913 0bbc675 Author: Josh Elser Authored: Mon May 4 14:39:12 2015 -0400 Committer: Josh Elser Committed: Mon May 4 14:39:12 2015 -0400 -- .../org/apache/accumulo/shell/commands/DUCommand.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) --
[1/6] accumulo git commit: ACCUMULO-3589 Check tables for existence at end of shell command.
Repository: accumulo
Updated Branches:
refs/heads/1.6 a506c0bed -> 2b168f819
refs/heads/1.7 12366d4e6 -> 0bbc67594
refs/heads/master 5e15913d9 -> ca02e85d1
ACCUMULO-3589 Check tables for existence at end of shell command.
We were checking tables provided to the DUCommand to early which
caused us to miss the existence check on some of the ways that
users can specify tables.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b168f81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b168f81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b168f81
Branch: refs/heads/1.6
Commit: 2b168f819f8dfa865785fd644e6bfa82722ff4d0
Parents: a506c0b
Author: Tristen Georgiou
Authored: Mon May 4 13:50:42 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 13:53:04 2015 -0400
--
.../accumulo/core/util/shell/commands/DUCommand.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b168f81/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
index 5c0a486..d0ee908 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
@@ -44,11 +44,7 @@ public class DUCommand extends Command {
final SortedSet tables = new
TreeSet(Arrays.asList(cl.getArgs()));
if (cl.hasOption(Shell.tableOption)) {
- String tableName = cl.getOptionValue(Shell.tableOption);
- if (!shellState.getConnector().tableOperations().exists(tableName)) {
-throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
- }
- tables.add(tableName);
+ tables.add(cl.getOptionValue(Shell.tableOption));
}
if (cl.hasOption(optNamespace.getOpt())) {
@@ -73,6 +69,13 @@ public class DUCommand extends Command {
tables.add(shellState.getTableName());
}
+// sanity check...make sure the user-specified tables exist
+for (String tableName : tables) {
+ if (!shellState.getConnector().tableOperations().exists(tableName)) {
+throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
+ }
+}
+
try {
String valueFormat = prettyPrint ? "%9s" : "%,24d";
for (DiskUsage usage :
shellState.getConnector().tableOperations().getDiskUsage(tables)) {
[3/6] accumulo git commit: ACCUMULO-3589 Check tables for existence at end of shell command.
ACCUMULO-3589 Check tables for existence at end of shell command.
We were checking tables provided to the DUCommand to early which
caused us to miss the existence check on some of the ways that
users can specify tables.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b168f81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b168f81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b168f81
Branch: refs/heads/master
Commit: 2b168f819f8dfa865785fd644e6bfa82722ff4d0
Parents: a506c0b
Author: Tristen Georgiou
Authored: Mon May 4 13:50:42 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 13:53:04 2015 -0400
--
.../accumulo/core/util/shell/commands/DUCommand.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b168f81/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
index 5c0a486..d0ee908 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
@@ -44,11 +44,7 @@ public class DUCommand extends Command {
final SortedSet tables = new
TreeSet(Arrays.asList(cl.getArgs()));
if (cl.hasOption(Shell.tableOption)) {
- String tableName = cl.getOptionValue(Shell.tableOption);
- if (!shellState.getConnector().tableOperations().exists(tableName)) {
-throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
- }
- tables.add(tableName);
+ tables.add(cl.getOptionValue(Shell.tableOption));
}
if (cl.hasOption(optNamespace.getOpt())) {
@@ -73,6 +69,13 @@ public class DUCommand extends Command {
tables.add(shellState.getTableName());
}
+// sanity check...make sure the user-specified tables exist
+for (String tableName : tables) {
+ if (!shellState.getConnector().tableOperations().exists(tableName)) {
+throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
+ }
+}
+
try {
String valueFormat = prettyPrint ? "%9s" : "%,24d";
for (DiskUsage usage :
shellState.getConnector().tableOperations().getDiskUsage(tables)) {
[2/6] accumulo git commit: ACCUMULO-3589 Check tables for existence at end of shell command.
ACCUMULO-3589 Check tables for existence at end of shell command.
We were checking tables provided to the DUCommand to early which
caused us to miss the existence check on some of the ways that
users can specify tables.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2b168f81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2b168f81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2b168f81
Branch: refs/heads/1.7
Commit: 2b168f819f8dfa865785fd644e6bfa82722ff4d0
Parents: a506c0b
Author: Tristen Georgiou
Authored: Mon May 4 13:50:42 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 13:53:04 2015 -0400
--
.../accumulo/core/util/shell/commands/DUCommand.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b168f81/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
index 5c0a486..d0ee908 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
@@ -44,11 +44,7 @@ public class DUCommand extends Command {
final SortedSet tables = new
TreeSet(Arrays.asList(cl.getArgs()));
if (cl.hasOption(Shell.tableOption)) {
- String tableName = cl.getOptionValue(Shell.tableOption);
- if (!shellState.getConnector().tableOperations().exists(tableName)) {
-throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
- }
- tables.add(tableName);
+ tables.add(cl.getOptionValue(Shell.tableOption));
}
if (cl.hasOption(optNamespace.getOpt())) {
@@ -73,6 +69,13 @@ public class DUCommand extends Command {
tables.add(shellState.getTableName());
}
+// sanity check...make sure the user-specified tables exist
+for (String tableName : tables) {
+ if (!shellState.getConnector().tableOperations().exists(tableName)) {
+throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
+ }
+}
+
try {
String valueFormat = prettyPrint ? "%9s" : "%,24d";
for (DiskUsage usage :
shellState.getConnector().tableOperations().getDiskUsage(tables)) {
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0bbc6759
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0bbc6759
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0bbc6759
Branch: refs/heads/1.7
Commit: 0bbc67594b25954ed2cb3a2f04e45789a1c7691c
Parents: 12366d4 2b168f8
Author: Josh Elser
Authored: Mon May 4 14:09:31 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 14:09:31 2015 -0400
--
.../org/apache/accumulo/shell/commands/DUCommand.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0bbc6759/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
index 3e851d4,000..2adcc81
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
@@@ -1,126 -1,0 +1,129 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.shell.commands;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.DiskUsage;
+import org.apache.accumulo.core.client.impl.Namespaces;
+import org.apache.accumulo.core.util.NumUtil;
+import org.apache.accumulo.shell.Shell;
+import org.apache.accumulo.shell.Shell.Command;
+import org.apache.accumulo.shell.ShellOptions;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+public class DUCommand extends Command {
+
+ private Option optTablePattern, optHumanReadble, optNamespace;
+
+ @Override
+ public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException, TableNotFoundException,
+ NamespaceNotFoundException {
+
+final SortedSet tables = new
TreeSet(Arrays.asList(cl.getArgs()));
+
+if (cl.hasOption(ShellOptions.tableOption)) {
- String tableName = cl.getOptionValue(ShellOptions.tableOption);
- if (!shellState.getConnector().tableOperations().exists(tableName)) {
- throw new TableNotFoundException(tableName, tableName, "specified
table that doesn't exist");
- }
- tables.add(tableName);
++ tables.add(cl.getOptionValue(ShellOptions.tableOption));
+}
+
+if (cl.hasOption(optNamespace.getOpt())) {
+ Instance instance = shellState.getInstance();
+ String namespaceId = Namespaces.getNamespaceId(instance,
cl.getOptionValue(optNamespace.getOpt()));
+ tables.addAll(Namespaces.getTableNames(instance, namespaceId));
+}
+
+boolean prettyPrint = cl.hasOption(optHumanReadble.getOpt()) ? true :
false;
+
+// Add any patterns
+if (cl.hasOption(optTablePattern.getOpt())) {
+ for (String table : shellState.getConnector().tableOperations().list())
{
+if (table.matches(cl.getOptionValue(optTablePattern.getOpt( {
+ tables.add(table);
+}
+ }
+}
+
+// If we didn't get any tables, and we have a table selected, add the
current table
+if (tables.isEmpty() && !shellState.getTableName().isEmpty()) {
+ tables.add(shellState.getTableName());
+}
+
++// sanity check...make sure the user-specified tables exist
++for (String tableName : tables) {
++ if (!shellState.getConnector().tableOperations().exists(tableName)) {
++throw new TableNotFoundException(tableName, tableName, "specified
tabl
[6/6] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e15913d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e15913d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e15913d Branch: refs/heads/master Commit: 5e15913d9739c2005aeb893424821583eb4dd977 Parents: 87af7f6 12366d4 Author: Josh Elser Authored: Mon May 4 12:56:40 2015 -0400 Committer: Josh Elser Committed: Mon May 4 12:56:40 2015 -0400 -- .../client/impl/NamespaceOperationsImpl.java| 10 +++ .../core/client/impl/TableOperationsImpl.java | 30 +--- 2 files changed, 19 insertions(+), 21 deletions(-) --
[1/6] accumulo git commit: ACCUMULO-3354 call deleteRows on offline table contains table name in TableOfflineException
Repository: accumulo
Updated Branches:
refs/heads/1.6 bbcc6da44 -> a506c0bed
refs/heads/1.7 2436eec23 -> 12366d4e6
refs/heads/master 87af7f6d8 -> 5e15913d9
ACCUMULO-3354 call deleteRows on offline table contains table name in
TableOfflineException
TableOperationsImpl.doFateOperation(...) is the only method that passed an
explicitly null tableId to
the TableOfflineException constructor. Now checks the table's tableId and
passes that to the
exception constructor.
Refactored doFateOperation(FateOperation op, List args,
Map opts, boolean wait)
to doFateOperation(FateOperation op, List args, Map
opts,
String tableOrNamespaceName, boolean wait). The table/namespace name is then
pushed down explicitly.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a506c0be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a506c0be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a506c0be
Branch: refs/heads/1.6
Commit: a506c0bedb5a6b5794e995b68a7710bd8bfb69eb
Parents: bbcc6da
Author: Jacob Meisler
Authored: Tue Apr 28 20:42:17 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 11:41:22 2015 -0400
--
.../client/impl/NamespaceOperationsImpl.java| 11 +++
.../core/client/impl/TableOperationsImpl.java | 30 +---
2 files changed, 20 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index 19bc232..9a66fef 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -90,7 +90,8 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
ArgumentChecker.notNull(namespace);
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap());
+ doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap(),
+ namespace);
} catch (NamespaceNotFoundException e) {
// should not happen
throw new AssertionError(e);
@@ -115,7 +116,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
Map opts = new HashMap();
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts,
namespace);
} catch (NamespaceExistsException e) {
// should not happen
throw new AssertionError(e);
@@ -129,7 +130,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes()),
ByteBuffer.wrap(newNamespaceName.getBytes()));
Map opts = new HashMap();
-doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts);
+doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts,
oldNamespaceName);
}
@Override
@@ -229,10 +230,10 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
return super.addConstraint(namespace, constraintClassName);
}
- private String doNamespaceFateOperation(FateOperation op, List
args, Map opts) throws AccumuloSecurityException,
+ private String doNamespaceFateOperation(FateOperation op, List
args, Map opts, String namespace) throws
AccumuloSecurityException,
AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
try {
- return tableOps.doFateOperation(op, args, opts);
+ return tableOps.doFateOperation(op, args, opts, namespace);
} catch (TableExistsException e) {
// should not happen
throw new AssertionError(e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 75dda1f..6e6ca19 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -95,7 +95,6 @@ import org.apache.accum
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12366d4e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12366d4e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/12366d4e
Branch: refs/heads/master
Commit: 12366d4e672a004e9324adc87d4e94907530a770
Parents: 2436eec a506c0b
Author: Josh Elser
Authored: Mon May 4 12:08:09 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 12:27:51 2015 -0400
--
.../client/impl/NamespaceOperationsImpl.java| 10 +++
.../core/client/impl/TableOperationsImpl.java | 30 +---
2 files changed, 19 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/12366d4e/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index ce6bc09,9a66fef..b087c73
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@@ -85,11 -87,11 +85,11 @@@ public class NamespaceOperationsImpl ex
@Override
public void create(String namespace) throws AccumuloException,
AccumuloSecurityException, NamespaceExistsException {
-ArgumentChecker.notNull(namespace);
+checkArgument(namespace != null, "namespace is null");
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap(),
- namespace);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))),
- Collections. emptyMap());
++ Collections. emptyMap(), namespace);
} catch (NamespaceNotFoundException e) {
// should not happen
throw new AssertionError(e);
@@@ -127,9 -128,9 +127,9 @@@
public void rename(String oldNamespaceName, String newNamespaceName) throws
AccumuloSecurityException, NamespaceNotFoundException, AccumuloException,
NamespaceExistsException {
-List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes()),
ByteBuffer.wrap(newNamespaceName.getBytes()));
+List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)),
ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
Map opts = new HashMap();
- doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts,
oldNamespaceName);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/12366d4e/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 0e30d52,6e6ca19..6f9ea29
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -92,12 -90,11 +92,11 @@@ import org.apache.accumulo.core.metadat
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
+import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.trace.Tracer;
- import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.MapCounter;
@@@ -276,14 -308,13 +275,13 @@@ public class TableOperationsImpl extend
String ret = waitForFateOperation(opid);
return ret;
} catch (ThriftSecurityException e) {
- String tableName = ByteBufferUtil.toString(args.get(0));
switch (e.getCode()) {
case TABLE_DOESNT_EXIST:
- throw new TableNotFoundException(null, tableName, "Target table
does not exist");
+ throw new TableNotFoundException(n
[2/6] accumulo git commit: ACCUMULO-3354 call deleteRows on offline table contains table name in TableOfflineException
ACCUMULO-3354 call deleteRows on offline table contains table name in
TableOfflineException
TableOperationsImpl.doFateOperation(...) is the only method that passed an
explicitly null tableId to
the TableOfflineException constructor. Now checks the table's tableId and
passes that to the
exception constructor.
Refactored doFateOperation(FateOperation op, List args,
Map opts, boolean wait)
to doFateOperation(FateOperation op, List args, Map
opts,
String tableOrNamespaceName, boolean wait). The table/namespace name is then
pushed down explicitly.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a506c0be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a506c0be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a506c0be
Branch: refs/heads/1.7
Commit: a506c0bedb5a6b5794e995b68a7710bd8bfb69eb
Parents: bbcc6da
Author: Jacob Meisler
Authored: Tue Apr 28 20:42:17 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 11:41:22 2015 -0400
--
.../client/impl/NamespaceOperationsImpl.java| 11 +++
.../core/client/impl/TableOperationsImpl.java | 30 +---
2 files changed, 20 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index 19bc232..9a66fef 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -90,7 +90,8 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
ArgumentChecker.notNull(namespace);
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap());
+ doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap(),
+ namespace);
} catch (NamespaceNotFoundException e) {
// should not happen
throw new AssertionError(e);
@@ -115,7 +116,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
Map opts = new HashMap();
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts,
namespace);
} catch (NamespaceExistsException e) {
// should not happen
throw new AssertionError(e);
@@ -129,7 +130,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes()),
ByteBuffer.wrap(newNamespaceName.getBytes()));
Map opts = new HashMap();
-doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts);
+doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts,
oldNamespaceName);
}
@Override
@@ -229,10 +230,10 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
return super.addConstraint(namespace, constraintClassName);
}
- private String doNamespaceFateOperation(FateOperation op, List
args, Map opts) throws AccumuloSecurityException,
+ private String doNamespaceFateOperation(FateOperation op, List
args, Map opts, String namespace) throws
AccumuloSecurityException,
AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
try {
- return tableOps.doFateOperation(op, args, opts);
+ return tableOps.doFateOperation(op, args, opts, namespace);
} catch (TableExistsException e) {
// should not happen
throw new AssertionError(e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 75dda1f..6e6ca19 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -95,7 +95,6 @@ import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/12366d4e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12366d4e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/12366d4e
Branch: refs/heads/1.7
Commit: 12366d4e672a004e9324adc87d4e94907530a770
Parents: 2436eec a506c0b
Author: Josh Elser
Authored: Mon May 4 12:08:09 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 12:27:51 2015 -0400
--
.../client/impl/NamespaceOperationsImpl.java| 10 +++
.../core/client/impl/TableOperationsImpl.java | 30 +---
2 files changed, 19 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/12366d4e/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index ce6bc09,9a66fef..b087c73
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@@ -85,11 -87,11 +85,11 @@@ public class NamespaceOperationsImpl ex
@Override
public void create(String namespace) throws AccumuloException,
AccumuloSecurityException, NamespaceExistsException {
-ArgumentChecker.notNull(namespace);
+checkArgument(namespace != null, "namespace is null");
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap(),
- namespace);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))),
- Collections. emptyMap());
++ Collections. emptyMap(), namespace);
} catch (NamespaceNotFoundException e) {
// should not happen
throw new AssertionError(e);
@@@ -127,9 -128,9 +127,9 @@@
public void rename(String oldNamespaceName, String newNamespaceName) throws
AccumuloSecurityException, NamespaceNotFoundException, AccumuloException,
NamespaceExistsException {
-List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes()),
ByteBuffer.wrap(newNamespaceName.getBytes()));
+List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)),
ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
Map opts = new HashMap();
- doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts,
oldNamespaceName);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/12366d4e/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 0e30d52,6e6ca19..6f9ea29
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -92,12 -90,11 +92,11 @@@ import org.apache.accumulo.core.metadat
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
+import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.trace.Tracer;
- import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.MapCounter;
@@@ -276,14 -308,13 +275,13 @@@ public class TableOperationsImpl extend
String ret = waitForFateOperation(opid);
return ret;
} catch (ThriftSecurityException e) {
- String tableName = ByteBufferUtil.toString(args.get(0));
switch (e.getCode()) {
case TABLE_DOESNT_EXIST:
- throw new TableNotFoundException(null, tableName, "Target table
does not exist");
+ throw new TableNotFoundException(null
[3/6] accumulo git commit: ACCUMULO-3354 call deleteRows on offline table contains table name in TableOfflineException
ACCUMULO-3354 call deleteRows on offline table contains table name in
TableOfflineException
TableOperationsImpl.doFateOperation(...) is the only method that passed an
explicitly null tableId to
the TableOfflineException constructor. Now checks the table's tableId and
passes that to the
exception constructor.
Refactored doFateOperation(FateOperation op, List args,
Map opts, boolean wait)
to doFateOperation(FateOperation op, List args, Map
opts,
String tableOrNamespaceName, boolean wait). The table/namespace name is then
pushed down explicitly.
Signed-off-by: Josh Elser
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a506c0be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a506c0be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a506c0be
Branch: refs/heads/master
Commit: a506c0bedb5a6b5794e995b68a7710bd8bfb69eb
Parents: bbcc6da
Author: Jacob Meisler
Authored: Tue Apr 28 20:42:17 2015 -0400
Committer: Josh Elser
Committed: Mon May 4 11:41:22 2015 -0400
--
.../client/impl/NamespaceOperationsImpl.java| 11 +++
.../core/client/impl/TableOperationsImpl.java | 30 +---
2 files changed, 20 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
index 19bc232..9a66fef 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/NamespaceOperationsImpl.java
@@ -90,7 +90,8 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
ArgumentChecker.notNull(namespace);
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap());
+ doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
Arrays.asList(ByteBuffer.wrap(namespace.getBytes())),
Collections. emptyMap(),
+ namespace);
} catch (NamespaceNotFoundException e) {
// should not happen
throw new AssertionError(e);
@@ -115,7 +116,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
Map opts = new HashMap();
try {
- doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts);
+ doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts,
namespace);
} catch (NamespaceExistsException e) {
// should not happen
throw new AssertionError(e);
@@ -129,7 +130,7 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
List args =
Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes()),
ByteBuffer.wrap(newNamespaceName.getBytes()));
Map opts = new HashMap();
-doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts);
+doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts,
oldNamespaceName);
}
@Override
@@ -229,10 +230,10 @@ public class NamespaceOperationsImpl extends
NamespaceOperationsHelper {
return super.addConstraint(namespace, constraintClassName);
}
- private String doNamespaceFateOperation(FateOperation op, List
args, Map opts) throws AccumuloSecurityException,
+ private String doNamespaceFateOperation(FateOperation op, List
args, Map opts, String namespace) throws
AccumuloSecurityException,
AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
try {
- return tableOps.doFateOperation(op, args, opts);
+ return tableOps.doFateOperation(op, args, opts, namespace);
} catch (TableExistsException e) {
// should not happen
throw new AssertionError(e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a506c0be/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 75dda1f..6e6ca19 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -95,7 +95,6 @@ import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thri
