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 2015/03/17 20:46:08 UTC
[1/6] accumulo git commit: ACCUMULO-3661 Add missing deprecation
message
Repository: accumulo
Updated Branches:
refs/heads/1.5 4ff11d408 -> 83ee1c17e
refs/heads/1.6 1ea901091 -> 16a7bb437
refs/heads/master 6ab9ac4a4 -> 1fb0d7ca0
ACCUMULO-3661 Add missing deprecation message
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83ee1c17
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83ee1c17
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83ee1c17
Branch: refs/heads/1.5
Commit: 83ee1c17e26f87a4a88fe0f44699e9c3dac11a80
Parents: 4ff11d4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:39:45 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:39:45 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83ee1c17/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
index 307bfd6..2bf897b 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
@@ -32,6 +32,7 @@ public class DeleteScanIterCommand extends Command {
@Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
+ Shell.log.warn("Deprecated, use " + new DeleteShellIterCommand().getName());
final String tableName = OptUtil.getTableOpt(cl, shellState);
if (cl.hasOption(allOpt.getOpt())) {
[6/6] accumulo git commit: Merge branch '1.6'
Posted by ct...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1fb0d7ca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1fb0d7ca
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1fb0d7ca
Branch: refs/heads/master
Commit: 1fb0d7ca0e9679fb41dc144d179b4a90ee7e7c7d
Parents: 6ab9ac4 16a7bb4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:43:04 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:43:04 2015 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1fb0d7ca/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteScanIterCommand.java
----------------------------------------------------------------------
diff --cc shell/src/main/java/org/apache/accumulo/shell/commands/DeleteScanIterCommand.java
index 3ee6ca7,0000000..7c8cf22
mode 100644,000000..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteScanIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteScanIterCommand.java
@@@ -1,102 -1,0 +1,103 @@@
+/*
+ * 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.util.Iterator;
+import java.util.List;
+
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.shell.Shell;
+import org.apache.accumulo.shell.Shell.Command;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
+import org.apache.commons.cli.Options;
+
+public class DeleteScanIterCommand extends Command {
+ private Option nameOpt, allOpt;
+
+ @Override
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
++ Shell.log.warn("Deprecated, use " + new DeleteShellIterCommand().getName());
+ final String tableName = OptUtil.getTableOpt(cl, shellState);
+
+ if (cl.hasOption(allOpt.getOpt())) {
+ final List<IteratorSetting> tableScanIterators = shellState.scanIteratorOptions.remove(tableName);
+ if (tableScanIterators == null) {
+ Shell.log.info("No scan iterators set on table " + tableName);
+ } else {
+ Shell.log.info("Removed the following scan iterators from table " + tableName + ":" + tableScanIterators);
+ }
+ } else if (cl.hasOption(nameOpt.getOpt())) {
+ final String name = cl.getOptionValue(nameOpt.getOpt());
+ final List<IteratorSetting> tableScanIterators = shellState.scanIteratorOptions.get(tableName);
+ if (tableScanIterators != null) {
+ boolean found = false;
+ for (Iterator<IteratorSetting> iter = tableScanIterators.iterator(); iter.hasNext();) {
+ if (iter.next().getName().equals(name)) {
+ iter.remove();
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ Shell.log.info("No iterator named " + name + " found for table " + tableName);
+ } else {
+ Shell.log.info("Removed scan iterator " + name + " from table " + tableName + " (" + shellState.scanIteratorOptions.get(tableName).size() + " left)");
+ if (shellState.scanIteratorOptions.get(tableName).size() == 0) {
+ shellState.scanIteratorOptions.remove(tableName);
+ }
+ }
+ } else {
+ Shell.log.info("No iterator named " + name + " found for table " + tableName);
+ }
+ }
+
+ return 0;
+ }
+
+ @Override
+ public String description() {
+ return "deletes a table-specific scan iterator so it is no longer used during this shell session";
+ }
+
+ @Override
+ public Options getOptions() {
+ final Options o = new Options();
+
+ OptionGroup nameGroup = new OptionGroup();
+
+ nameOpt = new Option("n", "name", true, "iterator to delete");
+ nameOpt.setArgName("itername");
+
+ allOpt = new Option("a", "all", false, "delete all scan iterators");
+ allOpt.setArgName("all");
+
+ nameGroup.addOption(nameOpt);
+ nameGroup.addOption(allOpt);
+ nameGroup.setRequired(true);
+ o.addOptionGroup(nameGroup);
+ o.addOption(OptUtil.tableOpt("table to delete scan iterators from"));
+
+ return o;
+ }
+
+ @Override
+ public int numArgs() {
+ return 0;
+ }
+}
[3/6] accumulo git commit: ACCUMULO-3661 Add missing deprecation
message
Posted by ct...@apache.org.
ACCUMULO-3661 Add missing deprecation message
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83ee1c17
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83ee1c17
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83ee1c17
Branch: refs/heads/master
Commit: 83ee1c17e26f87a4a88fe0f44699e9c3dac11a80
Parents: 4ff11d4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:39:45 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:39:45 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83ee1c17/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
index 307bfd6..2bf897b 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
@@ -32,6 +32,7 @@ public class DeleteScanIterCommand extends Command {
@Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
+ Shell.log.warn("Deprecated, use " + new DeleteShellIterCommand().getName());
final String tableName = OptUtil.getTableOpt(cl, shellState);
if (cl.hasOption(allOpt.getOpt())) {
[4/6] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16a7bb43
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16a7bb43
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16a7bb43
Branch: refs/heads/master
Commit: 16a7bb43717ae42cc70ceda33eeee452539fb1ba
Parents: 1ea9010 83ee1c1
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:40:27 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:40:27 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[5/6] accumulo git commit: Merge branch '1.5' into 1.6
Posted by ct...@apache.org.
Merge branch '1.5' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/16a7bb43
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/16a7bb43
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/16a7bb43
Branch: refs/heads/1.6
Commit: 16a7bb43717ae42cc70ceda33eeee452539fb1ba
Parents: 1ea9010 83ee1c1
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:40:27 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:40:27 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[2/6] accumulo git commit: ACCUMULO-3661 Add missing deprecation
message
Posted by ct...@apache.org.
ACCUMULO-3661 Add missing deprecation message
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/83ee1c17
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/83ee1c17
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/83ee1c17
Branch: refs/heads/1.6
Commit: 83ee1c17e26f87a4a88fe0f44699e9c3dac11a80
Parents: 4ff11d4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Mar 17 15:39:45 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Mar 17 15:39:45 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/util/shell/commands/DeleteScanIterCommand.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/83ee1c17/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
index 307bfd6..2bf897b 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
@@ -32,6 +32,7 @@ public class DeleteScanIterCommand extends Command {
@Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
+ Shell.log.warn("Deprecated, use " + new DeleteShellIterCommand().getName());
final String tableName = OptUtil.getTableOpt(cl, shellState);
if (cl.hasOption(allOpt.getOpt())) {