You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/01/25 20:44:16 UTC
[1/2] accumulo-testing git commit: ACCUMULO-4510 Added java formatter
maven plugin
Repository: accumulo-testing
Updated Branches:
refs/heads/master 0d97273cc -> bef8ed208
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/yarn/src/main/java/org/apache/accumulo/testing/yarn/YarnAccumuloTestRunner.java
----------------------------------------------------------------------
diff --git a/yarn/src/main/java/org/apache/accumulo/testing/yarn/YarnAccumuloTestRunner.java b/yarn/src/main/java/org/apache/accumulo/testing/yarn/YarnAccumuloTestRunner.java
index 84d2576..8c147a7 100644
--- a/yarn/src/main/java/org/apache/accumulo/testing/yarn/YarnAccumuloTestRunner.java
+++ b/yarn/src/main/java/org/apache/accumulo/testing/yarn/YarnAccumuloTestRunner.java
@@ -64,49 +64,40 @@ public class YarnAccumuloTestRunner {
int numCores = Integer.valueOf(props.getProperty(TestProps.YARN_CONTAINER_CORES));
int memory = Integer.valueOf(props.getProperty(TestProps.YARN_CONTAINER_MEMORY_MB));
- ResourceSpecification resourceSpec = ResourceSpecification.Builder.with()
- .setVirtualCores(numCores).setMemory(memory, ResourceSpecification.SizeUnit.MEGA)
- .setInstances(opts.numContainers).build();
+ ResourceSpecification resourceSpec = ResourceSpecification.Builder.with().setVirtualCores(numCores)
+ .setMemory(memory, ResourceSpecification.SizeUnit.MEGA).setInstances(opts.numContainers).build();
File jarFile = new File(opts.jarPath);
File testProps = new File(opts.testProps);
File log4jProps = new File(opts.logProps);
- return TwillSpecification.Builder.with()
- .setName(opts.testName)
- .withRunnable()
- .add(RUNNABLE_ID, new BundledJarRunnable(), resourceSpec)
- .withLocalFiles()
- .add(jarFile.getName(), jarFile.toURI(), false)
- .add(testProps.getName(), testProps.toURI())
- .add(log4jProps.getName(), log4jProps.toURI())
- .apply()
- .anyOrder()
- .build();
+ return TwillSpecification.Builder.with().setName(opts.testName).withRunnable().add(RUNNABLE_ID, new BundledJarRunnable(), resourceSpec).withLocalFiles()
+ .add(jarFile.getName(), jarFile.toURI(), false).add(testProps.getName(), testProps.toURI()).add(log4jProps.getName(), log4jProps.toURI()).apply()
+ .anyOrder().build();
}
}
private static class TestRunnerOpts {
- @Parameter(names={"--testName", "-t"}, required = true, description = "Test name")
+ @Parameter(names = {"--testName", "-t"}, required = true, description = "Test name")
String testName;
- @Parameter(names={"--numContainers", "-n"}, required = true, description = "Test name")
+ @Parameter(names = {"--numContainers", "-n"}, required = true, description = "Test name")
int numContainers;
- @Parameter(names={"--jar", "-j"}, required = true, description = "Bundled jar path")
+ @Parameter(names = {"--jar", "-j"}, required = true, description = "Bundled jar path")
String jarPath;
- @Parameter(names={"--main", "-m"}, required = true, description = "Main class")
+ @Parameter(names = {"--main", "-m"}, required = true, description = "Main class")
String mainClass;
- @Parameter(names={"--testProps", "-p"}, required = true, description = "Test properties path")
+ @Parameter(names = {"--testProps", "-p"}, required = true, description = "Test properties path")
String testProps;
- @Parameter(names={"--logProps", "-l"}, required = true, description = "Log properties path")
+ @Parameter(names = {"--logProps", "-l"}, required = true, description = "Log properties path")
String logProps;
- @Parameter(names={"--args", "-a"}, variableArity = true, description = "Main class args")
+ @Parameter(names = {"--args", "-a"}, variableArity = true, description = "Main class args")
List<String> mainArgs = new ArrayList<>();
}
@@ -135,8 +126,7 @@ public class YarnAccumuloTestRunner {
verifyPath(opts.logProps);
String[] mainArgs = opts.mainArgs.stream().toArray(String[]::new);
- BundledJarRunner.Arguments arguments = new BundledJarRunner.Arguments(opts.jarPath, "/lib",
- opts.mainClass, mainArgs);
+ BundledJarRunner.Arguments arguments = new BundledJarRunner.Arguments(opts.jarPath, "/lib", opts.mainClass, mainArgs);
Properties props = new Properties();
FileInputStream fis = new FileInputStream(opts.testProps);
@@ -144,15 +134,11 @@ public class YarnAccumuloTestRunner {
fis.close();
String zookeepers = props.getProperty(TestProps.ZOOKEEPERS);
- final TwillRunnerService twillRunner = new YarnTwillRunnerService(new YarnConfiguration(),
- zookeepers);
+ final TwillRunnerService twillRunner = new YarnTwillRunnerService(new YarnConfiguration(), zookeepers);
twillRunner.start();
- TwillController controller = twillRunner.prepare(
- new YarnTestApp(opts, props))
- .addJVMOptions("-Dlog4j.configuration=file:$PWD/" + new File(opts.logProps).getName())
- .withArguments("BundledJarRunnable", arguments.toArray())
- .start();
+ TwillController controller = twillRunner.prepare(new YarnTestApp(opts, props))
+ .addJVMOptions("-Dlog4j.configuration=file:$PWD/" + new File(opts.logProps).getName()).withArguments("BundledJarRunnable", arguments.toArray()).start();
int numRunning = getNumRunning(controller);
while (numRunning != opts.numContainers) {
@@ -164,4 +150,4 @@ public class YarnAccumuloTestRunner {
LOG.info("{} of {} containers have started in YARN", numRunning, opts.numContainers);
LOG.info("{} application was successfully started in YARN", opts.testName);
}
-}
\ No newline at end of file
+}
[2/2] accumulo-testing git commit: ACCUMULO-4510 Added java formatter
maven plugin
Posted by mw...@apache.org.
ACCUMULO-4510 Added java formatter maven plugin
* Also fixed incorrect java imports
Project: http://git-wip-us.apache.org/repos/asf/accumulo-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-testing/commit/bef8ed20
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-testing/tree/bef8ed20
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-testing/diff/bef8ed20
Branch: refs/heads/master
Commit: bef8ed20814ee6ab56a2b829c07b56327ecd788a
Parents: 0d97273
Author: Mike Walch <mw...@apache.org>
Authored: Wed Jan 25 15:24:29 2017 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Wed Jan 25 15:41:11 2017 -0500
----------------------------------------------------------------------
contrib/Eclipse-Accumulo-Codestyle.xml | 307 +++++++++++++++++++
.../apache/accumulo/testing/core/TestEnv.java | 16 +-
.../apache/accumulo/testing/core/TestProps.java | 9 +-
.../core/continuous/ContinuousIngest.java | 26 +-
.../testing/core/continuous/ContinuousMoru.java | 6 +-
.../core/continuous/ContinuousScanner.java | 6 +-
.../core/continuous/ContinuousVerify.java | 2 +-
.../testing/core/continuous/CreateTable.java | 2 +-
.../testing/core/merkle/cli/CompareTables.java | 3 +-
.../core/merkle/cli/ComputeRootHash.java | 9 +-
.../testing/core/merkle/cli/GenerateHashes.java | 10 +-
.../core/merkle/ingest/RandomWorkload.java | 3 +-
.../core/merkle/skvi/DigestIterator.java | 2 +-
.../testing/core/randomwalk/Module.java | 30 +-
.../testing/core/randomwalk/RandWalkEnv.java | 10 +-
.../core/randomwalk/bulk/BulkImportTest.java | 15 +-
.../core/randomwalk/concurrent/Config.java | 103 ++++---
.../core/randomwalk/concurrent/RenameTable.java | 6 +-
.../testing/core/randomwalk/image/ScanMeta.java | 3 +-
.../core/randomwalk/multitable/CopyTool.java | 9 +-
.../randomwalk/security/AlterTablePerm.java | 2 +-
.../core/randomwalk/security/DropTable.java | 2 +-
.../core/randomwalk/security/SetAuths.java | 4 +-
.../core/randomwalk/security/TableOp.java | 6 +-
.../randomwalk/sequential/MapRedVerifyTool.java | 3 +-
.../core/randomwalk/shard/DeleteSomeDocs.java | 3 +-
.../core/randomwalk/shard/ExportIndex.java | 3 +-
.../testing/core/randomwalk/shard/Merge.java | 3 +-
.../testing/core/stress/RandomWithinRange.java | 3 +-
.../testing/core/randomwalk/FrameworkTest.java | 3 +-
pom.xml | 18 +-
.../testing/yarn/YarnAccumuloTestRunner.java | 48 +--
32 files changed, 518 insertions(+), 157 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/contrib/Eclipse-Accumulo-Codestyle.xml
----------------------------------------------------------------------
diff --git a/contrib/Eclipse-Accumulo-Codestyle.xml b/contrib/Eclipse-Accumulo-Codestyle.xml
new file mode 100644
index 0000000..42e03bf
--- /dev/null
+++ b/contrib/Eclipse-Accumulo-Codestyle.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="Accumulo" version="12">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="160"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="160"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java b/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
index 55fecb7..cd1f1dc 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/TestEnv.java
@@ -31,7 +31,8 @@ public class TestEnv {
/**
* Creates new test environment using provided properties
*
- * @param p Properties
+ * @param p
+ * Properties
*/
public TestEnv(Properties p) {
requireNonNull(p);
@@ -50,7 +51,8 @@ public class TestEnv {
/**
* Gets a configuration property.
*
- * @param key key
+ * @param key
+ * key
* @return property value
*/
public String getConfigProperty(String key) {
@@ -93,12 +95,13 @@ public class TestEnv {
return ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
}
-
public Configuration getHadoopConfiguration() {
Configuration config = new Configuration();
config.set("mapreduce.framework.name", "yarn");
- // Setting below are required due to bundled jar breaking default config.
- // See http://stackoverflow.com/questions/17265002/hadoop-no-filesystem-for-scheme-file
+ // Setting below are required due to bundled jar breaking default
+ // config.
+ // See
+ // http://stackoverflow.com/questions/17265002/hadoop-no-filesystem-for-scheme-file
config.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
config.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
return config;
@@ -137,8 +140,7 @@ public class TestEnv {
}
public ClientConfiguration getClientConfiguration() {
- return ClientConfiguration.loadDefault().withInstance(getAccumuloInstanceName())
- .withZkHosts(getZookeepers());
+ return ClientConfiguration.loadDefault().withInstance(getAccumuloInstanceName()).withZkHosts(getZookeepers());
}
/**
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/TestProps.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/TestProps.java b/core/src/main/java/org/apache/accumulo/testing/core/TestProps.java
index e134c7f..bdc4901 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/TestProps.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/TestProps.java
@@ -65,7 +65,8 @@ public class TestProps {
public static final String CI_COMMON_ACCUMULO_TABLE = CI_COMMON + "accumulo.table";
// Number of tablets that should exist in Accumulo table when created
public static final String CI_COMMON_ACCUMULO_NUM_TABLETS = CI_COMMON + "accumulo.num.tablets";
- // Optional authorizations (in CSV format) that if specified will be randomly selected by scanners
+ // Optional authorizations (in CSV format) that if specified will be
+ // randomly selected by scanners
// and walkers
public static final String CI_COMMON_AUTHS = CI_COMMON + "auths";
@@ -80,7 +81,8 @@ public class TestProps {
public static final String CI_INGEST_MAX_CF = CI_INGEST + "max.cf";
// Maximum number of random column qualifiers to generate
public static final String CI_INGEST_MAX_CQ = CI_INGEST + "max.cq";
- // Optional visibilities (in CSV format) that if specified will be randomly selected by ingesters for
+ // Optional visibilities (in CSV format) that if specified will be randomly
+ // selected by ingesters for
// each linked list
public static final String CI_INGEST_VISIBILITIES = CI_INGEST + "visibilities";
// Checksums will be generated during ingest if set to true
@@ -107,7 +109,8 @@ public class TestProps {
public static final String CI_VERIFY_MAX_MAPS = CI_VERIFY + "max.maps";
// Number of mapreduce reducers
public static final String CI_VERIFY_REDUCERS = CI_VERIFY + "reducers";
- // Perform the verification directly on the files while the table is offline"
+ // Perform the verification directly on the files while the table is
+ // offline"
public static final String CI_VERIFY_SCAN_OFFLINE = CI_VERIFY + "scan.offline";
// Comma separated list of auths to use for verify
public static final String CI_VERIFY_AUTHS = CI_VERIFY + "auths";
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
index d583e32..db281a7 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousIngest.java
@@ -96,9 +96,12 @@ public class ContinuousIngest {
final int flushInterval = 1000000;
final int maxDepth = 25;
- // always want to point back to flushed data. This way the previous item should
- // always exist in accumulo when verifying data. To do this make insert N point
- // back to the row from insert (N - flushInterval). The array below is used to keep
+ // always want to point back to flushed data. This way the previous item
+ // should
+ // always exist in accumulo when verifying data. To do this make insert
+ // N point
+ // back to the row from insert (N - flushInterval). The array below is
+ // used to keep
// track of this.
long prevRows[] = new long[flushInterval];
long firstRows[] = new long[flushInterval];
@@ -127,8 +130,7 @@ public class ContinuousIngest {
firstColFams[index] = cf;
firstColQuals[index] = cq;
- Mutation m = genMutation(rowLong, cf, cq, cv, ingestInstanceId, count, null,
- checksum);
+ Mutation m = genMutation(rowLong, cf, cq, cv, ingestInstanceId, count, null, checksum);
count++;
bw.addMutation(m);
}
@@ -137,7 +139,8 @@ public class ContinuousIngest {
if (count >= numEntries)
break out;
- // generate subsequent sets of nodes that link to previous set of nodes
+ // generate subsequent sets of nodes that link to previous set of
+ // nodes
for (int depth = 1; depth < maxDepth; depth++) {
for (int index = 0; index < flushInterval; index++) {
long rowLong = genLong(rowMin, rowMax, r);
@@ -156,7 +159,8 @@ public class ContinuousIngest {
// create one big linked list, this makes all of the first inserts
// point to something
for (int index = 0; index < flushInterval - 1; index++) {
- Mutation m = genMutation(firstRows[index], firstColFams[index], firstColQuals[index], cv, ingestInstanceId, count, genRow(prevRows[index + 1]), checksum);
+ Mutation m = genMutation(firstRows[index], firstColFams[index], firstColQuals[index], cv, ingestInstanceId, count, genRow(prevRows[index + 1]),
+ checksum);
count++;
bw.addMutation(m);
}
@@ -177,10 +181,10 @@ public class ContinuousIngest {
return lastFlushTime;
}
- public static Mutation genMutation(long rowLong, int cfInt, int cqInt, ColumnVisibility cv,
- byte[] ingestInstanceId, long count, byte[] prevRow,
- boolean checksum) {
- // Adler32 is supposed to be faster, but according to wikipedia is not good for small data.... so used CRC32 instead
+ public static Mutation genMutation(long rowLong, int cfInt, int cqInt, ColumnVisibility cv, byte[] ingestInstanceId, long count, byte[] prevRow,
+ boolean checksum) {
+ // Adler32 is supposed to be faster, but according to wikipedia is not
+ // good for small data.... so used CRC32 instead
CRC32 cksum = null;
byte[] rowString = genRow(rowLong);
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
index 560e2ff..0c3ae2d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousMoru.java
@@ -44,10 +44,8 @@ import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
/**
- * A map only job that reads a table created by continuous ingest and creates doubly linked list.
- * This map reduce job tests the ability of a map only job to read and write to accumulo at the
- * same time. This map reduce job mutates the table in such a way that it should not create any
- * undefined nodes.
+ * A map only job that reads a table created by continuous ingest and creates doubly linked list. This map reduce job tests the ability of a map only job to
+ * read and write to accumulo at the same time. This map reduce job mutates the table in such a way that it should not create any undefined nodes.
*/
public class ContinuousMoru extends Configured implements Tool {
private static final String PREFIX = ContinuousMoru.class.getSimpleName() + ".";
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
index 162e64d..1531269 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousScanner.java
@@ -76,7 +76,8 @@ public class ContinuousScanner {
long t2 = System.currentTimeMillis();
- // System.out.println("P1 " +count +" "+((1-delta) * numToScan)+" "+((1+delta) * numToScan)+" "+numToScan);
+ // System.out.println("P1 " +count +" "+((1-delta) *
+ // numToScan)+" "+((1+delta) * numToScan)+" "+numToScan);
if (count < (1 - delta) * numToScan || count > (1 + delta) * numToScan) {
if (count == 0) {
@@ -90,7 +91,8 @@ public class ContinuousScanner {
distance = (long) (ratio * distance);
}
- // System.out.println("P2 "+delta +" "+numToScan+" "+distance+" "+((double)numToScan/count ));
+ // System.out.println("P2 "+delta
+ // +" "+numToScan+" "+distance+" "+((double)numToScan/count ));
}
System.out.printf("SCN %d %s %d %d%n", t1, new String(scanStart, UTF_8), (t2 - t1), count);
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
index 430bf3b..d343c9b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/ContinuousVerify.java
@@ -171,7 +171,7 @@ public class ContinuousVerify extends Configured implements Tool {
ranges = conn.tableOperations().splitRangeByTablets(tableName, new Range(), maxMaps);
AccumuloInputFormat.setInputTableName(job, tableName);
}
-
+
AccumuloInputFormat.setRanges(job, ranges);
AccumuloInputFormat.setAutoAdjustRanges(job, false);
AccumuloInputFormat.setConnectorInfo(job, env.getAccumuloUserName(), env.getToken());
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java b/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
index b8f2d8d..bac8368 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/continuous/CreateTable.java
@@ -39,7 +39,7 @@ public class CreateTable {
Connector conn = env.getAccumuloConnector();
String tableName = env.getAccumuloTableName();
if (conn.tableOperations().exists(tableName)) {
- System.err.println("ERROR: Accumulo table '"+ tableName + "' already exists");
+ System.err.println("ERROR: Accumulo table '" + tableName + "' already exists");
System.exit(-1);
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
index fd6251f..2825071 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/CompareTables.java
@@ -164,7 +164,8 @@ public class CompareTables {
if (null == previousHash) {
previousHash = entry.getValue();
} else if (hashesEqual) {
- // If the hashes are still equal, check that the new hash is also equal
+ // If the hashes are still equal, check that the new hash is
+ // also equal
hashesEqual = previousHash.equals(entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
index 4511446..a988c8b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/ComputeRootHash.java
@@ -32,9 +32,9 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.test.replication.merkle.MerkleTree;
-import org.apache.accumulo.test.replication.merkle.MerkleTreeNode;
-import org.apache.accumulo.test.replication.merkle.RangeSerialization;
+import org.apache.accumulo.testing.core.merkle.MerkleTree;
+import org.apache.accumulo.testing.core.merkle.MerkleTreeNode;
+import org.apache.accumulo.testing.core.merkle.RangeSerialization;
import org.apache.commons.codec.binary.Hex;
import com.beust.jcommander.Parameter;
@@ -74,7 +74,8 @@ public class ComputeRootHash {
}
protected ArrayList<MerkleTreeNode> getLeaves(Connector conn, String tableName) throws TableNotFoundException {
- // TODO make this a bit more resilient to very large merkle trees by lazily reading more data from the table when necessary
+ // TODO make this a bit more resilient to very large merkle trees by
+ // lazily reading more data from the table when necessary
final Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
final ArrayList<MerkleTreeNode> leaves = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
index 35bf684..65f61a8 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/cli/GenerateHashes.java
@@ -48,8 +48,8 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.test.replication.merkle.RangeSerialization;
-import org.apache.accumulo.test.replication.merkle.skvi.DigestIterator;
+import org.apache.accumulo.testing.core.merkle.RangeSerialization;
+import org.apache.accumulo.testing.core.merkle.skvi.DigestIterator;
import org.apache.commons.codec.binary.Hex;
import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
@@ -192,7 +192,8 @@ public class GenerateHashes {
cfg.addOption(DigestIterator.HASH_NAME_KEY, digestName);
s.addScanIterator(cfg);
- // The scanner should only ever return us one Key-Value, otherwise this approach won't work
+ // The scanner should only ever return us one
+ // Key-Value, otherwise this approach won't work
Entry<Key,Value> entry = Iterables.getOnlyElement(s);
v = entry.getValue();
@@ -243,7 +244,8 @@ public class GenerateHashes {
}
}
} finally {
- // We can only safely close this when we're exiting or we've completely all tasks
+ // We can only safely close this when we're exiting or we've
+ // completely all tasks
bw.close();
}
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
index 440b009..9d38713 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/ingest/RandomWorkload.java
@@ -91,7 +91,8 @@ public class RandomWorkload {
// Choose a random value between [0,100)
int deleteValue = deleteRand.nextInt(100);
- // putDelete if the value we chose is less than our delete percentage
+ // putDelete if the value we chose is less than our delete
+ // percentage
if (deleteValue < deletePercent) {
m.putDelete(cf, cq);
} else {
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/merkle/skvi/DigestIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/merkle/skvi/DigestIterator.java b/core/src/main/java/org/apache/accumulo/testing/core/merkle/skvi/DigestIterator.java
index ab7ad43..7e415b4 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/merkle/skvi/DigestIterator.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/merkle/skvi/DigestIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.accumulo.testin.core.merkle.skvi;
+package org.apache.accumulo.testing.core.merkle.skvi;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
index addc9b8..68ffe6a 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/Module.java
@@ -70,12 +70,24 @@ public class Module extends Node {
String print;
if ((print = props.getProperty("print")) != null) {
switch (print) {
- case "TRACE": log.trace(name); break;
- case "DEBUG": log.debug(name); break;
- case "INFO": log.info(name); break;
- case "WARN": log.warn(name); break;
- case "ERROR": log.error(name); break;
- default: log.info(name); break;
+ case "TRACE":
+ log.trace(name);
+ break;
+ case "DEBUG":
+ log.debug(name);
+ break;
+ case "INFO":
+ log.info(name);
+ break;
+ case "WARN":
+ log.warn(name);
+ break;
+ case "ERROR":
+ log.error(name);
+ break;
+ default:
+ log.info(name);
+ break;
}
}
}
@@ -279,7 +291,8 @@ public class Module extends Node {
test = true;
}
- // Wrap the visit of the next node in the module in a callable that returns a thrown exception
+ // Wrap the visit of the next node in the module in a
+ // callable that returns a thrown exception
FutureTask<Exception> task = new FutureTask<>(new Callable<Exception>() {
@Override
@@ -312,7 +325,8 @@ public class Module extends Node {
break;
}
- // The RandomWalk node throw an Exception that that Callable handed back
+ // The RandomWalk node throw an Exception that that Callable
+ // handed back
// Throw it and let the Module perform cleanup
if (null != nodeException) {
throw nodeException;
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/RandWalkEnv.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/RandWalkEnv.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/RandWalkEnv.java
index 0dd2176..f85f560 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/RandWalkEnv.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/RandWalkEnv.java
@@ -26,9 +26,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The test environment that is available for randomwalk tests. This includes configuration
- * properties that are available to any randomwalk test and facilities for creating client-side
- * objects. This class is not thread-safe.
+ * The test environment that is available for randomwalk tests. This includes configuration properties that are available to any randomwalk test and facilities
+ * for creating client-side objects. This class is not thread-safe.
*/
public class RandWalkEnv extends TestEnv {
@@ -39,7 +38,8 @@ public class RandWalkEnv extends TestEnv {
/**
* Creates a new test environment.
*
- * @param p configuration properties
+ * @param p
+ * configuration properties
*/
public RandWalkEnv(Properties p) {
super(p);
@@ -81,4 +81,4 @@ public class RandWalkEnv extends TestEnv {
}
mtbw = null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkImportTest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkImportTest.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkImportTest.java
index 1f04cb8..f850ee1 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkImportTest.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/bulk/BulkImportTest.java
@@ -37,8 +37,10 @@ public abstract class BulkImportTest extends BulkTest {
*/
String lastImportSkipped = state.getString(SKIPPED_IMPORT);
- // We have a marker in the state for the previous insert, we have to balance skipping BulkPlusOne
- // with skipping the new BulkMinusOne to make sure that we maintain consistency
+ // We have a marker in the state for the previous insert, we have to
+ // balance skipping BulkPlusOne
+ // with skipping the new BulkMinusOne to make sure that we maintain
+ // consistency
if (null != lastImportSkipped) {
if (!getClass().equals(BulkMinusOne.class)) {
throw new IllegalStateException("Should not have a skipped import marker for a class other than " + BulkMinusOne.class.getName() + " but was "
@@ -49,7 +51,8 @@ public abstract class BulkImportTest extends BulkTest {
log.debug("Last import was skipped, skipping this import to ensure consistency");
state.remove(SKIPPED_IMPORT);
- // Wait 30s to balance the skip of a BulkPlusOne/BulkMinusOne pair
+ // Wait 30s to balance the skip of a BulkPlusOne/BulkMinusOne
+ // pair
log.debug("Waiting 30s before continuing");
try {
Thread.sleep(30 * 1000);
@@ -67,12 +70,14 @@ public abstract class BulkImportTest extends BulkTest {
} else {
log.debug("Not queuing more imports this round because too many are already queued");
state.set(SKIPPED_IMPORT, TRUE);
- // Don't sleep here, let the sleep happen when we skip the next BulkMinusOne
+ // Don't sleep here, let the sleep happen when we skip the next
+ // BulkMinusOne
}
}
private boolean shouldQueueMoreImports(State state, RandWalkEnv env) throws Exception {
- // Only selectively import when it's BulkPlusOne. If we did a BulkPlusOne,
+ // Only selectively import when it's BulkPlusOne. If we did a
+ // BulkPlusOne,
// we must also do a BulkMinusOne to keep the table consistent
if (getClass().equals(BulkPlusOne.class)) {
// Only queue up more imports if the number of queued tasks already
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
index 23106cf..3c3e737 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/Config.java
@@ -53,55 +53,60 @@ public class Config extends Test {
}
// @formatter:off
- Setting[] settings = {
- s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
- s(Property.TSERV_BULK_PROCESS_THREADS, 1, 10),
- s(Property.TSERV_BULK_RETRY, 1, 10),
- s(Property.TSERV_BULK_TIMEOUT, 10, 600),
- s(Property.TSERV_BULK_ASSIGNMENT_THREADS, 1, 10),
- s(Property.TSERV_DATACACHE_SIZE, 0, 1000000000L),
- s(Property.TSERV_INDEXCACHE_SIZE, 0, 1000000000L),
- s(Property.TSERV_CLIENT_TIMEOUT, 100, 10000),
- s(Property.TSERV_MAJC_MAXCONCURRENT, 1, 10),
- s(Property.TSERV_MAJC_DELAY, 100, 10000),
- s(Property.TSERV_MAJC_THREAD_MAXOPEN, 3, 100),
- s(Property.TSERV_MINC_MAXCONCURRENT, 1, 10),
- s(Property.TSERV_DEFAULT_BLOCKSIZE, 100000, 10000000L),
- s(Property.TSERV_MAX_IDLE, 10000, 500 * 1000),
- s(Property.TSERV_MAXMEM, 1000000, 3 * 1024 * 1024 * 1024L),
- s(Property.TSERV_READ_AHEAD_MAXCONCURRENT, 1, 25),
- s(Property.TSERV_MIGRATE_MAXCONCURRENT, 1, 10),
- s(Property.TSERV_TOTAL_MUTATION_QUEUE_MAX, 10000, 1024 * 1024),
- s(Property.TSERV_RECOVERY_MAX_CONCURRENT, 1, 100),
- s(Property.TSERV_SCAN_MAX_OPENFILES, 10, 1000),
- s(Property.TSERV_THREADCHECK, 100, 10000),
- s(Property.TSERV_MINTHREADS, 1, 100),
- s(Property.TSERV_SESSION_MAXIDLE, 100, 5 * 60 * 1000),
- s(Property.TSERV_SORT_BUFFER_SIZE, 1024 * 1024, 1024 * 1024 * 1024L),
- s(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN, 5, 100),
- s(Property.TSERV_WAL_BLOCKSIZE, 1024 * 1024, 1024 * 1024 * 1024 * 10L),
- s(Property.TSERV_WORKQ_THREADS, 1, 10),
- s(Property.MASTER_BULK_THREADPOOL_SIZE, 1, 10),
- s(Property.MASTER_BULK_RETRIES, 1, 10),
- s(Property.MASTER_BULK_TIMEOUT, 10, 600),
- s(Property.MASTER_FATE_THREADPOOL_SIZE, 1, 100),
- s(Property.MASTER_RECOVERY_DELAY, 0, 100),
- s(Property.MASTER_LEASE_RECOVERY_WAITING_PERIOD, 0, 10),
- s(Property.MASTER_RECOVERY_MAXTIME, 10, 1000),
- s(Property.MASTER_THREADCHECK, 100, 10000),
- s(Property.MASTER_MINTHREADS, 1, 200),};
-
- Setting[] tableSettings = {
- s(Property.TABLE_MAJC_RATIO, 1, 10),
- s(Property.TABLE_MAJC_COMPACTALL_IDLETIME, 100, 10 * 60 * 60 * 1000L),
- s(Property.TABLE_SPLIT_THRESHOLD, 10 * 1024, 10L * 1024 * 1024 * 1024),
- s(Property.TABLE_MINC_COMPACT_IDLETIME, 100, 100 * 60 * 60 * 1000L),
- s(Property.TABLE_SCAN_MAXMEM, 10 * 1024, 10 * 1024 * 1024),
- s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE, 10 * 1024, 10 * 1024 * 1024L),
- s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, 10 * 1024, 10 * 1024 * 1024L),
- s(Property.TABLE_FILE_REPLICATION, 0, 5),
- s(Property.TABLE_FILE_MAX, 2, 50),};
- // @formatter:on
+ Setting[] settings = {
+ s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
+ s(Property.TSERV_BULK_PROCESS_THREADS, 1, 10),
+ s(Property.TSERV_BULK_RETRY, 1, 10),
+ s(Property.TSERV_BULK_TIMEOUT, 10, 600),
+ s(Property.TSERV_BULK_ASSIGNMENT_THREADS, 1, 10),
+ s(Property.TSERV_DATACACHE_SIZE, 0, 1000000000L),
+ s(Property.TSERV_INDEXCACHE_SIZE, 0, 1000000000L),
+ s(Property.TSERV_CLIENT_TIMEOUT, 100, 10000),
+ s(Property.TSERV_MAJC_MAXCONCURRENT, 1, 10),
+ s(Property.TSERV_MAJC_DELAY, 100, 10000),
+ s(Property.TSERV_MAJC_THREAD_MAXOPEN, 3, 100),
+ s(Property.TSERV_MINC_MAXCONCURRENT, 1, 10),
+ s(Property.TSERV_DEFAULT_BLOCKSIZE, 100000, 10000000L),
+ s(Property.TSERV_MAX_IDLE, 10000, 500 * 1000),
+ s(Property.TSERV_MAXMEM, 1000000, 3 * 1024 * 1024 * 1024L),
+ s(Property.TSERV_READ_AHEAD_MAXCONCURRENT, 1, 25),
+ s(Property.TSERV_MIGRATE_MAXCONCURRENT, 1, 10),
+ s(Property.TSERV_TOTAL_MUTATION_QUEUE_MAX, 10000, 1024 * 1024),
+ s(Property.TSERV_RECOVERY_MAX_CONCURRENT, 1, 100),
+ s(Property.TSERV_SCAN_MAX_OPENFILES, 10, 1000),
+ s(Property.TSERV_THREADCHECK, 100, 10000),
+ s(Property.TSERV_MINTHREADS, 1, 100),
+ s(Property.TSERV_SESSION_MAXIDLE, 100, 5 * 60 * 1000),
+ s(Property.TSERV_SORT_BUFFER_SIZE, 1024 * 1024, 1024 * 1024 * 1024L),
+ s(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN, 5, 100),
+ s(Property.TSERV_WAL_BLOCKSIZE, 1024 * 1024,
+ 1024 * 1024 * 1024 * 10L),
+ s(Property.TSERV_WORKQ_THREADS, 1, 10),
+ s(Property.MASTER_BULK_THREADPOOL_SIZE, 1, 10),
+ s(Property.MASTER_BULK_RETRIES, 1, 10),
+ s(Property.MASTER_BULK_TIMEOUT, 10, 600),
+ s(Property.MASTER_FATE_THREADPOOL_SIZE, 1, 100),
+ s(Property.MASTER_RECOVERY_DELAY, 0, 100),
+ s(Property.MASTER_LEASE_RECOVERY_WAITING_PERIOD, 0, 10),
+ s(Property.MASTER_RECOVERY_MAXTIME, 10, 1000),
+ s(Property.MASTER_THREADCHECK, 100, 10000),
+ s(Property.MASTER_MINTHREADS, 1, 200),};
+
+ Setting[] tableSettings = {
+ s(Property.TABLE_MAJC_RATIO, 1, 10),
+ s(Property.TABLE_MAJC_COMPACTALL_IDLETIME, 100,
+ 10 * 60 * 60 * 1000L),
+ s(Property.TABLE_SPLIT_THRESHOLD, 10 * 1024,
+ 10L * 1024 * 1024 * 1024),
+ s(Property.TABLE_MINC_COMPACT_IDLETIME, 100, 100 * 60 * 60 * 1000L),
+ s(Property.TABLE_SCAN_MAXMEM, 10 * 1024, 10 * 1024 * 1024),
+ s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE, 10 * 1024,
+ 10 * 1024 * 1024L),
+ s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, 10 * 1024,
+ 10 * 1024 * 1024L),
+ s(Property.TABLE_FILE_REPLICATION, 0, 5),
+ s(Property.TABLE_FILE_MAX, 2, 50),};
+ // @formatter:on
@Override
public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
index acd9367..1c0ecb6 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/concurrent/RenameTable.java
@@ -63,7 +63,8 @@ public class RenameTable extends Test {
} catch (TableNotFoundException e) {
Throwable cause = e.getCause();
if (null != cause) {
- // Rename has to have failed on the destination namespace, because the source namespace
+ // Rename has to have failed on the destination namespace,
+ // because the source namespace
// couldn't be deleted with our table in it
if (cause.getClass().isAssignableFrom(NamespaceNotFoundException.class)) {
log.debug("Rename failed because new namespace doesn't exist: " + newNamespace, cause);
@@ -76,7 +77,8 @@ public class RenameTable extends Test {
} catch (IllegalArgumentException e) {
log.debug("Rename: " + e.toString());
} catch (AccumuloException e) {
- // Catch the expected failure when we try to rename a table into a new namespace
+ // Catch the expected failure when we try to rename a table into a
+ // new namespace
if (!srcNamespace.equals(newNamespace)) {
return;
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
index 8fa1910..1bc913d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/image/ScanMeta.java
@@ -42,7 +42,8 @@ public class ScanMeta extends Test {
@Override
public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
- // scan just the metadata of the images table to find N hashes... use the batch scanner to lookup those N hashes in the index table
+ // scan just the metadata of the images table to find N hashes... use
+ // the batch scanner to lookup those N hashes in the index table
// this scan will test locality groups....
String indexTableName = state.getString("indexTableName");
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTool.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTool.java
index a89a3f5..378aa3b 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTool.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/multitable/CopyTool.java
@@ -74,8 +74,10 @@ public class CopyTool extends Configured implements Tool {
final String principal;
final AuthenticationToken token;
if (clientConf.getBoolean(ClientProperty.INSTANCE_RPC_SASL_ENABLED.getKey(), false)) {
- // Use the Kerberos creds to request a DelegationToken for MapReduce to use
- // We could use the specified keytab (args[1]), but we're already logged in and don't need to, so we can just use the current user
+ // Use the Kerberos creds to request a DelegationToken for MapReduce
+ // to use
+ // We could use the specified keytab (args[1]), but we're already
+ // logged in and don't need to, so we can just use the current user
KerberosToken kt = new KerberosToken();
try {
UserGroupInformation user = UserGroupInformation.getCurrentUser();
@@ -90,7 +92,8 @@ public class CopyTool extends Configured implements Tool {
ZooKeeperInstance inst = new ZooKeeperInstance(clientConf);
Connector conn = inst.getConnector(principal, kt);
- // Do the explicit check to see if the user has the permission to get a delegation token
+ // Do the explicit check to see if the user has the permission
+ // to get a delegation token
if (!conn.securityOperations().hasSystemPermission(conn.whoami(), SystemPermission.OBTAIN_DELEGATION_TOKEN)) {
log.error(principal + " doesn't have the " + SystemPermission.OBTAIN_DELEGATION_TOKEN.name()
+ " SystemPermission neccesary to obtain a delegation token. MapReduce tasks cannot automatically use the client's"
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
index 6d6bf64..341b106 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/AlterTablePerm.java
@@ -77,7 +77,7 @@ public class AlterTablePerm extends Test {
Connector conn = env.getAccumuloInstance().getConnector(sourceUser, sourceToken);
canGive = WalkingSecurity.get(state, env).canGrantTable(new Credentials(sourceUser, sourceToken).toThrift(env.getAccumuloInstance()), target,
- WalkingSecurity.get(state, env).getTableName(), WalkingSecurity.get(state, env).getNamespaceName());
+ WalkingSecurity.get(state, env).getTableName(), WalkingSecurity.get(state, env).getNamespaceName());
// toggle
if (!"take".equals(action) && !"give".equals(action)) {
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
index a69b295..66f3be5 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/DropTable.java
@@ -55,7 +55,7 @@ public class DropTable extends Test {
boolean exists = WalkingSecurity.get(state, env).getTableExists();
boolean hasPermission = WalkingSecurity.get(state, env).canDeleteTable(new Credentials(principal, token).toThrift(env.getAccumuloInstance()), tableName,
- namespaceName);
+ namespaceName);
try {
conn.tableOperations().delete(tableName);
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java
index d7a3cdd..906ffcc 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/SetAuths.java
@@ -51,8 +51,8 @@ public class SetAuths extends Test {
Connector conn = env.getAccumuloInstance().getConnector(authPrincipal, authToken);
boolean exists = WalkingSecurity.get(state, env).userExists(target);
- boolean hasPermission = WalkingSecurity.get(state, env).canChangeAuthorizations(new Credentials(authPrincipal, authToken).toThrift(env.getAccumuloInstance()),
- target);
+ boolean hasPermission = WalkingSecurity.get(state, env).canChangeAuthorizations(
+ new Credentials(authPrincipal, authToken).toThrift(env.getAccumuloInstance()), target);
Authorizations auths;
if (authsString.equals("_random")) {
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
index 7a40ac3..8896556 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/security/TableOp.java
@@ -166,8 +166,10 @@ public class TableOp extends Test {
writer.addMutation(m);
writer.close();
} catch (MutationsRejectedException mre) {
- // Currently no method for detecting reason for mre. Waiting on ACCUMULO-670
- // For now, just wait a second and go again if they can write!
+ // Currently no method for detecting reason for mre.
+ // Waiting on ACCUMULO-670
+ // For now, just wait a second and go again if they can
+ // write!
if (!canWrite)
return;
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerifyTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerifyTool.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerifyTool.java
index 2ec8bd4..90ca2d9 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerifyTool.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/sequential/MapRedVerifyTool.java
@@ -117,7 +117,8 @@ public class MapRedVerifyTool extends Configured implements Tool {
ZooKeeperInstance inst = new ZooKeeperInstance(clientConf);
Connector conn = inst.getConnector(newPrincipal, token);
- // Do the explicit check to see if the user has the permission to get a delegation token
+ // Do the explicit check to see if the user has the permission
+ // to get a delegation token
if (!conn.securityOperations().hasSystemPermission(conn.whoami(), SystemPermission.OBTAIN_DELEGATION_TOKEN)) {
log.error(newPrincipal + " doesn't have the " + SystemPermission.OBTAIN_DELEGATION_TOKEN.name()
+ " SystemPermission neccesary to obtain a delegation token. MapReduce tasks cannot automatically use the client's"
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
index 4f6361e..170674d 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/DeleteSomeDocs.java
@@ -36,7 +36,8 @@ public class DeleteSomeDocs extends Test {
@Override
public void visit(State state, RandWalkEnv env, Properties props) throws Exception {
- // delete documents that where the document id matches a given pattern from doc and index table
+ // delete documents that where the document id matches a given pattern
+ // from doc and index table
// using the batch deleter
Random rand = (Random) state.get("rand");
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
index 5f521d3..2764026 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/ExportIndex.java
@@ -53,7 +53,8 @@ public class ExportIndex extends Test {
fs.delete(new Path("/tmp/shard_export/" + indexTableName), true);
fs.delete(new Path("/tmp/shard_export/" + tmpIndexTableName), true);
- // disable spits, so that splits can be compared later w/o worrying one table splitting and the other not
+ // disable spits, so that splits can be compared later w/o worrying one
+ // table splitting and the other not
env.getAccumuloConnector().tableOperations().setProperty(indexTableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "20G");
long t1 = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
index afd36fd..9f97135 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/randomwalk/shard/Merge.java
@@ -40,7 +40,8 @@ public class Merge extends Test {
merge.mergomatic(env.getAccumuloConnector(), indexTableName, null, null, 256 * 1024 * 1024, true);
splits = env.getAccumuloConnector().tableOperations().listSplits(indexTableName);
if (splits.size() > splitSet.size()) {
- // throw an excpetion so that test will die an no further changes to table will occur...
+ // throw an excpetion so that test will die an no further changes to
+ // table will occur...
// this way table is left as is for debugging.
throw new Exception("There are more tablets after a merge: " + splits.size() + " was " + splitSet.size());
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/main/java/org/apache/accumulo/testing/core/stress/RandomWithinRange.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/testing/core/stress/RandomWithinRange.java b/core/src/main/java/org/apache/accumulo/testing/core/stress/RandomWithinRange.java
index 06cea28..033a1b8 100644
--- a/core/src/main/java/org/apache/accumulo/testing/core/stress/RandomWithinRange.java
+++ b/core/src/main/java/org/apache/accumulo/testing/core/stress/RandomWithinRange.java
@@ -44,7 +44,8 @@ public class RandomWithinRange {
if (min == max) {
return min;
} else {
- // we pick a random number that's between 0 and (max - min), then add
+ // we pick a random number that's between 0 and (max - min), then
+ // add
// min as an offset to get a random number that's [min, max)
return random.nextInt(max - min) + min;
}
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/FrameworkTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/FrameworkTest.java b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/FrameworkTest.java
index b33385d..ae2428a 100644
--- a/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/FrameworkTest.java
+++ b/core/src/test/java/org/apache/accumulo/testing/core/randomwalk/FrameworkTest.java
@@ -36,7 +36,8 @@ import org.xml.sax.SAXException;
public class FrameworkTest {
- // Need to use fully qualified name here because of conflict with org.apache.accumulo.testing.core.randomwalk.Test
+ // Need to use fully qualified name here because of conflict with
+ // org.apache.accumulo.testing.core.randomwalk.Test
@org.junit.Test
public void testXML() throws SAXException, URISyntaxException, ParserConfigurationException, IOException {
SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
http://git-wip-us.apache.org/repos/asf/accumulo-testing/blob/bef8ed20/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7cbc8e..7f249e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<twill.version>0.9.0</twill.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
+ <formatter.config>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</formatter.config>
</properties>
<dependencyManagement>
@@ -222,7 +223,22 @@
<configuration>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
</configuration>
- </plugin>
+ </plugin>
+ <plugin>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>0.5.2</version>
+ <configuration>
+ <configFile>${formatter.config}</configFile>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>