[accumulo] 01/01: Merge branch '1.9' into 2.0
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c95609c513a41f54a145e9b2cc06ce4435dd7dbd Merge: 68f8f5e 0884bfd Author: Christopher Tubbs AuthorDate: Sun Jun 9 22:08:19 2019 -0400 Merge branch '1.9' into 2.0 assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --cc hadoop-mapreduce/pom.xml index 36c8bd3,000..f940761 mode 100644,00..100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@@ -1,120 -1,0 +1,120 @@@ + + - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> ++http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> + 4.0.0 + +org.apache.accumulo +accumulo-project +2.0.0-SNAPSHOT + + accumulo-hadoop-mapreduce + Apache Accumulo Hadoop MapReduce + Apache Accumulo MapReduce bindings. + + + com.beust + jcommander + + + com.google.guava + guava + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + + + org.slf4j + slf4j-api + + + org.apache.hadoop + hadoop-client-runtime + runtime + + + junit + junit + test + + + org.apache.accumulo + accumulo-minicluster + test + + + org.apache.accumulo + accumulo-server-base + test + + + org.apache.accumulo + accumulo-test + test + + + org.slf4j + slf4j-log4j12 + test + + + + + +net.revelc.code +apilyzer-maven-plugin + + +apilyzer + + analyze + + + + org[.]apache[.]accumulo[.]core[.]client[.]mapred(?:uce)?[.].* + + +.*[.]impl[.].* + + + org[.]apache[.]accumulo[.]core[.](?:client|data|security)[.](?!.*(impl|thrift|crypto).*).* + +org[.]apache[.]accumulo[.]core[.]util[.]Pair + +org[.]apache[.]hadoop[.]conf[.]Configuration +org[.]apache[.]hadoop[.]fs[.](FileSystem|Path) + org[.]apache[.]hadoop[.]io[.](Text|Writable|WritableComparable|WritableComparator) + org[.]apache[.]hadoop[.]mapred[.](JobConf|RecordReader|InputSplit|RecordWriter|Reporter) + org[.]apache[.]hadoop[.]mapred[.]FileOutputFormat[$]Counter + org[.]apache[.]hadoop[.]mapreduce[.](Job|JobContext|RecordReader|InputSplit|TaskAttemptContext|RecordWriter|OutputCommitter|TaskInputOutputContext) + org[.]apache[.]hadoop[.]mapreduce[.]lib[.]output[.]FileOutputFormat[$]Counter +org[.]apache[.]hadoop[.]util[.]Progressable + org[.]apache[.]hadoop[.]mapred[.](FileAlreadyExistsException|InvalidJobConfException) + + + + + + + +
[accumulo] branch 2.0 updated (68f8f5e -> c95609c)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 68f8f5e Improve use of Hadoop's DistributedCache (#1188) new 0884bfd Fix xml namespace declarations in pom.xml files new c95609c Merge branch '1.9' into 2.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
[accumulo] branch 1.9 updated: Fix xml namespace declarations in pom.xml files
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 1.9 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/1.9 by this push: new 0884bfd Fix xml namespace declarations in pom.xml files 0884bfd is described below commit 0884bfd1af4a18339363dfdb5ea9e6bf12492857 Author: Christopher Tubbs AuthorDate: Sun Jun 9 21:57:50 2019 -0400 Fix xml namespace declarations in pom.xml files * Fix root pom.xml xmlns:xsi namespace (must be http, not https) * Update all schemaLocation values for xsi to consistently use current canonical location --- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- iterator-test-harness/pom.xml | 2 +- maven-plugin/pom.xml| 2 +- maven-plugin/src/it/plugin-test/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 2 +- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index 19008c6..2da82a7 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.accumulo diff --git a/core/pom.xml b/core/pom.xml index e44c4b9..646fcd7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.accumulo diff --git a/docs/pom.xml b/docs/pom.xml index 96c3572..6817280 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.accumulo diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index 8295c4a..679367e 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 org.apache.accumulo diff --git a/fate/pom.xml b/fate/pom.xml index 3839325..ae547b0 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
[accumulo] branch master updated (cda3be9 -> 14481de)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from cda3be9 Merge branch '2.0' new 0884bfd Fix xml namespace declarations in pom.xml files new c95609c Merge branch '1.9' into 2.0 new 14481de Merge branch '2.0' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 14481de2766ea015f848b5c90539017d8715361b Merge: cda3be9 c95609c Author: Christopher Tubbs AuthorDate: Sun Jun 9 22:08:48 2019 -0400 Merge branch '2.0' assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-)
[accumulo] branch 2.0.0-rc0-next created (now 68b6036)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.0.0-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git. at 68b6036 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new e795d27 [maven-release-plugin] prepare release rel/2.0.0 new 68b6036 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[accumulo] 01/01: [maven-release-plugin] prepare release rel/2.0.0
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0.0-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit e795d279b42f94a5b60cf6c5f91467874144cd61 Author: Christopher Tubbs AuthorDate: Sun Jun 9 22:19:47 2019 -0400 [maven-release-plugin] prepare release rel/2.0.0 --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index a86dc9b..deb3edf 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 0da79fe..f4e39aa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index f940761..5c5b422 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index 1286d81..327d5f2 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 1085cc4..63aca4d 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index fc842df..31c83b2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 2.0.0-SNAPSHOT + 2.0.0 pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -96,7 +96,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -HEAD +rel/2.0.0 https://gitbox.apache.org/repos/asf?p=accumulo.git diff --git a/server/base/pom.xml b/server/base/pom.xml index a8b1515..5cd0415 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-server-base diff --git a/server/gc/pom.xml b/server/gc/pom.xml index b691ccc..84db172 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-gc diff --git a/server/master/pom.xml b/server/master/pom.xml index de5516a..7bbed5f 100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-master diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index 1534ed4..6516a87 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-monitor diff --git a/server/native/pom.xml b/server/native/pom.xml index fd5d67c..f4841a7 100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-native diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml index 9b5bd70..b24f320 100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml accumulo-tracer diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index 8fb5e69..4ac1bae 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0-SNAPSHOT +2.0.0 ../../pom.xml
[accumulo] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0.0-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 68b6036ef454af609b715191f46b20f497e81fa6 Author: Christopher Tubbs AuthorDate: Sun Jun 9 22:19:57 2019 -0400 [maven-release-plugin] prepare for next development iteration --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index deb3edf..d209a36 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT accumulo pom diff --git a/core/pom.xml b/core/pom.xml index f4e39aa..6959961 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index 5c5b422..ac469a9 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index 327d5f2..1009652 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 63aca4d..2c8d5db 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index 31c83b2..5b5ebd6 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 2.0.0 + 2.0.1-SNAPSHOT pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -96,7 +96,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -rel/2.0.0 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo.git diff --git a/server/base/pom.xml b/server/base/pom.xml index 5cd0415..5c766df 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-server-base diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 84db172..92170aa 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-gc diff --git a/server/master/pom.xml b/server/master/pom.xml index 7bbed5f..bf3621f 100644 --- a/server/master/pom.xml +++ b/server/master/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-master diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index 6516a87..b871455 100644 --- a/server/monitor/pom.xml +++ b/server/monitor/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-monitor diff --git a/server/native/pom.xml b/server/native/pom.xml index f4841a7..0042387 100644 --- a/server/native/pom.xml +++ b/server/native/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-native diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml index b24f320..cd26a6a 100644 --- a/server/tracer/pom.xml +++ b/server/tracer/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT ../../pom.xml accumulo-tracer diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml index 4ac1bae..19df29f 100644 --- a/server/tserver/pom.xml +++ b/server/tserver/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -2.0.0 +2.0.1-SNAPSHOT
[accumulo] branch 2.0.0-rc0 created (now e795d27)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.0.0-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. at e795d27 [maven-release-plugin] prepare release rel/2.0.0 This branch includes the following new commits: new e795d27 [maven-release-plugin] prepare release rel/2.0.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[accumulo] 01/02: Fix #1052 Correct distributed cache usage (#1112)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ecd98de9ff9a1a2a46849a6c3f26ba7468cdbac6
Author: Jeffrey L. Zeiberg
AuthorDate: Wed Apr 10 07:46:24 2019 -0400
Fix #1052 Correct distributed cache usage (#1112)
* Correct distributed cache usage for Tokenfile and Property and
RangePartition key cut files.
---
.../mapreduce/lib/partition/RangePartitioner.java | 57 +-
.../clientImpl/mapreduce/lib/ConfiguratorBase.java | 22 +
.../mapreduce/lib/DistributedCacheHelper.java | 1 -
.../mapreduce/partition/RangePartitioner.java | 57 +-
.../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 24 ++---
.../accumulo/test/mapreduce/TokenFileIT.java | 30 +++-
6 files changed, 129 insertions(+), 62 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 6b32130..8461ff3 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -16,21 +16,22 @@
*/
package org.apache.accumulo.core.client.mapreduce.lib.partition;
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
+import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.URI;
+import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Base64;
import java.util.Scanner;
import java.util.TreeSet;
+import javax.imageio.IIOException;
+
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -90,26 +91,31 @@ public class RangePartitioner extends
Partitioner implements Conf
justification = "path provided by distributed cache framework, not user
input")
private synchronized Text[] getCutPoints() throws IOException {
if (cutPointArray == null) {
+ Path path;
String cutFileName = conf.get(CUTFILE_KEY);
- Path[] cf = Job.getInstance().getLocalCacheFiles();
-
- if (cf != null) {
-for (Path path : cf) {
- if (path.toUri().getPath()
- .endsWith(cutFileName.substring(cutFileName.lastIndexOf('/' {
-TreeSet cutPoints = new TreeSet<>();
-try (Scanner in = new Scanner(new BufferedReader(
-new InputStreamReader(new FileInputStream(path.toString()),
UTF_8 {
- while (in.hasNextLine())
-cutPoints.add(new
Text(Base64.getDecoder().decode(in.nextLine(;
-}
-cutPointArray = cutPoints.toArray(new Text[cutPoints.size()]);
-break;
- }
+ File tempFile = new File(CUTFILE_KEY);
+ if (tempFile.exists()) {
+path = new Path(CUTFILE_KEY);
+ } else {
+path = new Path(cutFileName);
+ }
+
+ if (path == null)
+throw new FileNotFoundException("Cut point file not found in
distributed cache");
+
+ TreeSet cutPoints = new TreeSet<>();
+ FileSystem fs = FileSystem.get(conf);
+ FSDataInputStream inputStream = fs.open(path);
+ try (Scanner in = new Scanner(inputStream)) {
+while (in.hasNextLine()) {
+ cutPoints.add(new Text(Base64.getDecoder().decode(in.nextLine(;
}
}
+
+ cutPointArray = cutPoints.toArray(new Text[cutPoints.size()]);
+
if (cutPointArray == null)
-throw new FileNotFoundException(cutFileName + " not found in
distributed cache");
+throw new IIOException("Cutpoint array not properly created from file"
+ path.getName());
}
return cutPointArray;
}
@@ -129,7 +135,14 @@ public class RangePartitioner extends
Partitioner implements Conf
* points that represent ranges for partitioning
*/
public static void setSplitFile(Job job, String file) {
-URI uri = new Path(file).toUri();
+URI uri;
+try {
+ uri = new URI(file + "#" + CUTFILE_KEY);
+} catch (URISyntaxException e) {
+ throw new IllegalStateException(
+ "Unable to add split file \"" + CUTFILE_KEY + "\" to distributed
cache.");
+}
+
job.addCacheFile(uri);
job.getConfiguration().set(CUTFILE_KEY, uri.getPath());
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/mapreduce/lib/ConfiguratorBase.java
[accumulo] branch master updated (2cd5b4c -> cda3be9)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 2cd5b4c Merge branch '2.0' new ecd98de Fix #1052 Correct distributed cache usage (#1112) new 68f8f5e Improve use of Hadoop's DistributedCache (#1188) new cda3be9 Merge branch '2.0' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../mapreduce/lib/partition/RangePartitioner.java | 50 + .../clientImpl/mapreduce/lib/ConfiguratorBase.java | 85 ++ .../mapreduce/lib/DistributedCacheHelper.java | 59 +-- .../mapreduce/partition/RangePartitioner.java | 50 + .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 39 -- .../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../accumulo/shell/PasswordConverterTest.java | 3 +- .../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++- .../accumulo/test/mapreduce/TokenFileIT.java | 29 +++- 9 files changed, 189 insertions(+), 145 deletions(-)
[accumulo] 02/02: Improve use of Hadoop's DistributedCache (#1188)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 68f8f5e5ae0c0451cbb530c86a251853e7cf6b39
Author: Christopher Tubbs
AuthorDate: Sun Jun 9 21:17:23 2019 -0400
Improve use of Hadoop's DistributedCache (#1188)
Update DistributedCacheHelper to both add a cached file to a MapReduce
job and to retrieve an InputStream from the DistributedCache (or HDFS,
if the item was not successfully cached).
Ensure uniqueness in the local cached file names and that the files are
read from the correct filesystem.
Add some tests to TokenFileIT
Specify the charset explicitly when java.util.Scanner is used (most
occurrences were related to code using the DistributedCache, but also
fixed two trivial occurrences in shell-related code).
---
.../mapreduce/lib/partition/RangePartitioner.java | 55 -
.../clientImpl/mapreduce/lib/ConfiguratorBase.java | 91 ++
.../mapreduce/lib/DistributedCacheHelper.java | 60 --
.../mapreduce/partition/RangePartitioner.java | 55 -
.../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 45 ---
.../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +-
.../accumulo/shell/PasswordConverterTest.java | 3 +-
.../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++-
.../accumulo/test/mapreduce/TokenFileIT.java | 53 ++---
9 files changed, 179 insertions(+), 202 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 8461ff3..1e11178 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -16,30 +16,23 @@
*/
package org.apache.accumulo.core.client.mapreduce.lib.partition;
-import java.io.File;
-import java.io.FileNotFoundException;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.io.InputStream;
import java.util.Arrays;
import java.util.Base64;
import java.util.Scanner;
import java.util.TreeSet;
-import javax.imageio.IIOException;
-
+import
org.apache.accumulo.core.clientImpl.mapreduce.lib.DistributedCacheHelper;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Partitioner;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
/**
* Hadoop partitioner that uses ranges, and optionally sub-bins based on
hashing.
*
@@ -70,8 +63,9 @@ public class RangePartitioner extends
Partitioner implements Conf
// both conditions work with numSubBins == 1, but this check is to avoid
// hashing, when we don't need to, for speed
-if (numSubBins < 2)
+if (numSubBins < 2) {
return index;
+}
return (key.toString().hashCode() & Integer.MAX_VALUE) % numSubBins +
index * numSubBins;
}
@@ -87,26 +81,14 @@ public class RangePartitioner extends
Partitioner implements Conf
private Text[] cutPointArray = null;
- @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN",
- justification = "path provided by distributed cache framework, not user
input")
private synchronized Text[] getCutPoints() throws IOException {
if (cutPointArray == null) {
- Path path;
String cutFileName = conf.get(CUTFILE_KEY);
- File tempFile = new File(CUTFILE_KEY);
- if (tempFile.exists()) {
-path = new Path(CUTFILE_KEY);
- } else {
-path = new Path(cutFileName);
- }
-
- if (path == null)
-throw new FileNotFoundException("Cut point file not found in
distributed cache");
-
TreeSet cutPoints = new TreeSet<>();
- FileSystem fs = FileSystem.get(conf);
- FSDataInputStream inputStream = fs.open(path);
- try (Scanner in = new Scanner(inputStream)) {
+ try (
+ InputStream inputStream =
+ DistributedCacheHelper.openCachedFile(cutFileName, CUTFILE_KEY,
conf);
+ Scanner in = new Scanner(inputStream, UTF_8.name())) {
while (in.hasNextLine()) {
cutPoints.add(new Text(Base64.getDecoder().decode(in.nextLine(;
}
@@ -114,8 +96,9 @@ public class RangePartitioner extends
Partitioner implements Conf
cutPointArray = cutPoints.toArray(new Text[cutPoints.size()]);
- if (cutPointArray == null)
-
[accumulo] 01/01: Merge branch '2.0'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit cda3be981ea42dead5eeff0374590337f7b76c93 Merge: 2cd5b4c 68f8f5e Author: Christopher Tubbs AuthorDate: Sun Jun 9 21:18:10 2019 -0400 Merge branch '2.0' .../mapreduce/lib/partition/RangePartitioner.java | 50 + .../clientImpl/mapreduce/lib/ConfiguratorBase.java | 85 ++ .../mapreduce/lib/DistributedCacheHelper.java | 59 +-- .../mapreduce/partition/RangePartitioner.java | 50 + .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 39 -- .../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../accumulo/shell/PasswordConverterTest.java | 3 +- .../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++- .../accumulo/test/mapreduce/TokenFileIT.java | 29 +++- 9 files changed, 189 insertions(+), 145 deletions(-)
[accumulo] branch 2.0 updated (55e5e95 -> 68f8f5e)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 55e5e95 Resolve bad merge of #1185 by removing unused import new ecd98de Fix #1052 Correct distributed cache usage (#1112) new 68f8f5e Improve use of Hadoop's DistributedCache (#1188) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../mapreduce/lib/partition/RangePartitioner.java | 50 + .../clientImpl/mapreduce/lib/ConfiguratorBase.java | 85 ++ .../mapreduce/lib/DistributedCacheHelper.java | 59 +-- .../mapreduce/partition/RangePartitioner.java | 50 + .../hadoopImpl/mapreduce/lib/ConfiguratorBase.java | 39 -- .../org/apache/accumulo/shell/ShellOptionsJC.java | 4 +- .../accumulo/shell/PasswordConverterTest.java | 3 +- .../apache/accumulo/test/mapred/TokenFileIT.java | 15 +++- .../accumulo/test/mapreduce/TokenFileIT.java | 29 +++- 9 files changed, 189 insertions(+), 145 deletions(-)
