[accumulo] 01/01: Merge branch '1.9'
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 ccb357f540145313e2f1df349dfd02c57f359a82 Merge: 3fd5cad 2f4ad2d Author: Christopher Tubbs AuthorDate: Fri Nov 15 22:25:10 2019 -0500 Merge branch '1.9'
[accumulo] branch master updated (3fd5cad -> ccb357f)
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 3fd5cad Standardize license headers (#1433) new 2f4ad2d Backport license and typo fixes for bloomfilter code new ccb357f Merge branch '1.9' 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:
[accumulo] branch 1.9 updated: Backport license and typo fixes for bloomfilter code
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 2f4ad2d Backport license and typo fixes for bloomfilter code 2f4ad2d is described below commit 2f4ad2d310b8388d88446f95a6d7e5ce16ff35c0 Author: Christopher Tubbs AuthorDate: Fri Nov 15 22:23:07 2019 -0500 Backport license and typo fixes for bloomfilter code * Remove incorrect redundant license headers from bloomfilter code * Add exceptions for rat (because it doesn't recognize the style of the BSD license header for the bloomfilter code) * Backport any spelling typos fixed in bloomfilter code in master branch back to 1.9 --- core/pom.xml | 4 ++-- .../accumulo/core/bloomfilter/BloomFilter.java | 20 .../core/bloomfilter/DynamicBloomFilter.java | 20 .../apache/accumulo/core/bloomfilter/Filter.java | 28 -- 4 files changed, 6 insertions(+), 66 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 646fcd7..46aabce 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -141,9 +141,9 @@ apache-rat-plugin - src/test/resources/shelltest.txt - src/test/resources/org/apache/accumulo/core/file/rfile/*.rf + src/main/java/org/apache/accumulo/core/bloomfilter/*.java src/test/resources/*.jceks + src/test/resources/org/apache/accumulo/core/file/rfile/*.rf diff --git a/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java b/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java index 4d704f3..8779eeb 100644 --- a/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java @@ -1,5 +1,4 @@ /* - * * Copyright (c) 2005, European Commission project OneLab under contract 034819 * (http://www.one-lab.org) * All rights reserved. @@ -29,25 +28,6 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package org.apache.accumulo.core.bloomfilter; import java.io.ByteArrayOutputStream; diff --git a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java index 85399bf..f5b9c0c 100644 --- a/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/bloomfilter/DynamicBloomFilter.java @@ -1,5 +1,4 @@ /* - * * Copyright (c) 2005, European Commission project OneLab under contract 034819 * (http://www.one-lab.org) * All rights reserved. @@ -29,25 +28,6 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - package org.apache.accumulo.core.bloomfilter; import java.io.DataInput; diff --git a/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java b/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java index 8d30a05..bb07542 100644 ---
[accumulo] branch master updated (4340784 -> 3fd5cad)
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 4340784 Fix #1429 add missing runtime monitor dependency (#1432) add 3fd5cad Standardize license headers (#1433) No new revisions were added by this update. Summary of changes: assemble/bin/accumulo | 29 +-- assemble/bin/accumulo-cluster | 29 +-- assemble/bin/accumulo-service | 29 +-- assemble/bin/accumulo-util | 29 +-- assemble/build.sh | 29 +-- assemble/conf/accumulo-env.sh | 29 +-- assemble/conf/accumulo.properties | 28 ++- assemble/conf/log4j-monitor.properties | 28 ++- assemble/conf/log4j-service.properties | 28 ++- assemble/conf/log4j.properties | 28 ++- .../templates/hadoop-metrics2-accumulo.properties | 28 ++- assemble/pom.xml | 42 +++- assemble/src/main/assemblies/binary-release.xml| 26 ++- assemble/src/main/assemblies/component.xml | 26 ++- contrib/Eclipse-Accumulo-Codestyle.xml | 26 ++- contrib/license-header.txt | 16 ++ contrib/scripts/check-tservers.py | 29 +-- core/pom.xml | 42 ++-- .../apache/accumulo/core/FilteredConstants.java| 26 ++- .../java/org/apache/accumulo/core/Constants.java | 26 ++- .../accumulo/core/bloomfilter/BloomFilter.java | 20 -- .../core/bloomfilter/DynamicBloomFilter.java | 20 -- .../apache/accumulo/core/bloomfilter/Filter.java | 20 -- .../org/apache/accumulo/core/cli/ClientOpts.java | 26 ++- .../org/apache/accumulo/core/cli/ConfigOpts.java | 26 ++- .../java/org/apache/accumulo/core/cli/Help.java| 26 ++- .../org/apache/accumulo/core/client/Accumulo.java | 26 ++- .../accumulo/core/client/AccumuloClient.java | 26 ++- .../accumulo/core/client/AccumuloException.java| 26 ++- .../core/client/AccumuloSecurityException.java | 26 ++- .../apache/accumulo/core/client/BatchDeleter.java | 26 ++- .../apache/accumulo/core/client/BatchScanner.java | 26 ++- .../apache/accumulo/core/client/BatchWriter.java | 26 ++- .../accumulo/core/client/BatchWriterConfig.java| 26 ++- .../accumulo/core/client/ClientConfiguration.java | 26 ++- .../core/client/ClientSideIteratorScanner.java | 26 ++- .../accumulo/core/client/ConditionalWriter.java| 27 +-- .../core/client/ConditionalWriterConfig.java | 26 ++- .../org/apache/accumulo/core/client/Connector.java | 26 ++- .../apache/accumulo/core/client/Durability.java| 26 ++- .../org/apache/accumulo/core/client/Instance.java | 26 ++- .../accumulo/core/client/IsolatedScanner.java | 26 ++- .../accumulo/core/client/IteratorSetting.java | 26 ++- .../core/client/MultiTableBatchWriter.java | 26 ++- .../core/client/MutationsRejectedException.java| 26 ++- .../core/client/NamespaceExistsException.java | 26 ++- .../core/client/NamespaceNotEmptyException.java| 26 ++- .../core/client/NamespaceNotFoundException.java| 26 ++- .../apache/accumulo/core/client/RowIterator.java | 26 ++- .../core/client/SampleNotPresentException.java | 27 +-- .../org/apache/accumulo/core/client/Scanner.java | 26 ++- .../apache/accumulo/core/client/ScannerBase.java | 26 ++- .../core/client/TableDeletedException.java | 26 ++- .../accumulo/core/client/TableExistsException.java | 26 ++- .../core/client/TableNotFoundException.java| 26 ++- .../core/client/TableOfflineException.java | 26 ++- .../accumulo/core/client/TimedOutException.java| 26 ++- .../accumulo/core/client/ZooKeeperInstance.java| 26 ++- .../core/client/admin/ActiveCompaction.java| 26 ++- .../accumulo/core/client/admin/ActiveScan.java | 26 ++- .../core/client/admin/CompactionConfig.java| 27 +-- .../client/admin/CompactionStrategyConfig.java | 27 +-- .../core/client/admin/DelegationTokenConfig.java | 26 ++- .../accumulo/core/client/admin/DiskUsage.java | 26 ++- .../apache/accumulo/core/client/admin/FindMax.java | 26 ++- .../core/client/admin/InitialTableState.java | 26 ++- .../core/client/admin/InstanceOperations.java | 26 ++- .../accumulo/core/client/admin/Locations.java | 27 +-- .../core/client/admin/NamespaceOperations.java | 26 ++- .../core/client/admin/NewTableConfiguration.java | 26 ++- .../core/client/admin/ReplicationOperations.java | 26 ++- .../accumulo/core/client/admin/ScanState.java | 26 ++- .../accumulo/core/client/admin/ScanType.java | 26 ++- .../core/client/admin/SecurityOperations.java | 26 ++-
[accumulo] branch master updated (cdbbb4e -> 4340784)
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 cdbbb4e Drop Eclipse template (#1431) add 4340784 Fix #1429 add missing runtime monitor dependency (#1432) No new revisions were added by this update. Summary of changes: assemble/pom.xml | 5 + assemble/src/main/assemblies/component.xml | 1 + pom.xml| 6 ++ server/monitor/pom.xml | 5 + 4 files changed, 17 insertions(+)
[accumulo] branch master updated (bd2ddba -> cdbbb4e)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from bd2ddba add choosable() to VolumeChooser and VolumeManager interfaces. (#1413) add cdbbb4e Drop Eclipse template (#1431) No new revisions were added by this update. Summary of changes: contrib/Eclipse-Accumulo-Template.xml | 60 --- 1 file changed, 60 deletions(-) delete mode 100644 contrib/Eclipse-Accumulo-Template.xml
[accumulo-website] 01/01: Turned a non-word into a word
This is an automated email from the ASF dual-hosted git repository. phrocker pushed a commit to branch phrocker-patch-1 in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 1f9cf8a2ae36f45242fd16f982b072fd6a5dc456 Author: Marc AuthorDate: Fri Nov 15 08:02:50 2019 -0500 Turned a non-word into a word --- _docs-2/getting-started/table_design.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_docs-2/getting-started/table_design.md b/_docs-2/getting-started/table_design.md index b029b2b..dcf75fd 100644 --- a/_docs-2/getting-started/table_design.md +++ b/_docs-2/getting-started/table_design.md @@ -85,7 +85,7 @@ date range. Since Keys in Accumulo are sorted lexicographically by default, it's often useful to encode common data types into a byte format in which their sort order corresponds to the sort order in their native form. An example of this is encoding dates and numerical data so that they can -be better seeked or searched in ranges. +be better sought or searched in ranges. The lexicoders are a standard and extensible way of encoding Java types. Here's an example of a lexicoder that encodes a java Date object so that it sorts lexicographically:
[accumulo-website] branch phrocker-patch-1 created (now 1f9cf8a)
This is an automated email from the ASF dual-hosted git repository. phrocker pushed a change to branch phrocker-patch-1 in repository https://gitbox.apache.org/repos/asf/accumulo-website.git. at 1f9cf8a Turned a non-word into a word This branch includes the following new commits: new 1f9cf8a Turned a non-word into a word 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.
