[accumulo] branch main updated: Fix #1889 Clarify IteratorEnvironment is non-null
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/main by this push: new f7db175 Fix #1889 Clarify IteratorEnvironment is non-null new 27ed66b Merge branch '1.10' into main f7db175 is described below commit f7db1750938a748b7a9c024ea2c52276c8c54894 Author: Christopher Tubbs AuthorDate: Mon Feb 1 15:33:32 2021 -0500 Fix #1889 Clarify IteratorEnvironment is non-null Update javadoc for SortedKeyValueIterator methods that receive an IteratorEnvironment to mention that the environment is provided by Accumulo itself and is expected to be non-null. --- .../org/apache/accumulo/core/iterators/SortedKeyValueIterator.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java index 256cd5d..81ca628 100644 --- a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java @@ -40,7 +40,8 @@ public interface SortedKeyValueIterator,V extend * @param options * Map map of string option names to option values. * @param env - * IteratorEnvironment environment in which iterator is being run. + * IteratorEnvironment environment in which iterator is being run, provided + * by Accumulo itself and is expected to be non-null. * @throws IOException * unused. * @exception IllegalArgumentException @@ -159,7 +160,8 @@ public interface SortedKeyValueIterator,V extend * either on the original or the copy. A proper implementation would call deepCopy on the source. * * @param env - * IteratorEnvironment environment in which iterator is being run. + * IteratorEnvironment environment in which iterator is being run, provided + * by Accumulo itself and is expected to be non-null. * @return SortedKeyValueIterator a copy of this iterator (with the same source and * settings). * @exception UnsupportedOperationException
[accumulo] branch 1.10 updated (ed97eac -> f7db175)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 1.10 in repository https://gitbox.apache.org/repos/asf/accumulo.git. from ed97eac Make UnloadTabletHandler log before waiting (#1881) add f7db175 Fix #1889 Clarify IteratorEnvironment is non-null No new revisions were added by this update. Summary of changes: .../org/apache/accumulo/core/iterators/SortedKeyValueIterator.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[accumulo] branch main updated (fd70e08 -> 68af47a)
This is an automated email from the ASF dual-hosted git repository. jmanno pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from fd70e08 Closes #637: Add a UUID to the server's ZooLock (#1866) add 68af47a Upgrade to jline3 (#1824) No new revisions were added by this update. Summary of changes: assemble/pom.xml | 10 +- assemble/src/main/assemblies/component.xml | 2 +- assemble/src/main/resources/LICENSE| 68 core/pom.xml | 8 +- .../org/apache/accumulo/core/util/CreateToken.java | 11 +- pom.xml| 10 +- server/base/pom.xml| 8 +- .../apache/accumulo/server/init/Initialize.java| 47 +++--- shell/pom.xml | 8 +- .../main/java/org/apache/accumulo/shell/Shell.java | 171 +++-- .../org/apache/accumulo/shell/ShellCompletor.java | 21 ++- .../shell/commands/AuthenticateCommand.java| 4 +- .../accumulo/shell/commands/ClasspathCommand.java | 14 +- .../accumulo/shell/commands/ClearCommand.java | 18 +-- .../accumulo/shell/commands/ConfigCommand.java | 5 +- .../accumulo/shell/commands/ConstraintCommand.java | 12 +- .../shell/commands/CreateTableCommand.java | 2 +- .../accumulo/shell/commands/CreateUserCommand.java | 4 +- .../apache/accumulo/shell/commands/DUCommand.java | 2 +- .../shell/commands/DeleteNamespaceCommand.java | 2 +- .../accumulo/shell/commands/DeleteRowsCommand.java | 2 +- .../shell/commands/DeleteTableCommand.java | 2 +- .../accumulo/shell/commands/DropUserCommand.java | 22 ++- .../accumulo/shell/commands/GetAuthsCommand.java | 2 +- .../accumulo/shell/commands/GetGroupsCommand.java | 2 +- .../accumulo/shell/commands/HelpCommand.java | 4 +- .../accumulo/shell/commands/HiddenCommand.java | 7 +- .../accumulo/shell/commands/HistoryCommand.java| 10 +- .../accumulo/shell/commands/ListIterCommand.java | 2 +- .../shell/commands/ListShellIterCommand.java | 2 +- .../accumulo/shell/commands/MaxRowCommand.java | 2 +- .../accumulo/shell/commands/MergeCommand.java | 11 +- .../commands/NamespacePermissionsCommand.java | 2 +- .../accumulo/shell/commands/PasswdCommand.java | 6 +- .../accumulo/shell/commands/SetIterCommand.java| 40 ++--- .../commands/ShellPluginConfigurationCommand.java | 4 +- .../shell/commands/SystemPermissionsCommand.java | 2 +- .../accumulo/shell/commands/TableOperation.java| 2 +- .../shell/commands/TablePermissionsCommand.java| 2 +- .../accumulo/shell/commands/TraceCommand.java | 12 +- .../accumulo/shell/commands/UserCommand.java | 2 +- .../shell/commands/UserPermissionsCommand.java | 18 +-- .../accumulo/shell/commands/UsersCommand.java | 2 +- .../accumulo/shell/commands/WhoAmICommand.java | 2 +- .../accumulo/shell/format/DeleterFormatter.java| 49 +++--- .../org/apache/accumulo/shell/ShellConfigTest.java | 13 +- .../shell/commands/DeleteAuthsCommandTest.java | 9 +- .../shell/commands/DropUserCommandTest.java| 12 +- .../shell/commands/HistoryCommandTest.java | 37 +++-- .../shell/commands/SetIterCommandTest.java | 23 +-- .../shell/format/DeleterFormatterTest.java | 22 ++- test/pom.xml | 8 +- .../java/org/apache/accumulo/test/ShellIT.java | 14 +- .../org/apache/accumulo/test/ShellServerIT.java| 15 +- 54 files changed, 417 insertions(+), 374 deletions(-)
[accumulo] branch main updated (fd001c9 -> fd70e08)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from fd001c9 Revert "Add check to not flush when table is being deleted. (#1887)" add fd70e08 Closes #637: Add a UUID to the server's ZooLock (#1866) No new revisions were added by this update. Summary of changes: .../apache/accumulo/fate/zookeeper/ZooLock.java| 532 ++--- .../accumulo/fate/zookeeper/ZooLockTest.java | 80 .../org/apache/accumulo/server/util/AdminTest.java | 8 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 4 +- .../java/org/apache/accumulo/master/Master.java| 8 +- .../java/org/apache/accumulo/monitor/Monitor.java | 8 +- .../org/apache/accumulo/tserver/TabletServer.java | 3 +- .../accumulo/test/fate/zookeeper/ZooLockIT.java| 377 +-- .../accumulo/test/functional/SplitRecoveryIT.java | 3 +- .../accumulo/test/functional/ZombieTServer.java| 3 +- 10 files changed, 817 insertions(+), 209 deletions(-) create mode 100644 core/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
[accumulo] branch main updated (8ed8ff6 -> fd001c9)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 8ed8ff6 Improvements to BulkImportCacheCleaner (#1890) add fd001c9 Revert "Add check to not flush when table is being deleted. (#1887)" No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java| 6 -- 1 file changed, 6 deletions(-)
[accumulo] branch main updated (b8dac78 -> 8ed8ff6)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from b8dac78 Add check to not flush when table is being deleted. (#1887) add 8ed8ff6 Improvements to BulkImportCacheCleaner (#1890) No new revisions were added by this update. Summary of changes: .../apache/accumulo/server/zookeeper/TransactionWatcher.java | 12 +++- .../accumulo/tserver/tablet/BulkImportCacheCleaner.java | 8 ++-- 2 files changed, 13 insertions(+), 7 deletions(-)
[accumulo] branch main updated (6af856b -> b8dac78)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 6af856b Merge remote-tracking branch 'upstream/1.10' into main add b8dac78 Add check to not flush when table is being deleted. (#1887) No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java| 6 ++ 1 file changed, 6 insertions(+)
