[2/2] accumulo-website git commit: Jekyll build from master:b7e5e7b

[ctubbsii]

Jekyll build from master:b7e5e7b

Link to related 3rd party graph project


Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/fd82a85e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/fd82a85e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/fd82a85e

Branch: refs/heads/asf-site
Commit: fd82a85e9a0ceed1c9b888360ba7e3612736596b
Parents: ee6c488
Author: Christopher Tubbs 
Authored: Tue Dec 6 21:44:28 2016 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 6 21:45:10 2016 -0500

--
 feed.xml  | 4 ++--
 projects.html | 7 +++
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd82a85e/feed.xml
--
diff --git a/feed.xml b/feed.xml
index 8f6805c..4287291 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Tue, 06 Dec 2016 15:46:28 -0500
-Tue, 06 Dec 2016 15:46:28 -0500
+Tue, 06 Dec 2016 21:45:05 -0500
+Tue, 06 Dec 2016 21:45:05 -0500
 Jekyll v3.3.0
 
   

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd82a85e/projects.html
--
diff --git a/projects.html b/projects.html
index 6e43177..2b0f975 100644
--- a/projects.html
+++ b/projects.html
@@ -218,6 +218,13 @@ general performance numbers of the project.
 an Accumulo cluster via Accumulo’s Apache Thrift proxy server. https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual;>Documentation
 and
 https://github.com/JHUAPL/accumulo-proxy-instance;>code are 
available.
 
+AccumuloGraph
+
+ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
+Apache Accumulo as the backend.
+https://jhuapl.github.io/AccumuloGraph/;>Documentation and
+https://github.com/JHUAPL/AccumuloGraph;>code are available.
+
 Github
 
 https://github.com/search?q=accumulotype=Repositories;>Github 
also contains many projects that use/reference Accumulo

[1/2] accumulo-website git commit: Link to related 3rd party graph project

[ctubbsii]

Repository: accumulo-website
Updated Branches:
  refs/heads/asf-site ee6c48898 -> fd82a85e9
  refs/heads/master ec2e75354 -> b7e5e7b44


Link to related 3rd party graph project


Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/b7e5e7b4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/b7e5e7b4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/b7e5e7b4

Branch: refs/heads/master
Commit: b7e5e7b44f9d4b22c37aa5574472362e86471ba1
Parents: ec2e753
Author: Christopher Tubbs 
Authored: Tue Dec 6 21:44:28 2016 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 6 21:44:28 2016 -0500

--
 projects.md | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/b7e5e7b4/projects.md
--
diff --git a/projects.md b/projects.md
index 9abef9f..598f678 100644
--- a/projects.md
+++ b/projects.md
@@ -77,6 +77,13 @@ ProxyInstance is a Java Instance implementation of the 
Accumulo Instance interfa
 an Accumulo cluster via Accumulo's Apache Thrift proxy server. 
