You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/01/13 15:01:33 UTC
[1/2] git commit: ACCUMULO-2179 close the scanner
Updated Branches:
refs/heads/1.5.1-SNAPSHOT db56d8d21 -> aa5c92189
ACCUMULO-2179 close the scanner
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1431d348
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1431d348
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1431d348
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1431d3485ff0d54356d29e7b4ebee925ff254616
Parents: 826dc48
Author: Eric Newton <er...@gmail.com>
Authored: Mon Jan 13 08:59:26 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Jan 13 08:59:26 2014 -0500
----------------------------------------------------------------------
.../core/util/shell/commands/CreateTableCommand.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1431d348/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
----------------------------------------------------------------------
diff --git a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
index 1f69f4d..ac6f68c 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
+import java.util.Scanner;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -107,11 +108,15 @@ public class CreateTableCommand extends Command {
String f = cl.getOptionValue(createTableOptSplit.getOpt());
String line;
- java.util.Scanner file = new java.util.Scanner(new File(f));
- while (file.hasNextLine()) {
- line = file.nextLine();
- if (!line.isEmpty())
- partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
+ Scanner file = new Scanner(new File(f));
+ try {
+ while (file.hasNextLine()) {
+ line = file.nextLine();
+ if (!line.isEmpty())
+ partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
+ }
+ } finally {
+ file.close();
}
} else if (cl.hasOption(createTableOptCopySplits.getOpt())) {
String oldTable = cl.getOptionValue(createTableOptCopySplits.getOpt());
[2/2] git commit: ACCUMULO-2179 close the scanner
Posted by ec...@apache.org.
ACCUMULO-2179 close the scanner
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aa5c9218
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa5c9218
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa5c9218
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: aa5c92189791210de35739b69044defbbb8895d9
Parents: db56d8d 1431d34
Author: Eric Newton <er...@gmail.com>
Authored: Mon Jan 13 09:00:54 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Mon Jan 13 09:00:54 2014 -0500
----------------------------------------------------------------------
.../core/util/shell/commands/CreateTableCommand.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa5c9218/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
index 79b2ca2,0000000..c439909
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
@@@ -1,206 -1,0 +1,209 @@@
+/*
+ * 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.core.util.shell.commands;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map.Entry;
+import java.util.Scanner;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.TimeType;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.iterators.IteratorUtil;
+import org.apache.accumulo.core.security.VisibilityConstraint;
+import org.apache.accumulo.core.util.shell.Shell;
+import org.apache.accumulo.core.util.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;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.io.Text;
+
+public class CreateTableCommand extends Command {
+ private Option createTableOptCopySplits;
+ private Option createTableOptCopyConfig;
+ private Option createTableOptSplit;
+ private Option createTableOptTimeLogical;
+ private Option createTableOptTimeMillis;
+ private Option createTableNoDefaultIters;
+ private Option createTableOptEVC;
+ private Option base64Opt;
+ private Option createTableOptFormatter;
+ public static String testTable;
+
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, TableExistsException,
+ TableNotFoundException, IOException, ClassNotFoundException {
+
+ final String testTableName = cl.getArgs()[0];
+
+ if (!testTableName.matches(Constants.VALID_TABLE_NAME_REGEX)) {
+ shellState.getReader().printString("Only letters, numbers and underscores are allowed for use in table names. \n");
+ throw new IllegalArgumentException();
+ }
+
+ final String tableName = cl.getArgs()[0];
+ if (shellState.getConnector().tableOperations().exists(tableName)) {
+ throw new TableExistsException(null, tableName, null);
+ }
+ final SortedSet<Text> partitions = new TreeSet<Text>();
+ final boolean decode = cl.hasOption(base64Opt.getOpt());
+
+ if (cl.hasOption(createTableOptSplit.getOpt())) {
+ final String f = cl.getOptionValue(createTableOptSplit.getOpt());
+
+ String line;
+ Scanner file = new Scanner(new File(f));
- while (file.hasNextLine()) {
- line = file.nextLine();
- if (!line.isEmpty()) {
- partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
++ try {
++ while (file.hasNextLine()) {
++ line = file.nextLine();
++ if (!line.isEmpty())
++ partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
+ }
++ } finally {
++ file.close();
+ }
+ } else if (cl.hasOption(createTableOptCopySplits.getOpt())) {
+ final String oldTable = cl.getOptionValue(createTableOptCopySplits.getOpt());
+ if (!shellState.getConnector().tableOperations().exists(oldTable)) {
+ throw new TableNotFoundException(null, oldTable, null);
+ }
+ partitions.addAll(shellState.getConnector().tableOperations().listSplits(oldTable));
+ }
+
+ if (cl.hasOption(createTableOptCopyConfig.getOpt())) {
+ final String oldTable = cl.getOptionValue(createTableOptCopyConfig.getOpt());
+ if (!shellState.getConnector().tableOperations().exists(oldTable)) {
+ throw new TableNotFoundException(null, oldTable, null);
+ }
+ }
+
+ TimeType timeType = TimeType.MILLIS;
+ if (cl.hasOption(createTableOptTimeLogical.getOpt())) {
+ timeType = TimeType.LOGICAL;
+ }
+
+ // create table
+ shellState.getConnector().tableOperations().create(tableName, true, timeType);
+ if (partitions.size() > 0) {
+ shellState.getConnector().tableOperations().addSplits(tableName, partitions);
+ }
+ shellState.setTableName(tableName); // switch shell to new table
+ // context
+
+ if (cl.hasOption(createTableNoDefaultIters.getOpt())) {
+ for (String key : IteratorUtil.generateInitialTableProperties(true).keySet()) {
+ shellState.getConnector().tableOperations().removeProperty(tableName, key);
+ }
+ }
+
+ // Copy options if flag was set
+ if (cl.hasOption(createTableOptCopyConfig.getOpt())) {
+ if (shellState.getConnector().tableOperations().exists(tableName)) {
+ final Iterable<Entry<String,String>> configuration = shellState.getConnector().tableOperations()
+ .getProperties(cl.getOptionValue(createTableOptCopyConfig.getOpt()));
+ for (Entry<String,String> entry : configuration) {
+ if (Property.isValidTablePropertyKey(entry.getKey())) {
+ shellState.getConnector().tableOperations().setProperty(tableName, entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ }
+
+ if (cl.hasOption(createTableOptEVC.getOpt())) {
+ try {
+ shellState.getConnector().tableOperations().addConstraint(tableName, VisibilityConstraint.class.getName());
+ } catch (AccumuloException e) {
+ Shell.log.warn(e.getMessage() + " while setting visibility constraint, but table was created");
+ }
+ }
+
+ // Load custom formatter if set
+ if (cl.hasOption(createTableOptFormatter.getOpt())) {
+ final String formatterClass = cl.getOptionValue(createTableOptFormatter.getOpt());
+
+ shellState.getConnector().tableOperations().setProperty(tableName, Property.TABLE_FORMATTER_CLASS.toString(), formatterClass);
+ }
+
+ return 0;
+ }
+
+ @Override
+ public String description() {
+ return "creates a new table, with optional aggregators and optionally pre-split";
+ }
+
+ @Override
+ public String usage() {
+ return getName() + " <tableName>";
+ }
+
+ @Override
+ public Options getOptions() {
+ final Options o = new Options();
+
+ createTableOptCopyConfig = new Option("cc", "copy-config", true, "table to copy configuration from");
+ createTableOptCopySplits = new Option("cs", "copy-splits", true, "table to copy current splits from");
+ createTableOptSplit = new Option("sf", "splits-file", true, "file with a newline-separated list of rows to split the table with");
+ createTableOptTimeLogical = new Option("tl", "time-logical", false, "use logical time");
+ createTableOptTimeMillis = new Option("tm", "time-millis", false, "use time in milliseconds");
+ createTableNoDefaultIters = new Option("ndi", "no-default-iterators", false, "prevent creation of the normal default iterator set");
+ createTableOptEVC = new Option("evc", "enable-visibility-constraint", false,
+ "prevent users from writing data they cannot read. When enabling this, consider disabling bulk import and alter table.");
+ createTableOptFormatter = new Option("f", "formatter", true, "default formatter to set");
+
+ createTableOptCopyConfig.setArgName("table");
+ createTableOptCopySplits.setArgName("table");
+ createTableOptSplit.setArgName("filename");
+ createTableOptFormatter.setArgName("className");
+
+ // Splits and CopySplits are put in an optionsgroup to make them
+ // mutually exclusive
+ final OptionGroup splitOrCopySplit = new OptionGroup();
+ splitOrCopySplit.addOption(createTableOptSplit);
+ splitOrCopySplit.addOption(createTableOptCopySplits);
+
+ final OptionGroup timeGroup = new OptionGroup();
+ timeGroup.addOption(createTableOptTimeLogical);
+ timeGroup.addOption(createTableOptTimeMillis);
+
+ base64Opt = new Option("b64", "base64encoded", false, "decode encoded split points");
+ o.addOption(base64Opt);
+
+ o.addOptionGroup(splitOrCopySplit);
+ o.addOptionGroup(timeGroup);
+ o.addOption(createTableOptSplit);
+ o.addOption(createTableOptCopyConfig);
+ o.addOption(createTableNoDefaultIters);
+ o.addOption(createTableOptEVC);
+ o.addOption(createTableOptFormatter);
+
+ return o;
+ }
+
+ @Override
+ public int numArgs() {
+ return 1;
+ }
+}