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 c32ba0dc10831f20a709efb514c21cfee1e6b6af
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
AuthorDate: Fri Sep 15 12:32:18 2023 -0400
Minor code cleanup
---
.../org/apache/accumulo/core/metadata/StoredTabletFile.java | 2 --
.../accumulo/server/constraints/MetadataConstraints.java | 6 +++---
.../org/apache/accumulo/server/util/MetadataTableUtil.java | 1 -
.../java/org/apache/accumulo/manager/state/MergeStats.java | 3 ---
.../apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java | 1 -
.../java/org/apache/accumulo/test/manager/MergeStateIT.java | 11 -----------
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
index 71d3d6b9b4..a3a5c21650 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
@@ -51,8 +51,6 @@ public class StoredTabletFile extends
AbstractTabletFile<StoredTabletFile> {
private final ReferencedTabletFile referencedTabletFile;
private final String metadataEntryPath;
- // TODO: Comparing by metadata path (file path) and then range object,
- // Is this ok or should we compare by the metadtaEntry string
lexicographical order?
private static final Comparator<StoredTabletFile> comparator = Comparator
.comparing(StoredTabletFile::getMetadataPath).thenComparing(StoredTabletFile::getRange);
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index a108d8e9ec..3a56a08292 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -234,8 +234,8 @@ public class MetadataConstraints implements Constraint {
} else if (columnFamily.equals(BulkFileColumnFamily.NAME)) {
if (!columnUpdate.isDeleted() && !checkedBulk) {
/*
- * TODO: This needs to be re-worked after Issue
- * https://github.com/apache/accumulo/issues/3505 is done.
+ * This needs to be re-worked after Issue
https://github.com/apache/accumulo/issues/3505
+ * is done.
*
* That issue will reorganizes this class and make things more
efficient so we are not
* looping over the same mutation more than once like in this case.
The below check is
@@ -272,7 +272,7 @@ public class MetadataConstraints implements Constraint {
isLocationMutation = true;
} else if (new
Text(update.getColumnFamily()).equals(DataFileColumnFamily.NAME)) {
try {
- // TODO: This actually validates for a second time as the loop
already validates
+ // This actually validates for a second time as the loop
already validates
// if a DataFileColumnFamily, this will likely be fixed as
part of
// https://github.com/apache/accumulo/issues/3505
dataFiles.add(StoredTabletFile.of(new
Text(update.getColumnQualifier())));
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
index 4d35eb7e92..646e63d096 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
@@ -411,7 +411,6 @@ public class MetadataTableUtil {
if (!cf.startsWith("../") && !cf.contains(":")) {
cf = "../" + srcTableId + entry.getKey().getColumnQualifier();
}
- // TODO: Fix this?
m.put(entry.getKey().getColumnFamily(), new Text(cf),
entry.getValue());
} else if
(entry.getKey().getColumnFamily().equals(CurrentLocationColumnFamily.NAME)) {
m.put(LastLocationColumnFamily.NAME,
entry.getKey().getColumnQualifier(), entry.getValue());
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java
b/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java
index 0659d58536..fa9bd968cd 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/state/MergeStats.java
@@ -128,9 +128,6 @@ public class MergeStats {
log.info("Merge range is already contained in a single tablet {}",
info.getExtent());
state = MergeState.COMPLETE;
} else if (hosted == total) {
- // Todo: Clean up references to WAITING_FOR_CHOPPED and SPLITTING and
remove
- // from enum in a future PR as both are going away. for now just change
- // this to going to WAITING_FOR_OFFLINE as chops are not necessary
state = MergeState.WAITING_FOR_OFFLINE;
} else {
log.info("Waiting for {} hosted tablets to be {} {}", hosted, total,
info.getExtent());
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index 0dcc48a728..6d1cbb027e 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@ -290,7 +290,6 @@ class LoadFiles extends ManagerRepo {
Mutation mutation = new Mutation(tablet.getExtent().toMetaRow());
for (final Bulk.FileInfo fileInfo : files) {
- // Todo: do we need to support importing with a range here?
StoredTabletFile fullPath =
StoredTabletFile.of(new Path(bulkDir,
fileInfo.getFileName()).toUri(), new Range());
byte[] val =
diff --git
a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
index d050df00e0..9867454ac9 100644
--- a/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/manager/MergeStateIT.java
@@ -190,17 +190,6 @@ public class MergeStateIT extends ConfigurableMacBase {
metaDataStateStore
.setLocations(Collections.singletonList(new Assignment(tablet,
state.someTServer, null)));
- // No more chop compactions for merges
- //
- // // onos... there's a new tablet online
- // stats = scan(state, metaDataStateStore);
- // assertEquals(MergeState.WAITING_FOR_CHOPPED,
stats.nextMergeState(accumuloClient, state));
- //
- // // chop it
- // m = TabletColumnFamily.createPrevRowMutation(tablet);
- // ChoppedColumnFamily.CHOPPED_COLUMN.put(m, new Value("junk"));
- // update(accumuloClient, m);
-
stats = scan(state, metaDataStateStore);
assertEquals(MergeState.WAITING_FOR_OFFLINE,
stats.nextMergeState(accumuloClient, state));
