From 8c54934f8b58ce7d3afc03c0f8b0aab5fd89e745 Mon Sep 17 00:00:00 2001 From: Dave Marion Date: Wed, 8 Jan 2025 14:56:47 -0500 Subject: [PATCH] Removed escaping from quotes in ext comp metadata file references (#5237) Moved CompactionMetadata class so that internal object that contains path and range for the file could be reused. Closes #5060 --- .../{schema => }/CompactionMetadata.java | 34 +++++++++++-------- .../core/metadata/StoredTabletFile.java | 21 +++++++++++- .../accumulo/core/metadata/schema/Ample.java | 1 + .../core/metadata/schema/TabletMetadata.java | 1 + .../schema/TabletMetadataBuilder.java | 1 + .../metadata/schema/TabletMutatorBase.java | 1 + .../metadata/schema/TabletMetadataTest.java | 1 + .../iterators/DisjointCompactionIterator.java | 2 +- .../coordinator/CompactionCoordinator.java | 2 +- .../coordinator/commit/CommitCompaction.java | 2 +- .../commit/CompactionCommitData.java | 2 +- .../compaction/CompactionCoordinatorTest.java | 2 +- .../commit/CommitCompactionTest.java | 2 +- .../tableOps/merge/MergeTabletsTest.java | 2 +- .../tableOps/split/UpdateTabletsTest.java | 2 +- .../apache/accumulo/test/OfflineTableIT.java | 2 +- .../compaction/ExternalCompaction_1_IT.java | 2 +- .../functional/AmpleConditionalWriterIT.java | 2 +- .../accumulo/test/functional/MergeIT.java | 2 +- 19 files changed, 56 insertions(+), 28 deletions(-) rename core/src/main/java/org/apache/accumulo/core/metadata/{schema => }/CompactionMetadata.java (77%) diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/CompactionMetadata.java similarity index 77% rename from core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java rename to core/src/main/java/org/apache/accumulo/core/metadata/CompactionMetadata.java index 81c15d662c5..491bad70187 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/CompactionMetadata.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/CompactionMetadata.java @@ -16,24 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.core.metadata.schema; +package org.apache.accumulo.core.metadata; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static org.apache.accumulo.core.util.LazySingletons.GSON; import java.util.List; import java.util.Objects; import java.util.Set; import org.apache.accumulo.core.fate.FateId; -import org.apache.accumulo.core.metadata.ReferencedTabletFile; -import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.core.metadata.StoredTabletFile.TabletFileCqMetadataGson; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.spi.compaction.CompactorGroupId; +import org.apache.accumulo.core.util.json.ByteArrayToBase64TypeAdapter; + +import com.google.gson.Gson; public class CompactionMetadata { + private static final Gson gson = ByteArrayToBase64TypeAdapter.createBase64Gson(); + private final Set jobFiles; private final ReferencedTabletFile compactTmpName; private final String compactorId; @@ -96,8 +99,8 @@ public FateId getFateId() { // This class is used to serialize and deserialize this class using GSon. Any changes to this // class must consider persisted data. private static class GSonData { - List inputs; - String tmp; + List inputs; + TabletFileCqMetadataGson tmp; String compactor; String kind; String groupId; @@ -108,25 +111,26 @@ private static class GSonData { public String toJson() { GSonData jData = new GSonData(); - - jData.inputs = jobFiles.stream().map(StoredTabletFile::getMetadata).collect(toList()); - jData.tmp = compactTmpName.insert().getMetadata(); + jData.inputs = + jobFiles.stream().map(stf -> new TabletFileCqMetadataGson(stf)).collect(toList()); + jData.tmp = new TabletFileCqMetadataGson(compactTmpName); jData.compactor = compactorId; jData.kind = kind.name(); jData.groupId = cgid.toString(); jData.priority = priority; jData.propDels = propagateDeletes; jData.fateId = fateId == null ? null : fateId.canonical(); - return GSON.get().toJson(jData); + return gson.toJson(jData); } public static CompactionMetadata fromJson(String json) { - GSonData jData = GSON.get().fromJson(json, GSonData.class); + GSonData jData = gson.fromJson(json, GSonData.class); - return new CompactionMetadata(jData.inputs.stream().map(StoredTabletFile::new).collect(toSet()), - StoredTabletFile.of(jData.tmp).getTabletFile(), jData.compactor, - CompactionKind.valueOf(jData.kind), jData.priority, CompactorGroupId.of(jData.groupId), - jData.propDels, jData.fateId == null ? null : FateId.from(jData.fateId)); + return new CompactionMetadata( + jData.inputs.stream().map(TabletFileCqMetadataGson::toStoredTabletFile).collect(toSet()), + jData.tmp.toReferencedTabletFile(), jData.compactor, CompactionKind.valueOf(jData.kind), + jData.priority, CompactorGroupId.of(jData.groupId), jData.propDels, + jData.fateId == null ? null : FateId.from(jData.fateId)); } @Override 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 0f66759ca26..d8f575d041c 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 @@ -291,9 +291,28 @@ public TabletFileCq(Path path, Range range) { } } - private static class TabletFileCqMetadataGson { + static class TabletFileCqMetadataGson { private String path; private byte[] startRow; private byte[] endRow; + + TabletFileCqMetadataGson() {} + + TabletFileCqMetadataGson(AbstractTabletFile atf) { + path = Objects.requireNonNull(atf.path.toString()); + startRow = encodeRow(atf.range.getStartKey()); + endRow = encodeRow(atf.range.getEndKey()); + } + + ReferencedTabletFile toReferencedTabletFile() { + return new ReferencedTabletFile(new Path(URI.create(path)), + new Range(decodeRow(startRow), true, decodeRow(endRow), false)); + } + + StoredTabletFile toStoredTabletFile() { + return StoredTabletFile.of(new Path(URI.create(path)), + new Range(decodeRow(startRow), true, decodeRow(endRow), false)); + } } + } diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java index 367ee6fe64a..2b17888ef88 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java @@ -37,6 +37,7 @@ import org.apache.accumulo.core.gc.GcCandidate; import org.apache.accumulo.core.gc.ReferenceFile; import org.apache.accumulo.core.metadata.AccumuloTable; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.ScanServerRefStore; import org.apache.accumulo.core.metadata.StoredTabletFile; diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java index 795ebfafed4..a6885f8fd6f 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java @@ -55,6 +55,7 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath; import org.apache.accumulo.core.metadata.AccumuloTable; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.SuspendingTServer; import org.apache.accumulo.core.metadata.TServerInstance; diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java index 44f1915e0ea..b57c09b15b9 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java @@ -53,6 +53,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.TServerInstance; diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java index 6052c73a799..0bbc6dc76e0 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java @@ -31,6 +31,7 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.lock.ServiceLock; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.SuspendingTServer; diff --git a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java index 9f4ba14def1..cb1f927464a 100644 --- a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java +++ b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java @@ -68,6 +68,7 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.SuspendingTServer; diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/iterators/DisjointCompactionIterator.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/iterators/DisjointCompactionIterator.java index fb8ba8c82ac..798f9965ebc 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/metadata/iterators/DisjointCompactionIterator.java +++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/iterators/DisjointCompactionIterator.java @@ -34,8 +34,8 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.StoredTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ExternalCompactionColumnFamily; import org.apache.accumulo.server.metadata.ConditionalTabletMutatorImpl; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java index e3bec68c82e..670ba3a2b25 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java @@ -90,12 +90,12 @@ import org.apache.accumulo.core.logging.TabletLogger; import org.apache.accumulo.core.manager.state.tables.TableState; import org.apache.accumulo.core.metadata.CompactableFileImpl; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.schema.Ample; import org.apache.accumulo.core.metadata.schema.Ample.DataLevel; import org.apache.accumulo.core.metadata.schema.Ample.RejectionHandler; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java index 29e626d9540..b5115c02528 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java @@ -36,10 +36,10 @@ import org.apache.accumulo.core.fate.Repo; import org.apache.accumulo.core.logging.TabletLogger; import org.apache.accumulo.core.metadata.AbstractTabletFile; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.SelectedFiles; diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java index 0e7587d6336..fbee0d146cf 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CompactionCommitData.java @@ -25,8 +25,8 @@ import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.StoredTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats; diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java index 931a0b6e7aa..06615567b3e 100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java @@ -65,9 +65,9 @@ import org.apache.accumulo.core.iteratorsImpl.system.SystemIteratorUtil; import org.apache.accumulo.core.manager.state.tables.TableState; import org.apache.accumulo.core.metadata.CompactableFileImpl; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.SelectedFiles; diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompactionTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompactionTest.java index 4791b967a62..58b2f7d7ac6 100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompactionTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompactionTest.java @@ -34,9 +34,9 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.SelectedFiles; diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java index 76a475105e6..03abc84e669 100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java @@ -64,11 +64,11 @@ import org.apache.accumulo.core.fate.FateInstanceType; import org.apache.accumulo.core.gc.ReferenceFile; import org.apache.accumulo.core.lock.ServiceLock; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.SuspendingTServer; import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.MetadataTime; diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java index a317f8375a9..233215b07ac 100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java @@ -39,12 +39,12 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; import org.apache.accumulo.core.lock.ServiceLock; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.SuspendingTServer; import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.MetadataTime; diff --git a/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java index 9cdc2e37770..d2c3a2888c5 100644 --- a/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java @@ -40,9 +40,9 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.schema.Ample.TabletsMutator; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.TabletOperationId; import org.apache.accumulo.core.metadata.schema.TabletOperationType; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java index 3d6a0e3dba3..bbe6939988d 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java @@ -88,8 +88,8 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.metadata.AccumuloTable; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.spi.compaction.CompactionKind; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java index f594f7b9ec7..fe05cb61bd8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java @@ -78,6 +78,7 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; import org.apache.accumulo.core.metadata.AccumuloTable; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.metadata.StoredTabletFile; @@ -85,7 +86,6 @@ import org.apache.accumulo.core.metadata.TServerInstance; import org.apache.accumulo.core.metadata.schema.Ample; import org.apache.accumulo.core.metadata.schema.Ample.ConditionalResult.Status; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.MetadataTime; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java index 765e0442327..363b6ff2587 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeIT.java @@ -62,9 +62,9 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateInstanceType; import org.apache.accumulo.core.metadata.AccumuloTable; +import org.apache.accumulo.core.metadata.CompactionMetadata; import org.apache.accumulo.core.metadata.ReferencedTabletFile; import org.apache.accumulo.core.metadata.StoredTabletFile; -import org.apache.accumulo.core.metadata.schema.CompactionMetadata; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;