[Documentation](https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual)
 and
 [code](https://github.com/JHUAPL/accumulo-proxy-instance) are available.
 
+ AccumuloGraph
+
+ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
+Apache Accumulo as the backend.
+[Documentation](https://jhuapl.github.io/AccumuloGraph/) and
+[code](https://github.com/JHUAPL/AccumuloGraph) are available.
+
 ## Github
 
 [Github](https://github.com/search?q=accumulo=Repositories) also contains 
many projects that use/reference Accumulo

accumulo-examples git commit: Adding LICENSE, NOTICE & README.md

[mwalch]

Repository: accumulo-examples
Updated Branches:
  refs/heads/master [created] bb64db9c3


Adding LICENSE, NOTICE & README.md


Project: http://git-wip-us.apache.org/repos/asf/accumulo-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-examples/commit/bb64db9c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-examples/tree/bb64db9c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-examples/diff/bb64db9c

Branch: refs/heads/master
Commit: bb64db9c31c34f392f488258435027d93fc3452a
Parents: 
Author: Mike Walch 
Authored: Tue Dec 6 16:00:54 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 16:00:54 2016 -0500

--
 LICENSE   | 202 +
 NOTICE|   5 ++
 README.md |   1 +
 3 files changed, 208 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo-examples/blob/bb64db9c/LICENSE
--
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, 

[2/2] accumulo-website git commit: Jekyll build from master:ec2e753

[mwalch]

Jekyll build from master:ec2e753

Created version of Accumulo logo for dark backgrounds

* Included SVG & PNG formats
* Adding processing code that was used to create original logo
* Minor changes to CSS


Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/ee6c4889
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/ee6c4889
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/ee6c4889

Branch: refs/heads/asf-site
Commit: ee6c488983cb054016ef45a1534d58faba2caf8a
Parents: e7741fc
Author: Mike Walch 
Authored: Tue Dec 6 15:46:32 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 15:46:32 2016 -0500

--
 css/accumulo.css  |   8 +-
 feed.xml  |   4 +-
 images/accumulo-logo-dark.png | Bin 0 -> 4729 bytes
 images/accumulo-logo-dark.svg | 296 +
 4 files changed, 300 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/ee6c4889/css/accumulo.css
--
diff --git a/css/accumulo.css b/css/accumulo.css
index 0958ed4..7784523 100644
--- a/css/accumulo.css
+++ b/css/accumulo.css
@@ -75,9 +75,9 @@ h6 { font-size: 15px; }
 
 body { font-size: 14px; }
 
-code { background-color: #f5f5f5; color: #20b2aa; }
+code { background-color: #f5f5f5; color: #20b2aa; /* override nowrap in 
bootstrap */ white-space: normal; }
 
-#nav-logo { padding-top: 10px; padding-bottom: 10px; }
+#nav-logo { padding-top: 10px; padding-bottom: 10px; padding-left: 10px; }
 
 .nav-link, li.dropdown { padding-top: 5px; }
 
@@ -117,12 +117,8 @@ footer > p { width: 60%; margin-left: auto; margin-right: 
auto; }
 
 #release_notes_testing th, #release_notes_testing td { padding: 5px; }
 
-#download-button-sidebar { width: 60%; margin-left: auto; margin-right: auto; }
-
 #accumulo-summit-logo img { height: 40px; }
 
-code { /* override nowrap in bootstrap */ white-space: normal; }
-
 .header-link { padding-left: 5px; opacity: 0; \-webkit-transition: opacity 
0.2s ease-in-out 0.1s; \-moz-transition: opacity 0.2s ease-in-out 0.1s; 
\-ms-transition: opacity 0.2s ease-in-out 0.1s; }
 
 h2:hover .header-link, h3:hover .header-link, h4:hover .header-link, h5:hover 
.header-link, h6:hover .header-link { opacity: 1; }

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/ee6c4889/feed.xml
--
diff --git a/feed.xml b/feed.xml
index d08824d..8f6805c 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml; rel="self" 
type="application/rss+xml"/>
-Fri, 02 Dec 2016 12:49:07 -0500
-Fri, 02 Dec 2016 12:49:07 -0500
+Tue, 06 Dec 2016 15:46:28 -0500
+Tue, 06 Dec 2016 15:46:28 -0500
 Jekyll v3.3.0
 
   

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/ee6c4889/images/accumulo-logo-dark.png
--
diff --git a/images/accumulo-logo-dark.png b/images/accumulo-logo-dark.png
new file mode 100644
index 000..dc74cb9
Binary files /dev/null and b/images/accumulo-logo-dark.png differ

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/ee6c4889/images/accumulo-logo-dark.svg
--
diff --git a/images/accumulo-logo-dark.svg b/images/accumulo-logo-dark.svg
new file mode 100644
index 000..603bc16
--- /dev/null
+++ b/images/accumulo-logo-dark.svg
@@ -0,0 +1,296 @@
+
+
+
+http://purl.org/dc/elements/1.1/;
+   xmlns:cc="http://creativecommons.org/ns#;
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg="http://www.w3.org/2000/svg;
+   xmlns="http://www.w3.org/2000/svg;
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape;
+   version="1.1"
+   width="550px"
+   height="150px"
+   viewBox="0 0 550 150"
+   id="svg2940"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="accumulo-logo-dark.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage; />
+
+  
+
+  
+  
+
+  
+  
+
+
+  path.frame {
+stroke: rgb(192, 192, 192);
+stroke-width: 2;
+stroke-linecap: round;
+fill: none;
+  }
+  path.a, path.c, path.u, path.m, path.l, path.o {
+stroke: #00;
+stroke-width: 6;
+stroke-linecap: round;
+fill: none;
+  }
+  text {
+font: 16px sans-serif;
+stroke: rgb(96, 96, 96);
+fill: rgb(96, 96, 96);
+  }
+
+
+
+ 

[03/11] accumulo git commit: ACCUMULO-4532 Improve documentation of examples

[mwalch]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/combiner.md
--
diff --git a/docs/src/main/resources/examples/combiner.md 
b/docs/src/main/resources/examples/combiner.md
new file mode 100644
index 000..03841d3
--- /dev/null
+++ b/docs/src/main/resources/examples/combiner.md
@@ -0,0 +1,72 @@
+
+---
+title: Apache Accumulo Combiner Example
+---
+
+This tutorial uses the following Java class, which can be found in 
org.apache.accumulo.examples.simple.combiner in the examples-simple module:
+
+ * StatsCombiner.java - a combiner that calculates max, min, sum, and count
+
+This is a simple combiner example. To build this example run maven and then
+copy the produced jar into the accumulo lib dir. This is already done in the
+tar distribution.
+
+$ bin/accumulo shell -u username
+Enter current password for 'username'@'instance': ***
+
+Shell - Apache Accumulo Interactive Shell
+-
+- version: 1.5.0
+- instance name: instance
+- instance id: ----
+-
+- type 'help' for a list of available commands
+-
+username@instance> createtable runners
+username@instance runners> setiter -t runners -p 10 -scan -minc -majc -n 
decStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+Combiner that keeps track of min, max, sum, and count
+--> set StatsCombiner parameter all, set to true to apply Combiner 
to every column, otherwise leave blank. if true, columns option will be 
ignored.:
+--> set StatsCombiner parameter columns, [:]{,[:]} escape non aplhanum chars using %.: stat
+--> set StatsCombiner parameter radix, radix/base of the numbers: 
10
+username@instance runners> setiter -t runners -p 11 -scan -minc -majc -n 
hexStats -class org.apache.accumulo.examples.simple.combiner.StatsCombiner
+Combiner that keeps track of min, max, sum, and count
+--> set StatsCombiner parameter all, set to true to apply Combiner 
to every column, otherwise leave blank. if true, columns option will be 
ignored.:
+--> set StatsCombiner parameter columns, [:]{,[:]} escape non aplhanum chars using %.: hstat
+--> set StatsCombiner parameter radix, radix/base of the numbers: 
16
+username@instance runners> insert 123456 name first Joe
+username@instance runners> insert 123456 stat marathon 240
+username@instance runners> scan
+123456 name:first []Joe
+123456 stat:marathon []240,240,240,1
+username@instance runners> insert 123456 stat marathon 230
+username@instance runners> insert 123456 stat marathon 220
+username@instance runners> scan
+123456 name:first []Joe
+123456 stat:marathon []220,240,690,3
+username@instance runners> insert 123456 hstat virtualMarathon 6a
+username@instance runners> insert 123456 hstat virtualMarathon 6b
+username@instance runners> scan
+123456 hstat:virtualMarathon []6a,6b,d5,2
+123456 name:first []Joe
+123456 stat:marathon []220,240,690,3
+
+In this example a table is created and the example stats combiner is applied to
+the column family stat and hstat. The stats combiner computes min,max,sum, and
+count. It can be configured to use a different base or radix. In the example
+above the column family stat is configured for base 10 and the column family
+hstat is configured for base 16.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/compactionStrategy.md
--
diff --git a/docs/src/main/resources/examples/compactionStrategy.md 
b/docs/src/main/resources/examples/compactionStrategy.md
new file mode 100644
index 000..642c3ea
--- /dev/null
+++ b/docs/src/main/resources/examples/compactionStrategy.md
@@ -0,0 +1,67 @@
+
+---
+title: Apache Accumulo Customizing the Compaction Strategy
+---
+
+This tutorial uses the following Java classes, which can be found in 
org.apache.accumulo.tserver.compaction: 
+
+ * DefaultCompactionStrategy.java - determines which files to compact based on 
table.compaction.major.ratio and table.file.max
+ * EverythingCompactionStrategy.java - compacts all files
+ * SizeLimitCompactionStrategy.java - compacts files no bigger than 
table.majc.compaction.strategy.opts.sizeLimit
+ * TwoTierCompactionStrategy.java - uses default compression for smaller files 
and table.majc.compaction.strategy.opts.file.large.compress.type for larger 
files
+
+This is an example of how to configure a compaction strategy. By default 
Accumulo will always use the DefaultCompactionStrategy, unless 
+these steps are taken to change the configuration.  Use the strategy and 
settings that best fits your Accumulo setup. This example shows
+how to configure and test one of the more complicated strategies, the 

[05/11] accumulo git commit: ACCUMULO-4532 Improve documentation of examples

[mwalch]

ACCUMULO-4532 Improve documentation of examples

* Renamed files and structured them to be markdown
* Fixed references in user manual


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/52d526b9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/52d526b9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/52d526b9

Branch: refs/heads/master
Commit: 52d526b9b25a3cacae48092bc7669eb911af94e2
Parents: add2217
Author: Mike Walch 
Authored: Mon Dec 5 16:43:49 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:04:34 2016 -0500

--
 docs/src/main/asciidoc/chapters/analytics.txt   |   3 +-
 docs/src/main/asciidoc/chapters/clients.txt |  13 +-
 .../asciidoc/chapters/high_speed_ingest.txt |   7 +-
 docs/src/main/asciidoc/chapters/sampling.txt|  10 +-
 .../asciidoc/chapters/table_configuration.txt   |  17 +-
 docs/src/main/resources/examples/README |  97 
 docs/src/main/resources/examples/README.batch   |  55 -
 docs/src/main/resources/examples/README.bloom   | 219 --
 .../main/resources/examples/README.bulkIngest   |  33 ---
 .../main/resources/examples/README.classpath|  68 --
 docs/src/main/resources/examples/README.client  |  79 ---
 .../src/main/resources/examples/README.combiner |  70 --
 .../examples/README.compactionStrategy  |  65 --
 .../main/resources/examples/README.constraints  |  54 -
 docs/src/main/resources/examples/README.dirlist | 114 --
 docs/src/main/resources/examples/README.export  |  91 
 .../src/main/resources/examples/README.filedata |  47 
 docs/src/main/resources/examples/README.filter  | 110 -
 .../main/resources/examples/README.helloworld   |  47 
 .../main/resources/examples/README.isolation|  50 -
 docs/src/main/resources/examples/README.mapred  | 154 -
 .../main/resources/examples/README.maxmutation  |  49 
 docs/src/main/resources/examples/README.regex   |  57 -
 .../main/resources/examples/README.reservations |  66 --
 .../main/resources/examples/README.rgbalancer   | 159 -
 docs/src/main/resources/examples/README.rowhash |  59 -
 docs/src/main/resources/examples/README.sample  | 192 
 docs/src/main/resources/examples/README.shard   |  66 --
 .../main/resources/examples/README.tabletofile  |  59 -
 .../src/main/resources/examples/README.terasort |  50 -
 .../main/resources/examples/README.visibility   | 131 ---
 docs/src/main/resources/examples/batch.md   |  57 +
 docs/src/main/resources/examples/bloom.md   | 221 +++
 docs/src/main/resources/examples/bulkIngest.md  |  35 +++
 docs/src/main/resources/examples/classpath.md   |  69 ++
 docs/src/main/resources/examples/client.md  |  81 +++
 docs/src/main/resources/examples/combiner.md|  72 ++
 .../resources/examples/compactionStrategy.md|  67 ++
 docs/src/main/resources/examples/constraints.md |  56 +
 docs/src/main/resources/examples/dirlist.md | 118 ++
 docs/src/main/resources/examples/export.md  |  93 
 docs/src/main/resources/examples/filedata.md|  51 +
 docs/src/main/resources/examples/filter.md  | 112 ++
 docs/src/main/resources/examples/helloworld.md  |  49 
 docs/src/main/resources/examples/index.md   | 100 +
 docs/src/main/resources/examples/isolation.md   |  51 +
 docs/src/main/resources/examples/mapred.md  | 156 +
 docs/src/main/resources/examples/maxmutation.md |  51 +
 docs/src/main/resources/examples/regex.md   |  59 +
 .../src/main/resources/examples/reservations.md |  68 ++
 docs/src/main/resources/examples/rgbalancer.md  | 161 ++
 docs/src/main/resources/examples/rowhash.md |  61 +
 docs/src/main/resources/examples/sample.md  | 193 
 docs/src/main/resources/examples/shard.md   |  68 ++
 docs/src/main/resources/examples/tabletofile.md |  61 +
 docs/src/main/resources/examples/terasort.md|  52 +
 docs/src/main/resources/examples/visibility.md  | 133 +++
 57 files changed, 2316 insertions(+), 2270 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/asciidoc/chapters/analytics.txt
--
diff --git a/docs/src/main/asciidoc/chapters/analytics.txt 
b/docs/src/main/asciidoc/chapters/analytics.txt
index 00e0403..3954788 100644
--- a/docs/src/main/asciidoc/chapters/analytics.txt
+++ b/docs/src/main/asciidoc/chapters/analytics.txt
@@ -185,8 +185,7 @@ AccumuloOutputFormat.setZooKeeperInstance(job, "myinstance",
 

[08/11] accumulo git commit: ACCUMULO-4531 Remove bulkIngest.html

[mwalch]

ACCUMULO-4531 Remove bulkIngest.html

* Similar documentation exists in 'High-speed Ingest' section of user manual


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0e68a3a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0e68a3a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0e68a3a

Branch: refs/heads/master
Commit: c0e68a3a82bb6fa7eb370039537aac8337f22e47
Parents: 43e98d4
Author: Mike Walch 
Authored: Tue Dec 6 10:58:23 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:04:54 2016 -0500

--
 docs/src/main/resources/bulkIngest.html | 114 ---
 1 file changed, 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0e68a3a/docs/src/main/resources/bulkIngest.html
--
diff --git a/docs/src/main/resources/bulkIngest.html 
b/docs/src/main/resources/bulkIngest.html
deleted file mode 100644
index 9e9896e..000
--- a/docs/src/main/resources/bulkIngest.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-Accumulo Bulk Ingest
-
-
-
-
-Apache Accumulo Documentation : Bulk Ingest
-
-Accumulo supports the ability to import sorted files produced by an
-external process into an online table. Often, it is much faster to churn
-through large amounts of data using map/reduce to produce the these files.
-The new files can be incorporated into Accumulo using bulk ingest.
-
-
-Construct an org.apache.accumulo.core.client.Connector 
instance
-Call connector.tableOperations().getSplits()
-Run a map/reduce job using RangePartitioner
-with splits from the previous step
-Call connector.tableOperations().importDirectory() passing 
the output directory of the MapReduce job
-
-
-Files can also be imported using the "importdirectory" shell command.
-
-A complete example is available in README.bulkIngest
-
-Importing data using whole files of sorted data can be very efficient, but 
it differs
-from live ingest in the following ways:
-
- Table constraints are not applied against they data in the file.
- Adding new files to tables are likely to trigger major compactions.
- The timestamp in the file could contain strange values. Accumulo can be 
asked to use the ingest timestamp for all values if this is a concern.
- It is possible to create invalid visibility values (for example "&|"). 
This will cause errors when the data is accessed.
- Bulk imports do not effect the entry counts in the monitor page until the 
files are compacted.
-
-
-Best Practices
-
-Consider two approaches to creating ingest files using map/reduce.
-
-
- A large file containing the Key/Value pairs for only a single tablet.
- A set of small files containing Key/Value pairs for every tablet.
-
-
-In the first case, adding the file requires telling a single tablet server 
about a single file. Even if the file
-is 20G in size, it is one call to the tablet server. The tablet server makes 
one extra file entry in the
-tablet's metadata, and the data is now part of the tablet.
-
-In the second case, an request must be made for each tablet for each file 
to be added. If there
-100 files and 100 tablets, this will be 10K requests, and the number of files 
needed to be opened
-for scans on these tablets will be very large. Major compactions will most 
likely start which will eventually
-fix the problem, but a lot more work needs to be done by accumulo to read 
these files.
-
-Getting good, fast, bulk import performance depends on creating files like 
the first, and avoiding files like
-the second.
-
-For this reason, a RangePartitioner should be used to create files when
-writing with the AccumuloFileOutputFormat.
-
-Hash partition is not recommended because it will put keys in random
-groups, exactly like our bad approach.
-
-Any set of cut points for range partitioning can be used in a map
-reduce job, but using Accumulo's current splits is probably the most
-optimal thing to do. However in some cases there may be too many
-splits. For example if there are 2000 splits, you would need to run
-2001 reducers. To overcome this problem use the
-connector.tableOperations.getSplits(table name,max
-splits) method. This method will not return more than
- max splits  splits, but the splits it returns
-will optimally partition the data for Accumulo.
-
-Remember that Accumulo never splits rows across tablets.
-Therefore the range partitioner only considers rows when partitioning.
-
-When bulk importing many files into a new table, it might be good to 
pre-split the table to bring
-additional resources to accepting the data. For example, if you know your data 
is indexed based on the
-date, pre-creating splits for each day will allow files to fall into natural 
splits. Having more tablets
-accept the new 

[01/11] accumulo git commit: ACCUMULO-4531 Removed isolation.html

[mwalch]

Repository: accumulo
Updated Branches:
  refs/heads/master bebfbd0ed -> 13201a814


ACCUMULO-4531 Removed isolation.html

* Moved documentation to clients chapter were some already existed


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/add22171
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/add22171
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/add22171

Branch: refs/heads/master
Commit: add22171568d9bfe25e0db46105bc052d5991c37
Parents: d4d7d09
Author: Mike Walch 
Authored: Fri Dec 2 15:07:59 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 11:33:35 2016 -0500

--
 docs/src/main/asciidoc/chapters/clients.txt |  9 +++--
 docs/src/main/resources/isolation.html  | 51 
 2 files changed, 6 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/add22171/docs/src/main/asciidoc/chapters/clients.txt
--
diff --git a/docs/src/main/asciidoc/chapters/clients.txt 
b/docs/src/main/asciidoc/chapters/clients.txt
index 958ab11..63bb937 100644
--- a/docs/src/main/asciidoc/chapters/clients.txt
+++ b/docs/src/main/asciidoc/chapters/clients.txt
@@ -264,8 +264,12 @@ for(Entry entry : bscan) {
 }
 
 
-An example of the BatchScanner can be found at
-+accumulo/docs/examples/README.batch+.
+An example of the BatchScanner can be found at 
+accumulo/docs/examples/README.batch+.
+
+At this time, there is no client side isolation support for the BatchScanner.
+You may consider using the WholeRowIterator with the BatchScanner to achieve
+isolation. The drawback of this approach is that entire rows are read into
+memory on the server side. If a row is too big, it may crash a tablet server.
 
 === Proxy
 
@@ -281,7 +285,6 @@ The proxy server can live on any node in which the basic 
client API would work.
 means it must be able to communicate with the Master, ZooKeepers, NameNode, 
and the
 DataNodes. A proxy client only needs the ability to communicate with the proxy 
server.
 
-
  Configuration
 
 The configuration options for the proxy server live inside of a properties 
file. At

http://git-wip-us.apache.org/repos/asf/accumulo/blob/add22171/docs/src/main/resources/isolation.html
--
diff --git a/docs/src/main/resources/isolation.html 
b/docs/src/main/resources/isolation.html
deleted file mode 100644
index fcda45e..000
--- a/docs/src/main/resources/isolation.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-Accumulo Isolation
-
-
-
-
-Apache Accumulo Documentation : Isolation
-
-Scanning
-
-Accumulo supports the ability to present an isolated view of rows when 
scanning. There are three possible ways that a row could change in accumulo :
-
- a mutation applied to a table
- iterators executed as part of a minor or major compaction
- bulk import of new files
-
-Isolation guarantees that either all or none of the changes made by these
-operations on a row are seen. Use the IsolatedScanner to obtain an
-isolated view of an accumulo table. When using the regular scanner it is
-possible to see a non isolated view of a row. For example if a mutation
-modifies three columns, it is possible that you will only see two of those
-modifications. With the isolated scanner either all three of the changes are
-seen or none. For an example of this try running the
-InterferenceTest example.
-
-At this time there is no client side isolation support for the
-BatchScanner. You may consider using the
-WholeRowIterator with the  BatchScanner to achieve
-isolation though. This drawback of doing this is that entire rows are read into
-memory on the server side. If a row is too big, it may crash a tablet server.
-The IsolatedScanner buffers rows on the client side so a large 
row will not crash a tablet server.
-
-Iterators
-See the user manual's chapter on iterator design for more information on 
considerations when Isolation is enabled.

[04/11] accumulo git commit: ACCUMULO-4532 Improve documentation of examples

[mwalch]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/README.isolation
--
diff --git a/docs/src/main/resources/examples/README.isolation 
b/docs/src/main/resources/examples/README.isolation
deleted file mode 100644
index 4739f59..000
--- a/docs/src/main/resources/examples/README.isolation
+++ /dev/null
@@ -1,50 +0,0 @@
-Title: Apache Accumulo Isolation Example
-Notice: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.
-
-
-Accumulo has an isolated scanner that ensures partial changes to rows are not
-seen. Isolation is documented in ../docs/isolation.html and the user manual.
-
-InterferenceTest is a simple example that shows the effects of scanning with
-and without isolation. This program starts two threads. One threads
-continually upates all of the values in a row to be the same thing, but
-different from what it used to be. The other thread continually scans the
-table and checks that all values in a row are the same. Without isolation the
-scanning thread will sometimes see different values, which is the result of
-reading the row at the same time a mutation is changing the row.
-
-Below, Interference Test is run without isolation enabled for 5000 iterations
-and it reports problems.
-
-$ ./bin/accumulo 
org.apache.accumulo.examples.simple.isolation.InterferenceTest -i instance -z 
zookeepers -u username -p password -t isotest --iterations 5000
-ERROR Columns in row 053 had multiple values [53, 4553]
-ERROR Columns in row 061 had multiple values [561, 61]
-ERROR Columns in row 070 had multiple values [570, 1070]
-ERROR Columns in row 079 had multiple values [1079, 1579]
-ERROR Columns in row 088 had multiple values [2588, 1588]
-ERROR Columns in row 106 had multiple values [2606, 3106]
-ERROR Columns in row 115 had multiple values [4615, 3115]
-finished
-
-Below, Interference Test is run with isolation enabled for 5000 iterations and
-it reports no problems.
-
-$ ./bin/accumulo 
org.apache.accumulo.examples.simple.isolation.InterferenceTest -i instance -z 
zookeepers -u username -p password -t isotest --iterations 5000 --isolated
-finished
-
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/README.mapred
--
diff --git a/docs/src/main/resources/examples/README.mapred 
b/docs/src/main/resources/examples/README.mapred
deleted file mode 100644
index ddd0dbf..000
--- a/docs/src/main/resources/examples/README.mapred
+++ /dev/null
@@ -1,154 +0,0 @@
-Title: Apache Accumulo MapReduce Example
-Notice: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.
-
-This example uses mapreduce and accumulo to compute word counts for a set of
-documents. This is accomplished using a map-only mapreduce job and a
-accumulo table with combiners.
-
-To run this example you will need a directory in HDFS containing text files.
-The accumulo readme will be used to show how to run this example.
-
-$ hadoop fs -copyFromLocal /path/to/accumulo/README.md 
/user/username/wc/Accumulo.README
-$ hadoop fs -ls 

[02/11] accumulo git commit: ACCUMULO-4532 Improve documentation of examples

[mwalch]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/shard.md
--
diff --git a/docs/src/main/resources/examples/shard.md 
b/docs/src/main/resources/examples/shard.md
new file mode 100644
index 000..5e5789b
--- /dev/null
+++ b/docs/src/main/resources/examples/shard.md
@@ -0,0 +1,68 @@
+
+---
+title: Apache Accumulo Shard Example
+---
+
+Accumulo has an iterator called the intersecting iterator which supports 
querying a term index that is partitioned by
+document, or "sharded". This example shows how to use the intersecting 
iterator through these four programs:
+
+ * Index.java - Indexes a set of text files into an Accumulo table
+ * Query.java - Finds documents containing a given set of terms.
+ * Reverse.java - Reads the index table and writes a map of documents to terms 
into another table.
+ * ContinuousQuery.java  Uses the table populated by Reverse.java to select N 
random terms per document. Then it continuously and randomly queries those 
terms.
+
+To run these example programs, create two tables like below.
+
+username@instance> createtable shard
+username@instance shard> createtable doc2term
+
+After creating the tables, index some files. The following command indexes all 
of the java files in the Accumulo source code.
+
+$ cd /local/username/workspace/accumulo/
+$ find core/src server/src -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i instance -z zookeepers -t 
shard -u username -p password --partitions 30
+
+The following command queries the index to find all files containing 'foo' and 
'bar'.
+
+$ ./bin/accumulo org.apache.accumulo.examples.simple.shard.Query -i 
instance -z zookeepers -t shard -u username -p password foo bar
+
/local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/ColumnVisibilityTest.java
+
/local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/client/mock/MockConnectorTest.java
+
/local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/VisibilityEvaluatorTest.java
+
/local/username/workspace/accumulo/src/server/src/main/java/accumulo/test/functional/RowDeleteTest.java
+
/local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/logger/TestLogWriter.java
+
/local/username/workspace/accumulo/src/server/src/main/java/accumulo/test/functional/DeleteEverythingTest.java
+
/local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/data/KeyExtentTest.java
+
/local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/constraints/MetadataConstraintsTest.java
+
/local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/iterators/WholeRowIteratorTest.java
+
/local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/util/DefaultMapTest.java
+
/local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/tabletserver/InMemoryMapTest.java
+
+In order to run ContinuousQuery, we need to run Reverse.java to populate 
doc2term.
+
+$ ./bin/accumulo org.apache.accumulo.examples.simple.shard.Reverse -i 
instance -z zookeepers --shardTable shard --doc2Term doc2term -u username -p 
password
+
+Below ContinuousQuery is run using 5 terms. So it selects 5 random terms from 
each document, then it continually
+randomly selects one set of 5 terms and queries. It prints the number of 
matching documents and the time in seconds.
+
+$ ./bin/accumulo org.apache.accumulo.examples.simple.shard.ContinuousQuery 
-i instance -z zookeepers --shardTable shard --doc2Term doc2term -u username -p 
password --terms 5
+[public, core, class, binarycomparable, b] 2  0.081
+[wordtodelete, unindexdocument, doctablename, putdelete, insert] 1  0.041
+[import, columnvisibilityinterpreterfactory, illegalstateexception, cv, 
columnvisibility] 1  0.049
+[getpackage, testversion, util, version, 55] 1  0.048
+[for, static, println, public, the] 55  0.211
+[sleeptime, wrappingiterator, options, long, utilwaitthread] 1  0.057
+[string, public, long, 0, wait] 12  0.132

http://git-wip-us.apache.org/repos/asf/accumulo/blob/52d526b9/docs/src/main/resources/examples/tabletofile.md
--
diff --git a/docs/src/main/resources/examples/tabletofile.md 
b/docs/src/main/resources/examples/tabletofile.md
new file mode 100644
index 000..5316b51
--- /dev/null
+++ b/docs/src/main/resources/examples/tabletofile.md
@@ -0,0 +1,61 @@
+
+---
+Title: Apache Accumulo Table-to-File Example
+---
+
+This example uses mapreduce to extract specified columns from an existing 
table.
+
+To run this example you will need some data in a table. The following will
+put a trivial amount of data into accumulo using the accumulo shell:
+
+$ ./bin/accumulo shell -u username -p password
+

[09/11] accumulo git commit: ACCUMULO-4531 Removed index.html & documentation.css

[mwalch]

ACCUMULO-4531 Removed index.html & documentation.css


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2741998c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2741998c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2741998c

Branch: refs/heads/master
Commit: 2741998c220a1a899236a1aa307af30118612c5c
Parents: 89c0348
Author: Mike Walch 
Authored: Tue Dec 6 09:57:04 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:04:54 2016 -0500

--
 docs/src/main/resources/documentation.css | 112 -
 docs/src/main/resources/index.html|  39 -
 2 files changed, 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2741998c/docs/src/main/resources/documentation.css
--
diff --git a/docs/src/main/resources/documentation.css 
b/docs/src/main/resources/documentation.css
deleted file mode 100644
index 3457dac..000
--- a/docs/src/main/resources/documentation.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* 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.
-*/
-html, body {
-font-size: 10pt;
-font-family: verdana, arial;
-}
-
-h1 {
-font-size: 1.7em;
-font-variant: small-caps;
-text-align: left;
-}
-
-h2 {
-font-size: 1.3em;
-text-align: left;
-}
-
-.highlight {
-background-color: rgb(206,244,181);
-}
-
-.deprecated {
-text-decoration: line-through;
-}
-
-table {
-min-width: 60%;
-border: 1px #33 solid;
-border-spacing-top: 0;
-border-spacing-bottom: 0;
-border: 1px #33 solid;
-border: 1px #33 solid;
-}
-
-th {
-border-top: 0;
-border-bottom: 3px #33 solid;
-border-left: 1px #33 dotted;
-border-right: 0;
-border-spacing-top: 0;
-border-spacing-bottom: 0;
-text-align: center;
-font-variant: small-caps;
-padding-left: 0.1em;
-padding-right: 0.1em;
-padding-top: 0.2em;
-padding-bottom: 0.2em;
-vertical-align: bottom;
-}
-
-td {
-border-top: 0;
-border-bottom: 0;
-border-left: 0;
-border-right: 0;
-border-spacing-top: 0;
-border-spacing-bottom: 0;
-padding-left: 0.05em;
-padding-right: 0.05em;
-padding-top: 0.15em;
-padding-bottom: 0.15em;
-}
-
-thead {
-color: rgb(66,114,185);
-text-align: center;
-text-weight: bold;
-}
-
-td {
-font-size: 10pt;
-text-align:left;
-padding-left:7pt;
-padding-right:7pt;
-}
-
-pre {
-font-size: 9pt;
-}
-
-a {
-text-decoration: none;
-color: #ff;
-line-height: 1.5em;
-}
-
-a:hover {
-color: #004400;
-text-decoration: underline;
-}
-
-.large {
-font-size: 1.5em;
-font-variant: small-caps;
-text-align: left;
-}
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2741998c/docs/src/main/resources/index.html
--
diff --git a/docs/src/main/resources/index.html 
b/docs/src/main/resources/index.html
deleted file mode 100644
index aca3bb2..000
--- a/docs/src/main/resources/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-Accumulo Documentation
-
-
-
-
-Apache Accumulo Documentation
-
-User Manual
-Administration
-Combiners
-Constraints
-Bulk Ingest
-Isolation
-Locality Groups
-Timestamps
-Metrics
-Distributed Tracing
-
-
-
-

[06/11] accumulo git commit: ACCUMULO-4531 Removed constraints.html, lgroups.html, timestamps.html

[mwalch]

ACCUMULO-4531 Removed constraints.html, lgroups.html, timestamps.html

* Similar docs exist in 'Table Configuration' section of user manual


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c03484
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89c03484
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89c03484

Branch: refs/heads/master
Commit: 89c03484df5a1d6f2a9bc62e74b863ffdc921327
Parents: 52d526b
Author: Mike Walch 
Authored: Tue Dec 6 09:49:52 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:04:53 2016 -0500

--
 .../asciidoc/chapters/table_configuration.txt   |   3 +-
 docs/src/main/resources/constraints.html|  50 --
 docs/src/main/resources/lgroups.html|  45 --
 docs/src/main/resources/timestamps.html | 160 ---
 4 files changed, 2 insertions(+), 256 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c03484/docs/src/main/asciidoc/chapters/table_configuration.txt
--
diff --git a/docs/src/main/asciidoc/chapters/table_configuration.txt 
b/docs/src/main/asciidoc/chapters/table_configuration.txt
index fa2b16c..a3e4dcd 100644
--- a/docs/src/main/asciidoc/chapters/table_configuration.txt
+++ b/docs/src/main/asciidoc/chapters/table_configuration.txt
@@ -214,7 +214,6 @@ has the following method
 [source,java]
 connector.tableOperations.create(String tableName, boolean limitVersion);
 
-
 = Logical Time
 
 Accumulo 1.2 introduces the concept of logical time. This ensures that 
timestamps
@@ -230,6 +229,7 @@ A table can be configured to use logical timestamps at 
creation time as follows:
   user@myinstance> createtable -tl logical
 
 = Deletes
+
 Deletes are special keys in Accumulo that get sorted along will all the other 
data.
 When a delete key is inserted, Accumulo will not show anything that has a
 timestamp less than or equal to the delete key. During major compaction, any 
keys
@@ -237,6 +237,7 @@ older than a delete key are omitted from the new file 
created, and the omitted k
 are removed from disk as part of the regular garbage collection process.
 
  Filters
+
 When scanning over a set of key-value pairs it is possible to apply an 
arbitrary
 filtering policy through the use of a Filter. Filters are types of iterators 
that return
 only key-value pairs that satisfy the filter logic. Accumulo has a few 
built-in filters

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c03484/docs/src/main/resources/constraints.html
--
diff --git a/docs/src/main/resources/constraints.html 
b/docs/src/main/resources/constraints.html
deleted file mode 100644
index d6e5037..000
--- a/docs/src/main/resources/constraints.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-Accumulo Constraints
-
-
-
-
-Apache Accumulo Documentation : Constraints
-
-Accumulo supports constraints. Constraints are applied to mutations at ingest 
time.
-
-Implementing a new constraint is a snap. Simply write some Java code that
-implements org.apache.accumulo.core.constraints.Constraint.
-
-To deploy a new constraint, jar it up and put the jar in accumulo/lib/ext.
-
-After creating a constraint, set a table specific property to use it. The 
following example adds two constraints to table foo. In the example 
com.test.ExampleConstraint and com.test.AnotherConstraint are class names.
-
-
-user@instance: perDayCounts createtable foo
-user@instance: foo config -t foo -s 
table.constraint.1=com.test.ExampleConstraint
-user@instance: foo config -t foo -s 
table.constraint.2=com.test.AnotherConstraint
-user@instance: foo config -t foo -f constraint
--+--+-
-SCOPE| NAME | VALUE
--+--+-
-table| table.constraint.1.. | 
com.test.ExampleConstraint
-table| table.constraint.2.. | 
com.test.AnotherConstraint
--+--+-
-user@instance: foo
-
-
-
-

http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c03484/docs/src/main/resources/lgroups.html
--
diff --git a/docs/src/main/resources/lgroups.html 
b/docs/src/main/resources/lgroups.html
deleted file mode 100644
index 3d2bc0e..000
--- a/docs/src/main/resources/lgroups.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-Accumulo Locality Groups
-
-
-
-
-Apache Accumulo Documentation : 

[07/11] accumulo git commit: ACCUMULO-4531 Removed administration.html, metrics.html, distributedTracing.html

[mwalch]

ACCUMULO-4531 Removed administration.html, metrics.html, distributedTracing.html

* Similar docs exist in 'Administration' section of user manual


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43e98d4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43e98d4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43e98d4f

Branch: refs/heads/master
Commit: 43e98d4f98d7ca9d93cb15b909221d3192b8795d
Parents: fc1a68a
Author: Mike Walch 
Authored: Tue Dec 6 10:45:03 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:04:54 2016 -0500

--
 .../main/asciidoc/chapters/administration.txt   |   6 +
 docs/src/main/resources/administration.html | 201 ---
 docs/src/main/resources/distributedTracing.html | 106 --
 docs/src/main/resources/metrics.html| 151 --
 4 files changed, 6 insertions(+), 458 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43e98d4f/docs/src/main/asciidoc/chapters/administration.txt
--
diff --git a/docs/src/main/asciidoc/chapters/administration.txt 
b/docs/src/main/asciidoc/chapters/administration.txt
index e0d2f48..1478543 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -582,6 +582,7 @@ The left navigation bar will have a new link to Shell.
 An Accumulo user name and password must be entered for access to the shell.
 
 === Metrics
+
 Accumulo is capable of using the Hadoop Metrics2 library and is configured by 
default to use it. Metrics2 is a library
 which allows for routing of metrics generated by registered MetricsSources to 
configured MetricsSinks. Examples of sinks
 that are implemented by Hadoop include file-based logging, Graphite and 
Ganglia. All metric sources are exposed via JMX
@@ -611,6 +612,7 @@ 
https://hadoop.apache.org/docs/current/api/org/apache/hadoop/metrics2/package-su
 
 [[tracing]]
 === Tracing
+
 It can be difficult to determine why some operations are taking longer
 than expected. For example, you may be looking up items with very low
 latency, but sometimes the lookups take much longer. Determining the
@@ -632,6 +634,7 @@ The design of Accumulo's distributed tracing follows that of
 http://research.google.com/pubs/pub36356.html[Google's Dapper].
 
  Tracers
+
 To collect traces, Accumulo needs at least one server listed in
  +$ACCUMULO_CONF_DIR/tracers+. The server collects traces
 from clients and writes them to the +trace+ table. The Accumulo
@@ -654,6 +657,7 @@ quorum, take care to configure Accumulo with unique values 
for
 this property.
 
  Configuring Tracing
+
 Traces are collected via SpanReceivers. The default SpanReceiver
 configured is org.apache.accumulo.core.trace.ZooTraceClient, which
 sends spans to an Accumulo Tracer process, as discussed in the
@@ -854,11 +858,13 @@ Remember to close all spans and disable tracing when 
finished.
 DistributedTrace.disable();
 
  Viewing Collected Traces
+
 To view collected traces, use the "Recent Traces" link on the Monitor
 UI. You can also programmatically access and print traces using the
 +TraceDump+ class.
 
 = Trace Table Format
+
 This section is for developers looking to use data recorded in the trace table
 directly, above and beyond the default services of the Accumulo monitor.
 Please note the trace table format and its supporting classes

http://git-wip-us.apache.org/repos/asf/accumulo/blob/43e98d4f/docs/src/main/resources/administration.html
--
diff --git a/docs/src/main/resources/administration.html 
b/docs/src/main/resources/administration.html
deleted file mode 100644
index 1782171..000
--- a/docs/src/main/resources/administration.html
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
-Accumulo Administration
-
-
-
-
-Apache Accumulo Documentation : Administration
-
-
-Configure Accumulo
-
-For the most part, accumulo is ready to go out of the box. To start it, 
first you must distribute and install
-the accumulo software to each machine in the cloud that you wish to run on. 
The software should be installed
-in the same directory on each machine and configured identically (or at least 
similarly... see the configuration
-sections for more details). Select one machine to be your bootstrap machine, 
the one that you will start accumulo
-with. Note that you must have passphrase-less ssh access to each machine from 
your bootstrap machine. On this machine,
-create a conf/masters and conf/tservers file. In the masters file, type the 
hostname of the machine you wish to run the master on (probably localhost).
-In the tservers file, type the hostnames, 

[11/11] accumulo git commit: Merge branch 'accumulo-4531'

[mwalch]

Merge branch 'accumulo-4531'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/13201a81
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13201a81
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13201a81

Branch: refs/heads/master
Commit: 13201a814840483238e45d104a9a7644ffca6720
Parents: bebfbd0 c0e68a3
Author: Mike Walch 
Authored: Tue Dec 6 14:13:53 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 14:13:53 2016 -0500

--
 .../main/asciidoc/chapters/administration.txt   |   6 +
 docs/src/main/asciidoc/chapters/analytics.txt   |   3 +-
 docs/src/main/asciidoc/chapters/clients.txt |  20 +-
 .../asciidoc/chapters/high_speed_ingest.txt |   7 +-
 docs/src/main/asciidoc/chapters/sampling.txt|  10 +-
 .../asciidoc/chapters/table_configuration.txt   |  25 ++-
 docs/src/main/resources/administration.html | 201 -
 docs/src/main/resources/bulkIngest.html | 114 --
 docs/src/main/resources/combiners.html  |  87 
 docs/src/main/resources/constraints.html|  50 -
 docs/src/main/resources/distributedTracing.html | 106 -
 docs/src/main/resources/documentation.css   | 112 --
 docs/src/main/resources/examples/README |  97 
 docs/src/main/resources/examples/README.batch   |  55 -
 docs/src/main/resources/examples/README.bloom   | 219 --
 .../main/resources/examples/README.bulkIngest   |  33 ---
 .../main/resources/examples/README.classpath|  68 --
 docs/src/main/resources/examples/README.client  |  79 ---
 .../src/main/resources/examples/README.combiner |  70 --
 .../examples/README.compactionStrategy  |  65 --
 .../main/resources/examples/README.constraints  |  54 -
 docs/src/main/resources/examples/README.dirlist | 114 --
 docs/src/main/resources/examples/README.export  |  91 
 .../src/main/resources/examples/README.filedata |  47 
 docs/src/main/resources/examples/README.filter  | 110 -
 .../main/resources/examples/README.helloworld   |  47 
 .../main/resources/examples/README.isolation|  50 -
 docs/src/main/resources/examples/README.mapred  | 154 -
 .../main/resources/examples/README.maxmutation  |  49 
 docs/src/main/resources/examples/README.regex   |  57 -
 .../main/resources/examples/README.reservations |  66 --
 .../main/resources/examples/README.rgbalancer   | 159 -
 docs/src/main/resources/examples/README.rowhash |  59 -
 docs/src/main/resources/examples/README.sample  | 192 
 docs/src/main/resources/examples/README.shard   |  66 --
 .../main/resources/examples/README.tabletofile  |  59 -
 .../src/main/resources/examples/README.terasort |  50 -
 .../main/resources/examples/README.visibility   | 131 ---
 docs/src/main/resources/examples/batch.md   |  57 +
 docs/src/main/resources/examples/bloom.md   | 221 +++
 docs/src/main/resources/examples/bulkIngest.md  |  35 +++
 docs/src/main/resources/examples/classpath.md   |  69 ++
 docs/src/main/resources/examples/client.md  |  81 +++
 docs/src/main/resources/examples/combiner.md|  72 ++
 .../resources/examples/compactionStrategy.md|  67 ++
 docs/src/main/resources/examples/constraints.md |  56 +
 docs/src/main/resources/examples/dirlist.md | 118 ++
 docs/src/main/resources/examples/export.md  |  93 
 docs/src/main/resources/examples/filedata.md|  51 +
 docs/src/main/resources/examples/filter.md  | 112 ++
 docs/src/main/resources/examples/helloworld.md  |  49 
 docs/src/main/resources/examples/index.md   | 100 +
 docs/src/main/resources/examples/isolation.md   |  51 +
 docs/src/main/resources/examples/mapred.md  | 156 +
 docs/src/main/resources/examples/maxmutation.md |  51 +
 docs/src/main/resources/examples/regex.md   |  59 +
 .../src/main/resources/examples/reservations.md |  68 ++
 docs/src/main/resources/examples/rgbalancer.md  | 161 ++
 docs/src/main/resources/examples/rowhash.md |  61 +
 docs/src/main/resources/examples/sample.md  | 193 
 docs/src/main/resources/examples/shard.md   |  68 ++
 docs/src/main/resources/examples/tabletofile.md |  61 +
 docs/src/main/resources/examples/terasort.md|  52 +
 docs/src/main/resources/examples/visibility.md  | 133 +++
 docs/src/main/resources/index.html  |  39 
 docs/src/main/resources/isolation.html  |  51 -
 docs/src/main/resources/lgroups.html|  45 
 docs/src/main/resources/metrics.html| 151 -
 docs/src/main/resources/timestamps.html | 160 

[04/11] accumulo git commit: ACCUMULO-4525: replace meaningless method names

[mmiller]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
 
b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
index 33c398f..d0802f0 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
@@ -34,16 +34,16 @@ public class ColumnFamilySkippingIteratorTest extends 
TestCase {
 
   private static final Collection EMPTY_SET = new HashSet<>();
 
-  Key nk(String row, String cf, String cq, long time) {
+  Key newKey(String row, String cf, String cq, long time) {
 return new Key(new Text(row), new Text(cf), new Text(cq), time);
   }
 
-  Key nk(int row, int cf, int cq, long time) {
-return nk(String.format("%06d", row), String.format("%06d", cf), 
String.format("%06d", cq), time);
+  Key newKey(int row, int cf, int cq, long time) {
+return newKey(String.format("%06d", row), String.format("%06d", cf), 
String.format("%06d", cq), time);
   }
 
   void put(TreeMap tm, String row, String cf, String cq, long time, 
Value val) {
-tm.put(nk(row, cf, cq, time), val);
+tm.put(newKey(row, cf, cq, time), val);
   }
 
   void put(TreeMap tm, String row, String cf, String cq, long time, 
String val) {
@@ -51,12 +51,12 @@ public class ColumnFamilySkippingIteratorTest extends 
TestCase {
   }
 
   void put(TreeMap tm, int row, int cf, int cq, long time, int val) 
{
-tm.put(nk(row, cf, cq, time), new Value((val + "").getBytes()));
+tm.put(newKey(row, cf, cq, time), new Value((val + "").getBytes()));
   }
 
-  private void aten(ColumnFamilySkippingIterator rdi, String row, String cf, 
String cq, long time, String val) throws Exception {
+  private void testAndCallnext(ColumnFamilySkippingIterator rdi, String row, 
String cf, String cq, long time, String val) throws Exception {
 assertTrue(rdi.hasTop());
-assertEquals(nk(row, cf, cq, time), rdi.getTopKey());
+assertEquals(newKey(row, cf, cq, time), rdi.getTopKey());
 assertEquals(val, rdi.getTopValue().toString());
 rdi.next();
   }
@@ -87,22 +87,22 @@ public class ColumnFamilySkippingIteratorTest extends 
TestCase {
 HashSet colfams = new HashSet<>();
 colfams.add(new ArrayByteSequence("cf2"));
 cfi.seek(new Range(), colfams, true);
-aten(cfi, "r2", "cf2", "cq4", 5, "v4");
-aten(cfi, "r2", "cf2", "cq5", 5, "v5");
+testAndCallnext(cfi, "r2", "cf2", "cq4", 5, "v4");
+testAndCallnext(cfi, "r2", "cf2", "cq5", 5, "v5");
 assertFalse(cfi.hasTop());
 
 colfams.add(new ArrayByteSequence("cf3"));
 colfams.add(new ArrayByteSequence("cf4"));
 cfi.seek(new Range(), colfams, true);
-aten(cfi, "r2", "cf2", "cq4", 5, "v4");
-aten(cfi, "r2", "cf2", "cq5", 5, "v5");
-aten(cfi, "r3", "cf3", "cq6", 5, "v6");
+testAndCallnext(cfi, "r2", "cf2", "cq4", 5, "v4");
+testAndCallnext(cfi, "r2", "cf2", "cq5", 5, "v5");
+testAndCallnext(cfi, "r3", "cf3", "cq6", 5, "v6");
 assertFalse(cfi.hasTop());
 
 cfi.seek(new Range(), colfams, false);
-aten(cfi, "r1", "cf1", "cq1", 5, "v1");
-aten(cfi, "r1", "cf1", "cq3", 5, "v2");
-aten(cfi, "r2", "cf1", "cq1", 5, "v3");
+testAndCallnext(cfi, "r1", "cf1", "cq1", 5, "v1");
+testAndCallnext(cfi, "r1", "cf1", "cq3", 5, "v2");
+testAndCallnext(cfi, "r2", "cf1", "cq1", 5, "v3");
 assertFalse(cfi.hasTop());
 
   }
@@ -204,11 +204,11 @@ public class ColumnFamilySkippingIteratorTest extends 
TestCase {
 HashSet colfams = new HashSet<>();
 colfams.add(new ArrayByteSequence(String.format("%06d", 4)));
 
-Range range = new Range(nk(0, 4, 0, 6), true, nk(0, 400, 0, 6), true);
+Range range = new Range(newKey(0, 4, 0, 6), true, newKey(0, 400, 0, 6), 
true);
 cfi.seek(range, colfams, true);
 
 assertTrue(cfi.hasTop());
-assertEquals(nk(0, 4, 0, 6), cfi.getTopKey());
+assertEquals(newKey(0, 4, 0, 6), cfi.getTopKey());
 cfi.next();
 assertFalse(cfi.hasTop());
 
@@ -216,21 +216,21 @@ public class ColumnFamilySkippingIteratorTest extends 
TestCase {
 cfi.seek(range, colfams, true);
 
 assertTrue(cfi.hasTop());
-assertEquals(nk(0, 4, 0, 6), cfi.getTopKey());
+assertEquals(newKey(0, 4, 0, 6), cfi.getTopKey());
 cfi.next();
 assertFalse(cfi.hasTop());
 
-range = new Range(nk(0, 4, 0, 6), true, nk(1, 400, 0, 6), true);
+range = new Range(newKey(0, 4, 0, 6), true, newKey(1, 400, 0, 6), true);
 cfi.seek(range, colfams, true);
 
 assertTrue(cfi.hasTop());
-assertEquals(nk(0, 4, 0, 6), cfi.getTopKey());
+assertEquals(newKey(0, 4, 0, 

[01/11] accumulo git commit: ACCUMULO-4522: cleanup of unsed param in FileUtil

[mmiller]

Repository: accumulo
Updated Branches:
  refs/heads/master d4d7d0920 -> bebfbd0ed


ACCUMULO-4522: cleanup of unsed param in FileUtil


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8a35b6dd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8a35b6dd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8a35b6dd

Branch: refs/heads/master
Commit: 8a35b6dd48668449919a172afb96a9851ce211a0
Parents: a361f63
Author: Mike Miller 
Authored: Thu Nov 17 13:55:03 2016 -0500
Committer: Mike Miller 
Committed: Thu Nov 17 13:55:03 2016 -0500

--
 .../apache/accumulo/server/util/FileUtil.java   |  6 +--
 .../accumulo/server/util/FileUtilTest.java  | 51 
 2 files changed, 12 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a35b6dd/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java 
b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
index 51a0783..ea34dd8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
@@ -254,7 +254,7 @@ public class FileUtil {
   return (numLte + 1) / (double) (numKeys + 2);
 
 } finally {
-  cleanupIndexOp(acuconf, tmpDir, fs, readers);
+  cleanupIndexOp(tmpDir, fs, readers);
 }
   }
 
@@ -362,11 +362,11 @@ public class FileUtil {
 
   return ret;
 } finally {
-  cleanupIndexOp(acuConf, tmpDir, fs, readers);
+  cleanupIndexOp(tmpDir, fs, readers);
 }
   }
 
-  protected static void cleanupIndexOp(AccumuloConfiguration acuConf, Path 
tmpDir, VolumeManager fs, ArrayList readers) throws 
IOException {
+  protected static void cleanupIndexOp(Path tmpDir, VolumeManager fs, 
ArrayList readers) throws IOException {
 // close all of the index sequence files
 for (FileSKVIterator r : readers) {
   try {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8a35b6dd/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
--
diff --git 
a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java 
b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
index a826acf..9cb882c 100644
--- 
a/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/util/FileUtilTest.java
@@ -27,10 +27,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.file.FileSKVIterator;
 import org.apache.accumulo.server.fs.FileRef;
@@ -44,8 +41,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
 
-import com.google.common.base.Predicate;
-
 /**
  *
  */
@@ -94,10 +89,9 @@ public class FileUtilTest {
 HashMap testProps = new HashMap<>();
 testProps.put(Property.INSTANCE_DFS_DIR, accumuloDir.getAbsolutePath());
 
-AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
 VolumeManager fs = 
VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-FileUtil.cleanupIndexOp(testConf, tmpPath1, fs, new 
ArrayList());
+FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList());
 
 Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", 
tmp1.exists());
   }
@@ -121,14 +115,13 @@ public class FileUtilTest {
 HashMap testProps = new HashMap<>();
 testProps.put(Property.INSTANCE_VOLUMES, v1.toURI().toString() + "," + 
v2.toURI().toString());
 
-AccumuloConfiguration testConf = new FileUtilTestConfiguration(testProps);
 VolumeManager fs = 
VolumeManagerImpl.getLocal(accumuloDir.getAbsolutePath());
 
-FileUtil.cleanupIndexOp(testConf, tmpPath1, fs, new 
ArrayList());
+FileUtil.cleanupIndexOp(tmpPath1, fs, new ArrayList());
 
 Assert.assertFalse("Expected " + tmp1 + " to be cleaned up but it wasn't", 
tmp1.exists());
 
-FileUtil.cleanupIndexOp(testConf, tmpPath2, fs, new 
ArrayList());
+FileUtil.cleanupIndexOp(tmpPath2, fs, new ArrayList());
 
 Assert.assertFalse("Expected " + tmp2 + " to be cleaned up but it wasn't", 
tmp2.exists());
   }
@@ -153,14 +146,13 @@ public class FileUtilTest {
 

[09/11] accumulo git commit: ACCUMULO-4505: Another fix for shell errroneously reading conf

[mmiller]

ACCUMULO-4505: Another fix for shell errroneously reading conf


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c454414
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c454414

Branch: refs/heads/master
Commit: 3c4544144a78904198b6795828c176e806b64e09
Parents: a4a4539
Author: Mike Miller 
Authored: Tue Dec 6 11:31:55 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 11:31:55 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c454414/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java 
b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index f6d1ac9..7c27343 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -318,6 +318,13 @@ public class ShellOptionsJC {
   clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, hosts);
   clientConfig.setProperty(ClientProperty.INSTANCE_NAME, instanceName);
 }
+// If the user provided the hosts, set the ZK for tracing too
+if (null != zooKeeperHosts && !zooKeeperHosts.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
+}
+if (null != zooKeeperInstanceName && !zooKeeperInstanceName.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_NAME, 
zooKeeperInstanceName);
+}
 
 // Automatically try to add in the proper ZK from accumulo-site for 
backwards compat.
 if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
@@ -325,11 +332,6 @@ public class ShellOptionsJC {
   clientConfig.withZkHosts(siteConf.get(Property.INSTANCE_ZK_HOST));
 }
 
-// If the user provided the hosts, set the ZK for tracing too
-if (null != zooKeeperHosts) {
-  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
-}
-
 return clientConfig;
   }
 

[03/11] accumulo git commit: ACCUMULO-4525: replace meaningless method names

[mmiller]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
--
diff --git 
a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java 
b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
index 37cbfa0..af77150 100644
--- 
a/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
+++ 
b/server/tserver/src/test/java/org/apache/accumulo/tserver/InMemoryMapTest.java
@@ -86,15 +86,15 @@ public class InMemoryMapTest {
 imm.mutate(Collections.singletonList(m));
   }
 
-  static Key nk(String row, String column, long ts) {
+  static Key newKey(String row, String column, long ts) {
 String[] sa = column.split(":");
 Key k = new Key(new Text(row), new Text(sa[0]), new Text(sa[1]), ts);
 return k;
   }
 
-  static void ae(SortedKeyValueIterator dc, String row, String 
column, int ts, String val) throws IOException {
+  static void testAndCallNext(SortedKeyValueIterator dc, String 
row, String column, int ts, String val) throws IOException {
 assertTrue(dc.hasTop());
-assertEquals(nk(row, column, ts), dc.getTopKey());
+assertEquals(newKey(row, column, ts), dc.getTopKey());
 assertEquals(new Value(val.getBytes()), dc.getTopValue());
 dc.next();
 
@@ -121,7 +121,7 @@ public class InMemoryMapTest {
 
 ski2.seek(new Range(), LocalityGroupUtil.EMPTY_CF_SET, false);
 assertTrue(ski2.hasTop());
-ae(ski2, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski2, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski2.hasTop());
 
   }
@@ -141,13 +141,13 @@ public class InMemoryMapTest {
 MemoryIterator ski2 = imm.skvIterator();
 
 ski1.seek(new Range(new Text("r1")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski1, "r1", "foo:cq1", 3, "bar2");
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski1.hasTop());
 
 ski2.seek(new Range(new Text("r3")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski2, "r3", "foo:cq1", 3, "bara");
-ae(ski2, "r3", "foo:cq1", 3, "bar9");
+testAndCallNext(ski2, "r3", "foo:cq1", 3, "bara");
+testAndCallNext(ski2, "r3", "foo:cq1", 3, "bar9");
 assertFalse(ski1.hasTop());
 
   }
@@ -164,21 +164,21 @@ public class InMemoryMapTest {
 imm.delete(0);
 
 ski1.seek(new Range(new Text("r1")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski1, "r1", "foo:cq1", 3, "bar2");
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski1.hasTop());
 
 ski1.seek(new Range(new Text("r1")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski1, "r1", "foo:cq1", 3, "bar2");
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski1.hasTop());
 
 ski1.seek(new Range(new Text("r2")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
 assertFalse(ski1.hasTop());
 
-ski1.seek(new Range(nk("r1", "foo:cq1", 3), null), 
LocalityGroupUtil.EMPTY_CF_SET, false);
-ae(ski1, "r1", "foo:cq1", 3, "bar2");
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+ski1.seek(new Range(newKey("r1", "foo:cq1", 3), null), 
LocalityGroupUtil.EMPTY_CF_SET, false);
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski1.hasTop());
 
 ski1.close();
@@ -194,12 +194,12 @@ public class InMemoryMapTest {
 
 MemoryIterator ski1 = imm.skvIterator();
 ski1.seek(new Range(new Text("r1")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski1, "r1", "foo:cq1", 3, "bar3");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar3");
 
 imm.delete(0);
 
-ae(ski1, "r1", "foo:cq1", 3, "bar2");
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 assertFalse(ski1.hasTop());
 
 ski1.close();
@@ -212,12 +212,12 @@ public class InMemoryMapTest {
 
 ski1 = imm.skvIterator();
 ski1.seek(new Range(new Text("r1")), LocalityGroupUtil.EMPTY_CF_SET, 
false);
-ae(ski1, "r1", "foo:cq1", 3, "bar1");
+testAndCallNext(ski1, "r1", "foo:cq1", 3, "bar1");
 
 imm.delete(0);
 
-ae(ski1, "r1", "foo:cq2", 3, "bar2");
-ae(ski1, "r1", "foo:cq3", 3, "bar3");
+testAndCallNext(ski1, "r1", "foo:cq2", 3, "bar2");
+testAndCallNext(ski1, "r1", "foo:cq3", 3, "bar3");
 assertFalse(ski1.hasTop());
 
 ski1.close();
@@ -238,30 +238,30 @@ public class InMemoryMapTest {
 
 SortedKeyValueIterator dc = ski1.deepCopy(null);
 
-ski1.seek(new Range(nk("r1", 

[11/11] accumulo git commit: Merge branch '1.8'

[mmiller]

Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bebfbd0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bebfbd0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bebfbd0e

Branch: refs/heads/master
Commit: bebfbd0ed1139eddd840d266428f4edfde5c42fc
Parents: d4d7d09 7c7bbab
Author: Mike Miller 
Authored: Tue Dec 6 13:22:16 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 13:22:16 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--

[07/11] accumulo git commit: Merge branch '1.7' into 1.8

[mmiller]

Merge branch '1.7' into 1.8

Conflicts:
core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java

core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd70d781
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd70d781
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cd70d781

Branch: refs/heads/master
Commit: cd70d7815afad9ae7d0f78c5fa916833b274690b
Parents: 43b740b a4a4539
Author: Mike Miller 
Authored: Tue Nov 22 14:58:58 2016 -0500
Committer: Mike Miller 
Committed: Tue Nov 22 14:58:58 2016 -0500

--
 .../apache/accumulo/core/data/RangeTest.java| 428 ++-
 .../core/file/rfile/BlockIndexTest.java |  22 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  20 +-
 .../core/file/rfile/MultiThreadedRFileTest.java |   8 +-
 .../core/file/rfile/RFileMetricsTest.java   |  78 ++--
 .../accumulo/core/file/rfile/RFileTest.java | 416 +-
 .../core/file/rfile/RelativeKeyTest.java|  14 +-
 .../core/iterators/AggregatingIteratorTest.java | 152 +++
 .../core/iterators/FirstEntryInRowTest.java |  46 +-
 .../core/iterators/IteratorUtilTest.java|  38 +-
 .../ColumnFamilySkippingIteratorTest.java   |  44 +-
 .../core/iterators/system/ColumnFilterTest.java |  30 +-
 .../iterators/system/DeletingIteratorTest.java  |  62 +--
 .../iterators/system/MultiIteratorTest.java | 125 +++---
 .../system/SourceSwitchingIteratorTest.java |  45 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  20 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  18 +-
 .../core/iterators/user/CombinerTest.java   | 220 +-
 .../iterators/user/IndexedDocIteratorTest.java  |   4 +-
 .../core/iterators/user/RegExFilterTest.java|  12 +-
 .../iterators/user/RowDeletingIteratorTest.java |  80 ++--
 .../tserver/CheckTabletMetadataTest.java|  14 +-
 .../accumulo/tserver/InMemoryMapTest.java   | 178 
 .../accumulo/test/NativeMapPerformanceTest.java |  12 +-
 .../accumulo/test/functional/NativeMapIT.java   |  79 ++--
 25 files changed, 1086 insertions(+), 1079 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd70d781/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
--
diff --cc core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index c4837fe,115aa7a..fe7f1f8
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@@ -191,30 -191,31 +191,31 @@@ public class RangeTest extends TestCas
  
public void testMergeOverlapping22() {
  
 -Range ke1 = new KeyExtent(new Text("tab1"), new Text("Bank"), 
null).toMetadataRange();
 -Range ke2 = new KeyExtent(new Text("tab1"), new Text("Fails"), new 
Text("Bank")).toMetadataRange();
 -Range ke3 = new KeyExtent(new Text("tab1"), new Text("Sam"), new 
Text("Fails")).toMetadataRange();
 -Range ke4 = new KeyExtent(new Text("tab1"), new Text("bails"), new 
Text("Sam")).toMetadataRange();
 -Range ke5 = new KeyExtent(new Text("tab1"), null, new 
Text("bails")).toMetadataRange();
 +Range ke1 = new KeyExtent("tab1", new Text("Bank"), 
null).toMetadataRange();
 +Range ke2 = new KeyExtent("tab1", new Text("Fails"), new 
Text("Bank")).toMetadataRange();
 +Range ke3 = new KeyExtent("tab1", new Text("Sam"), new 
Text("Fails")).toMetadataRange();
 +Range ke4 = new KeyExtent("tab1", new Text("bails"), new 
Text("Sam")).toMetadataRange();
 +Range ke5 = new KeyExtent("tab1", null, new 
Text("bails")).toMetadataRange();
  
- List rl = nrl(ke1, ke2, ke3, ke4, ke5);
- List expected = nrl(new KeyExtent("tab1", null, 
null).toMetadataRange());
+ List rl = newRangeList(ke1, ke2, ke3, ke4, ke5);
 -List expected = newRangeList(new KeyExtent(new Text("tab1"), null, 
null).toMetadataRange());
++List expected = newRangeList(new KeyExtent("tab1", null, 
null).toMetadataRange());
  check(Range.mergeOverlapping(rl), expected);
  
- rl = nrl(ke1, ke2, ke4, ke5);
- expected = nrl(new KeyExtent("tab1", new Text("Fails"), 
null).toMetadataRange(), new KeyExtent("tab1", null, new 
Text("Sam")).toMetadataRange());
+ rl = newRangeList(ke1, ke2, ke4, ke5);
 -expected = newRangeList(new KeyExtent(new Text("tab1"), new 
Text("Fails"), null).toMetadataRange(),
 -new KeyExtent(new Text("tab1"), null, new 
Text("Sam")).toMetadataRange());
++expected = newRangeList(new KeyExtent("tab1", new Text("Fails"), 

[05/11] accumulo git commit: ACCUMULO-4525: replace meaningless method names

[mmiller]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java 
b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index c700e6b..96f97e7 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -245,15 +245,15 @@ public class RFileTest {
 }
   }
 
-  static Key nk(String row, String cf, String cq, String cv, long ts) {
+  static Key newKey(String row, String cf, String cq, String cv, long ts) {
 return new Key(row.getBytes(), cf.getBytes(), cq.getBytes(), 
cv.getBytes(), ts);
   }
 
-  static Value nv(String val) {
+  static Value newValue(String val) {
 return new Value(val.getBytes());
   }
 
-  static String nf(String prefix, int i) {
+  static String formatString(String prefix, int i) {
 return String.format(prefix + "%06d", i);
   }
 
@@ -286,31 +286,31 @@ public class RFileTest {
 TestRFile trf = new TestRFile(conf);
 
 trf.openWriter();
-trf.writer.append(nk("r1", "cf1", "cq1", "L1", 55), nv("foo"));
+trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 55), newValue("foo"));
 trf.closeWriter();
 
 trf.openReader();
 // seek before everything
 trf.seek(null);
 assertTrue(trf.iter.hasTop());
-assertTrue(trf.iter.getTopKey().equals(nk("r1", "cf1", "cq1", "L1", 55)));
-assertTrue(trf.iter.getTopValue().equals(nv("foo")));
+assertTrue(trf.iter.getTopKey().equals(newKey("r1", "cf1", "cq1", "L1", 
55)));
+assertTrue(trf.iter.getTopValue().equals(newValue("foo")));
 trf.iter.next();
 assertFalse(trf.iter.hasTop());
 
 // seek after the key
-trf.seek(nk("r2", "cf1", "cq1", "L1", 55));
+trf.seek(newKey("r2", "cf1", "cq1", "L1", 55));
 assertFalse(trf.iter.hasTop());
 
 // seek exactly to the key
-trf.seek(nk("r1", "cf1", "cq1", "L1", 55));
+trf.seek(newKey("r1", "cf1", "cq1", "L1", 55));
 assertTrue(trf.iter.hasTop());
-assertTrue(trf.iter.getTopKey().equals(nk("r1", "cf1", "cq1", "L1", 55)));
-assertTrue(trf.iter.getTopValue().equals(nv("foo")));
+assertTrue(trf.iter.getTopKey().equals(newKey("r1", "cf1", "cq1", "L1", 
55)));
+assertTrue(trf.iter.getTopValue().equals(newValue("foo")));
 trf.iter.next();
 assertFalse(trf.iter.hasTop());
 
-assertEquals(nk("r1", "cf1", "cq1", "L1", 55), trf.reader.getLastKey());
+assertEquals(newKey("r1", "cf1", "cq1", "L1", 55), 
trf.reader.getLastKey());
 
 trf.closeReader();
   }
@@ -330,26 +330,26 @@ public class RFileTest {
 ArrayList expectedValues = new ArrayList<>(1);
 
 for (int row = 0; row < 4; row++) {
-  String rowS = nf("r_", row);
+  String rowS = formatString("r_", row);
   for (int cf = 0; cf < 4; cf++) {
-String cfS = nf("cf_", cf);
+String cfS = formatString("cf_", cf);
 for (int cq = 0; cq < 4; cq++) {
-  String cqS = nf("cq_", cq);
+  String cqS = formatString("cq_", cq);
   for (int cv = 'A'; cv < 'A' + 4; cv++) {
 String cvS = "" + (char) cv;
 for (int ts = 4; ts > 0; ts--) {
-  Key k = nk(rowS, cfS, cqS, cvS, ts);
+  Key k = newKey(rowS, cfS, cqS, cvS, ts);
   // check below ensures when all key sizes are same more than one 
index block is created
   assertEquals(27, k.getSize());
   k.setDeleted(true);
-  Value v = nv("" + val);
+  Value v = newValue("" + val);
   trf.writer.append(k, v);
   expectedKeys.add(k);
   expectedValues.add(v);
 
-  k = nk(rowS, cfS, cqS, cvS, ts);
+  k = newKey(rowS, cfS, cqS, cvS, ts);
   assertEquals(27, k.getSize());
-  v = nv("" + val);
+  v = newValue("" + val);
   trf.writer.append(k, v);
   expectedKeys.add(k);
   expectedValues.add(v);
@@ -361,7 +361,7 @@ public class RFileTest {
   }
 }
 
-// trf.writer.append(nk("r1","cf1","cq1","L1", 55), nv("foo"));
+// trf.writer.append(newKey("r1","cf1","cq1","L1", 55), newValue("foo"));
 trf.closeWriter();
 
 trf.openReader();
@@ -491,37 +491,37 @@ public class RFileTest {
 
 trf.openWriter();
 
-trf.writer.append(nk("r1", "cf1", "cq1", "L1", 55), nv("foo1"));
+trf.writer.append(newKey("r1", "cf1", "cq1", "L1", 55), newValue("foo1"));
 try {
-  trf.writer.append(nk("r0", "cf1", "cq1", "L1", 55), nv("foo1"));
+  trf.writer.append(newKey("r0", "cf1", "cq1", "L1", 55), 
newValue("foo1"));
   assertFalse(true);
 } catch (IllegalStateException ioe) {
 
 }
 
 try {
-  trf.writer.append(nk("r1", "cf0", "cq1", "L1", 55), 

[10/11] accumulo git commit: Merge branch '1.7' into 1.8

[mmiller]

Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c7bbabb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c7bbabb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c7bbabb

Branch: refs/heads/master
Commit: 7c7bbabb8031bceb017bd8a482e4c960372af828
Parents: fcde1d9 3c45441
Author: Mike Miller 
Authored: Tue Dec 6 11:46:47 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 11:46:47 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c7bbabb/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--

[02/11] accumulo git commit: Merge branch '1.7' into 1.8

[mmiller]

Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/43b740bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43b740bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43b740bc

Branch: refs/heads/master
Commit: 43b740bc77fd51e428328a2f1b4fef1c32c202d2
Parents: cd43958 8a35b6d
Author: Mike Miller 
Authored: Thu Nov 17 13:58:29 2016 -0500
Committer: Mike Miller 
Committed: Thu Nov 17 13:58:29 2016 -0500

--
 .../apache/accumulo/server/util/FileUtil.java   |  6 +--
 .../accumulo/server/util/FileUtilTest.java  | 51 
 2 files changed, 12 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/43b740bc/server/base/src/main/java/org/apache/accumulo/server/util/FileUtil.java
--

[06/11] accumulo git commit: ACCUMULO-4525: replace meaningless method names

[mmiller]

ACCUMULO-4525: replace meaningless method names


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a4a45398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a4a45398
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a4a45398

Branch: refs/heads/master
Commit: a4a453986407132f2798b0e9c22fc26509f8d75e
Parents: 8a35b6d
Author: Mike Miller 
Authored: Tue Nov 22 10:59:44 2016 -0500
Committer: Mike Miller 
Committed: Tue Nov 22 14:16:49 2016 -0500

--
 .../apache/accumulo/core/data/RangeTest.java| 427 +++
 .../core/file/rfile/BlockIndexTest.java |  22 +-
 .../core/file/rfile/CreateCompatTestFile.java   |  20 +-
 .../core/file/rfile/MultiThreadedRFileTest.java |   8 +-
 .../core/file/rfile/RFileMetricsTest.java   |  78 +--
 .../accumulo/core/file/rfile/RFileTest.java | 514 ++-
 .../core/file/rfile/RelativeKeyTest.java|  14 +-
 .../core/iterators/AggregatingIteratorTest.java | 152 +++---
 .../core/iterators/FirstEntryInRowTest.java |  46 +-
 .../core/iterators/IteratorUtilTest.java|  38 +-
 .../ColumnFamilySkippingIteratorTest.java   |  44 +-
 .../core/iterators/system/ColumnFilterTest.java |  30 +-
 .../iterators/system/DeletingIteratorTest.java  |  62 +--
 .../iterators/system/MultiIteratorTest.java | 124 ++---
 .../system/SourceSwitchingIteratorTest.java |  45 +-
 .../iterators/user/BigDecimalCombinerTest.java  |  20 +-
 .../iterators/user/ColumnSliceFilterTest.java   |  18 +-
 .../core/iterators/user/CombinerTest.java   | 220 
 .../iterators/user/IndexedDocIteratorTest.java  |   4 +-
 .../core/iterators/user/RegExFilterTest.java|  12 +-
 .../iterators/user/RowDeletingIteratorTest.java |  80 +--
 .../tserver/CheckTabletMetadataTest.java|  14 +-
 .../accumulo/tserver/InMemoryMapTest.java   | 178 +++
 .../accumulo/test/NativeMapPerformanceTest.java |  12 +-
 .../accumulo/test/functional/NativeMapIT.java   |  79 +--
 25 files changed, 1136 insertions(+), 1125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4a45398/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
--
diff --git a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
index 129f2ba..115aa7a 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
@@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.thrift.TRange;
 import org.apache.hadoop.io.Text;
 
 public class RangeTest extends TestCase {
-  private Range nr(String k1, String k2) {
+  private Range newRange(String k1, String k2) {
 Key ik1 = null;
 if (k1 != null)
   ik1 = new Key(new Text(k1), 0l);
@@ -44,7 +44,7 @@ public class RangeTest extends TestCase {
 return new Range(ik1, ik2);
   }
 
-  private List nrl(Range... ranges) {
+  private List newRangeList(Range... ranges) {
 return Arrays.asList(ranges);
   }
 
@@ -56,135 +56,135 @@ public class RangeTest extends TestCase {
   }
 
   public void testMergeOverlapping1() {
-List rl = nrl(nr("a", "c"), nr("a", "b"));
-List expected = nrl(nr("a", "c"));
+List rl = newRangeList(newRange("a", "c"), newRange("a", "b"));
+List expected = newRangeList(newRange("a", "c"));
 check(Range.mergeOverlapping(rl), expected);
   }
 
   public void testMergeOverlapping2() {
-List rl = nrl(nr("a", "c"), nr("d", "f"));
-List expected = nrl(nr("a", "c"), nr("d", "f"));
+List rl = newRangeList(newRange("a", "c"), newRange("d", "f"));
+List expected = newRangeList(newRange("a", "c"), newRange("d", 
"f"));
 check(Range.mergeOverlapping(rl), expected);
   }
 
   public void testMergeOverlapping3() {
-List rl = nrl(nr("a", "e"), nr("b", "f"), nr("c", "r"), nr("g", 
"j"), nr("t", "x"));
-List expected = nrl(nr("a", "r"), nr("t", "x"));
+List rl = newRangeList(newRange("a", "e"), newRange("b", "f"), 
newRange("c", "r"), newRange("g", "j"), newRange("t", "x"));
+List expected = newRangeList(newRange("a", "r"), newRange("t", 
"x"));
 check(Range.mergeOverlapping(rl), expected);
   }
 
   public void testMergeOverlapping4() {
-List rl = nrl(nr("a", "e"), nr("b", "f"), nr("c", "r"), nr("g", 
"j"));
-List expected = nrl(nr("a", "r"));
+List rl = newRangeList(newRange("a", "e"), newRange("b", "f"), 
newRange("c", "r"), newRange("g", "j"));
+List expected = newRangeList(newRange("a", "r"));
 check(Range.mergeOverlapping(rl), expected);
   }
 
   public void testMergeOverlapping5() {
-List rl = nrl(nr("a", "e"));
-List 

[2/2] accumulo git commit: Merge branch '1.7' into 1.8

[mmiller]

Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7c7bbabb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c7bbabb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c7bbabb

Branch: refs/heads/1.8
Commit: 7c7bbabb8031bceb017bd8a482e4c960372af828
Parents: fcde1d9 3c45441
Author: Mike Miller 
Authored: Tue Dec 6 11:46:47 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 11:46:47 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7c7bbabb/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--

[1/2] accumulo git commit: ACCUMULO-4505: Another fix for shell errroneously reading conf

[mmiller]

Repository: accumulo
Updated Branches:
  refs/heads/1.8 fcde1d93a -> 7c7bbabb8


ACCUMULO-4505: Another fix for shell errroneously reading conf


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c454414
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c454414

Branch: refs/heads/1.8
Commit: 3c4544144a78904198b6795828c176e806b64e09
Parents: a4a4539
Author: Mike Miller 
Authored: Tue Dec 6 11:31:55 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 11:31:55 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c454414/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java 
b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index f6d1ac9..7c27343 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -318,6 +318,13 @@ public class ShellOptionsJC {
   clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, hosts);
   clientConfig.setProperty(ClientProperty.INSTANCE_NAME, instanceName);
 }
+// If the user provided the hosts, set the ZK for tracing too
+if (null != zooKeeperHosts && !zooKeeperHosts.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
+}
+if (null != zooKeeperInstanceName && !zooKeeperInstanceName.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_NAME, 
zooKeeperInstanceName);
+}
 
 // Automatically try to add in the proper ZK from accumulo-site for 
backwards compat.
 if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
@@ -325,11 +332,6 @@ public class ShellOptionsJC {
   clientConfig.withZkHosts(siteConf.get(Property.INSTANCE_ZK_HOST));
 }
 
-// If the user provided the hosts, set the ZK for tracing too
-if (null != zooKeeperHosts) {
-  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
-}
-
 return clientConfig;
   }
 

accumulo git commit: ACCUMULO-4505: Another fix for shell errroneously reading conf

[mmiller]

Repository: accumulo
Updated Branches:
  refs/heads/1.7 a4a453986 -> 3c4544144


ACCUMULO-4505: Another fix for shell errroneously reading conf


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c454414
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c454414
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c454414

Branch: refs/heads/1.7
Commit: 3c4544144a78904198b6795828c176e806b64e09
Parents: a4a4539
Author: Mike Miller 
Authored: Tue Dec 6 11:31:55 2016 -0500
Committer: Mike Miller 
Committed: Tue Dec 6 11:31:55 2016 -0500

--
 .../java/org/apache/accumulo/shell/ShellOptionsJC.java  | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c454414/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
--
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java 
b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index f6d1ac9..7c27343 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -318,6 +318,13 @@ public class ShellOptionsJC {
   clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, hosts);
   clientConfig.setProperty(ClientProperty.INSTANCE_NAME, instanceName);
 }
+// If the user provided the hosts, set the ZK for tracing too
+if (null != zooKeeperHosts && !zooKeeperHosts.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
+}
+if (null != zooKeeperInstanceName && !zooKeeperInstanceName.isEmpty()) {
+  clientConfig.setProperty(ClientProperty.INSTANCE_NAME, 
zooKeeperInstanceName);
+}
 
 // Automatically try to add in the proper ZK from accumulo-site for 
backwards compat.
 if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
@@ -325,11 +332,6 @@ public class ShellOptionsJC {
   clientConfig.withZkHosts(siteConf.get(Property.INSTANCE_ZK_HOST));
 }
 
-// If the user provided the hosts, set the ZK for tracing too
-if (null != zooKeeperHosts) {
-  clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, 
zooKeeperHosts);
-}
-
 return clientConfig;
   }
 

accumulo git commit: ACCUMULO-4530 Stop generating docs/config.html

[mwalch]

Repository: accumulo
Updated Branches:
  refs/heads/master 37ad8f505 -> d4d7d0920


ACCUMULO-4530 Stop generating docs/config.html

* Configuration docs can be found in appendix of user manual
* Updated all pointers to config.html to user manual instead
* Removed code used to generate HTML file


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d4d7d092
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d4d7d092
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d4d7d092

Branch: refs/heads/master
Commit: d4d7d0920c98a2f89882f1c4d9051e1a18fa9dca
Parents: 37ad8f5
Author: Mike Walch 
Authored: Fri Dec 2 13:42:12 2016 -0500
Committer: Mike Walch 
Committed: Tue Dec 6 10:38:39 2016 -0500

--
 assemble/libexec/templates/accumulo-site.xml|   5 +-
 assemble/src/main/assemblies/component.xml  |   9 --
 .../accumulo/core/conf/ConfigurationDocGen.java | 149 +--
 .../accumulo/core/conf/config-header.html   |  88 ---
 .../test/resources/crypto-off-accumulo-site.xml |   9 --
 .../test/resources/crypto-on-accumulo-site.xml  |  13 +-
 ...rypto-on-no-key-encryption-accumulo-site.xml |   9 --
 docs/pom.xml|  15 --
 docs/src/main/resources/administration.html |   2 +-
 docs/src/main/resources/index.html  |   1 -
 test/src/main/resources/conf/accumulo-site.xml  |   9 --
 11 files changed, 9 insertions(+), 300 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4d7d092/assemble/libexec/templates/accumulo-site.xml
--
diff --git a/assemble/libexec/templates/accumulo-site.xml 
b/assemble/libexec/templates/accumulo-site.xml
index ff490b1..a1f4153 100644
--- a/assemble/libexec/templates/accumulo-site.xml
+++ b/assemble/libexec/templates/accumulo-site.xml
@@ -18,9 +18,8 @@
 
 
 
-  
-
+  
   
 instance.volumes
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4d7d092/assemble/src/main/assemblies/component.xml
--
diff --git a/assemble/src/main/assemblies/component.xml 
b/assemble/src/main/assemblies/component.xml
index c384e14..83db9e8 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -135,15 +135,6 @@
   
 
 
-  ../docs/target
-  docs
-  0755
-  0644
-  
-config.html
-  
-
-
   conf
   0755
   0755

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4d7d092/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java 
b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index 1c34b99..c128c80 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -86,136 +86,6 @@ class ConfigurationDocGen {
 
   }
 
-  private class HTML extends Format {
-private boolean highlight;
-
-private void beginRow() {
-  doc.println(startTag("tr", highlight ? "class='highlight'" : null));
-  highlight = !highlight;
-}
-
-@Override
-void beginSection(String section) {
-  doc.println(t("h1", section, null));
-  highlight = true;
-  doc.println("");
-}
-
-private String t(String tag, String cell, String options) {
-  return startTag(tag, options) + cell + "";
-}
-
-private void cellData(String cell, String options) {
-  doc.println(t("td", cell, options));
-}
-
-private void columnNames(String... names) {
-  beginRow();
-  for (String s : names)
-doc.println(t("th", s, null));
-  endRow();
-}
-
-private void endRow() {
-  doc.println("");
-}
-
-@Override
-void endSection() {
-  doc.println("");
-}
-
-@Override
-String getExt() {
-  return "html";
-}
-
-@Override
-void pageFooter() {
-  doc.println("");
-  doc.println("");
-}
-
-@Override
-void propertyQuickLinks() {
-  doc.println("Jump to: ");
-  String delimiter = "";
-  for (Property prefix : prefixes) {
-if (!prefix.isExperimental()) {
-  doc.print(delimiter + "" + 
prefix.getKey() + "*");
-  delimiter = "|";
-}
-  }
-  doc.println("");
-}
-
-@Override
-void prefixSection(Property prefix) {
-  beginRow();
-  doc.println(t("td", t("span", prefix.getKey() + '*', "id='" + 
prefix.name() + "' class='large'"), "colspan='5'"
-