You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cs...@apache.org on 2023/06/16 13:44:31 UTC
[accumulo] branch no-chop-merge updated (818eee2289 -> d03972d95a)
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 818eee2289 Merge branch 'main' into no-chop-merge
add 52f9e94a15 uses stored tablet file to delete bulk file (#3478)
add 97a11ba820 fixes bulk import filename prefix (#3477)
add 89d893f4dd Improve javadocs for the TabletFile interface (#3476)
add c27ba41443 Fix to stop assignments to shutting down servers (#3479)
add 8cb090ab88 Fix to stop assignments to shutting down servers (#3479)
add 658346ce1a Merge branch '2.1'
add d3b910c4a0 Remove redundant main from zoo-info-viewer tool (#3481)
add 7967fdac52 Merge branch '2.1'
add c6d47d032e Add tool to edit props in ZooKeeper with Accumulo offline (#3445)
add 28627e67a1 Merge branch '2.1'
add 7c5bbc6e90 Revert to JLine 3.21.0
add d9f76311e9 Merge branch '2.1'
add 02758b8695 Use flush with wait in GarbageCollector Trash tests (#3490)
add 94df1673b1 Merge branch '2.1'
add 202ef695ab fixes bug where bulk import could cause compcation to hang (#3492)
add d9c816f53b Merge branch '2.1'
add cec72b5b8e Don't use small-caps in monitor (#3493)
add 238a5226d3 Merge branch '2.1'
add 0e3d3ec3be Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498)
add 6a1431b773 Bump guava from 31.1-jre to 32.0.0-jre (#3497)
new d03972d95a Merge branch 'main' into no-chop-merge
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.
Summary of changes:
.../apache/accumulo/core/metadata/TabletFile.java | 12 +-
.../accumulo/core/metadata/schema/Ample.java | 2 +-
pom.xml | 7 +-
.../accumulo/server/conf/util/ZooInfoViewer.java | 162 +----------
.../accumulo/server/conf/util/ZooPropEditor.java | 305 +++++++++++++++++++++
.../accumulo/server/conf/util/ZooPropUtils.java | 140 ++++++++++
.../server/metadata/TabletMutatorBase.java | 4 +-
.../server/conf/util/ZooInfoViewerTest.java | 86 +-----
.../server/conf/util/ZooPropEditorTest.java | 27 +-
.../server/conf/util/ZooPropUtilsTest.java | 68 +++++
.../accumulo/manager/TabletGroupWatcher.java | 21 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 2 +-
.../accumulo/monitor/resources/css/screen.css | 3 -
.../org/apache/accumulo/tserver/tablet/Tablet.java | 35 ++-
.../accumulo/start/spi/KeywordExecutable.java | 5 +-
.../accumulo/test/conf/util/ZooPropEditorIT.java | 138 ++++++++++
.../test/functional/GarbageCollectorTrashBase.java | 2 +-
...ageCollectorTrashEnabledWithCustomPolicyIT.java | 2 +-
.../apache/accumulo/test/functional/SplitIT.java | 75 +++++
.../apache/accumulo/test/start/KeywordStartIT.java | 71 +++--
20 files changed, 850 insertions(+), 317 deletions(-)
create mode 100644 server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropEditor.java
create mode 100644 server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropUtils.java
copy core/src/test/java/org/apache/accumulo/core/data/ByteSequenceTest.java => server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropEditorTest.java (61%)
create mode 100644 server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropUtilsTest.java
create mode 100644 test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
[accumulo] 01/01: Merge branch 'main' into no-chop-merge
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d03972d95a10c96bb94bd15c3320f2534a8d576f
Merge: 818eee2289 6a1431b773
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Fri Jun 16 09:36:56 2023 -0400
Merge branch 'main' into no-chop-merge
.../apache/accumulo/core/metadata/TabletFile.java | 12 +-
.../accumulo/core/metadata/schema/Ample.java | 2 +-
pom.xml | 7 +-
.../accumulo/server/conf/util/ZooInfoViewer.java | 162 +----------
.../accumulo/server/conf/util/ZooPropEditor.java | 305 +++++++++++++++++++++
.../accumulo/server/conf/util/ZooPropUtils.java | 140 ++++++++++
.../server/metadata/TabletMutatorBase.java | 4 +-
.../server/conf/util/ZooInfoViewerTest.java | 86 +-----
.../server/conf/util/ZooPropEditorTest.java | 39 ++-
.../server/conf/util/ZooPropUtilsTest.java | 68 +++++
.../accumulo/manager/TabletGroupWatcher.java | 21 +-
.../manager/tableOps/bulkVer2/PrepBulkImport.java | 2 +-
.../accumulo/monitor/resources/css/screen.css | 3 -
.../org/apache/accumulo/tserver/tablet/Tablet.java | 35 ++-
.../accumulo/start/spi/KeywordExecutable.java | 5 +-
.../accumulo/test/conf/util/ZooPropEditorIT.java | 138 ++++++++++
.../test/functional/GarbageCollectorTrashBase.java | 2 +-
...ageCollectorTrashEnabledWithCustomPolicyIT.java | 2 +-
.../apache/accumulo/test/functional/SplitIT.java | 75 +++++
.../apache/accumulo/test/start/KeywordStartIT.java | 71 +++--
20 files changed, 854 insertions(+), 325 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/metadata/TabletFile.java
index 14dd2de5ec,3486f2134f..b31b6926d3
--- a/core/src/main/java/org/apache/accumulo/core/metadata/TabletFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/TabletFile.java
@@@ -18,9 -18,12 +18,13 @@@
*/
package org.apache.accumulo.core.metadata;
+import org.apache.accumulo.core.data.Range;
import org.apache.hadoop.fs.Path;
+ /**
+ * An interface that represents different types of file references that are handled by code that
+ * processes tablet files.
+ */
public interface TabletFile {
/**