diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/config/RawRecordContainerImpl.java b/warehouse/ingest-core/src/main/java/datawave/ingest/config/RawRecordContainerImpl.java index b1fa5f63ac4..bf9f452a303 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/config/RawRecordContainerImpl.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/config/RawRecordContainerImpl.java @@ -28,8 +28,6 @@ import com.google.common.collect.Multimap; import com.google.protobuf.ByteString; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; import datawave.ingest.data.TypeRegistry; @@ -38,6 +36,8 @@ import datawave.ingest.protobuf.RawRecordContainer.Data; import datawave.marking.AccessExpressionMarkings; import datawave.marking.Markings; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; import datawave.util.CompositeTimestamp; public class RawRecordContainerImpl implements Writable, Configurable, RawRecordContainer { diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/RawRecordContainer.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/RawRecordContainer.java index 1628282835f..dc2a54eb0b1 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/RawRecordContainer.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/RawRecordContainer.java @@ -7,8 +7,8 @@ import org.apache.accumulo.core.security.ColumnVisibility; -import datawave.data.hash.UID; import datawave.marking.Markings; +import datawave.table.hash.UID; import datawave.util.CompositeTimestamp; /** diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/DataTypeOverrideHelper.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/DataTypeOverrideHelper.java index 5e89a746d69..619a3f6f75f 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/DataTypeOverrideHelper.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/config/DataTypeOverrideHelper.java @@ -8,12 +8,12 @@ import org.apache.hadoop.conf.Configuration; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; -import datawave.data.hash.UIDConstants; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; import datawave.ingest.input.reader.event.RecordFilter; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; +import datawave.table.hash.UIDConstants; import datawave.util.StringUtils; /** diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/hash/StringUID.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/hash/StringUID.java index 25b8d3e1d21..81c94c57eda 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/hash/StringUID.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/hash/StringUID.java @@ -2,10 +2,10 @@ import com.google.common.base.Objects; -import datawave.data.hash.HashUID; -import datawave.data.hash.SnowflakeUID; -import datawave.data.hash.UID; -import datawave.data.hash.UIDConstants; +import datawave.table.hash.HashUID; +import datawave.table.hash.SnowflakeUID; +import datawave.table.hash.UID; +import datawave.table.hash.UIDConstants; import datawave.util.StringUtils; /** diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenizationHelper.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenizationHelper.java index de28f1a2a4b..dcbf05c600b 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenizationHelper.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenizationHelper.java @@ -10,9 +10,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import datawave.data.hash.HashUID; -import datawave.data.hash.UID; import datawave.ingest.data.config.DataTypeHelper; +import datawave.table.hash.HashUID; +import datawave.table.hash.UID; import datawave.util.ObjectFactory; public class TokenizationHelper { diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/AbstractEventRecordReader.java b/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/AbstractEventRecordReader.java index b7fd7982c78..d766759ec47 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/AbstractEventRecordReader.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/AbstractEventRecordReader.java @@ -23,8 +23,6 @@ import com.google.common.collect.Sets; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; import datawave.data.normalizer.DateNormalizer; import datawave.ingest.config.IngestConfiguration; import datawave.ingest.config.IngestConfigurationFactory; @@ -36,6 +34,8 @@ import datawave.ingest.data.config.MarkingsHelper; import datawave.policy.IngestPolicyEnforcer; import datawave.policy.Policy; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; public abstract class AbstractEventRecordReader extends RecordReader implements EventRecordReader { diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/event/EventSequenceFileRecordReader.java b/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/event/EventSequenceFileRecordReader.java index 113f52978fb..d02dd809e84 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/event/EventSequenceFileRecordReader.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/input/reader/event/EventSequenceFileRecordReader.java @@ -2,9 +2,9 @@ import org.apache.hadoop.mapreduce.lib.input.SequenceFileRecordReader; -import datawave.data.hash.UID; import datawave.ingest.data.RawDataErrorNames; import datawave.ingest.data.RawRecordContainer; +import datawave.table.hash.UID; /** * Reads Event objects from a sequence file. Users of this class need to be aware that the Event object may not have validated and may contain errors. diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/atom/AtomErrorDataTypeHandler.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/atom/AtomErrorDataTypeHandler.java index 9676e9a8fc2..840a3e7f282 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/atom/AtomErrorDataTypeHandler.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/atom/AtomErrorDataTypeHandler.java @@ -17,7 +17,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.ingest.config.IngestConfigurationFactory; import datawave.ingest.data.RawDataErrorNames; import datawave.ingest.data.RawRecordContainer; @@ -31,6 +30,7 @@ import datawave.ingest.mapreduce.job.writer.ContextWriter; import datawave.marking.MarkingFunctions; import datawave.marking.Markings; +import datawave.table.hash.UID; /** * This class differs from the parent in that when it sees a field name of ERROR it creates a category name using the field name and value. diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorDataTypeHandler.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorDataTypeHandler.java index f50d5592a50..25462f73834 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorDataTypeHandler.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorDataTypeHandler.java @@ -21,8 +21,6 @@ import com.google.common.collect.Multimap; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; import datawave.ingest.config.IngestConfiguration; import datawave.ingest.config.IngestConfigurationFactory; import datawave.ingest.data.RawDataErrorNames; @@ -38,6 +36,8 @@ import datawave.ingest.mapreduce.job.writer.ContextWriter; import datawave.ingest.metadata.RawRecordMetadata; import datawave.marking.MarkingFunctions; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; import datawave.util.TextUtil; import datawave.util.time.DateHelper; diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorShardedDataTypeHandler.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorShardedDataTypeHandler.java index 0dc99ce49d9..331af7fc7f6 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorShardedDataTypeHandler.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/handler/error/ErrorShardedDataTypeHandler.java @@ -25,7 +25,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.ingest.config.IngestConfiguration; import datawave.ingest.config.IngestConfigurationFactory; import datawave.ingest.data.RawDataErrorNames; @@ -45,6 +44,7 @@ import datawave.ingest.mapreduce.job.BulkIngestKey; import datawave.ingest.mapreduce.job.writer.ContextWriter; import datawave.table.constants.ColumnFamilyConstants; +import datawave.table.hash.UID; /** * Handler that take events with processing errors or fatal errors and dumps them into a processing error table. This table will be used for subsequent diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapper.java b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapper.java index 6a86ea589cc..ae69c59ba17 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapper.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapper.java @@ -44,7 +44,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.HashUID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; @@ -62,6 +61,7 @@ import datawave.ingest.mapreduce.partition.MultiTableRangePartitioner; import datawave.ingest.metadata.EventMetadata; import datawave.ingest.protobuf.Uid; +import datawave.table.hash.HashUID; public class ShardReindexMapper extends Mapper { private static final String CLASS_NAME = ShardReindexMapper.class.getName(); diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/table/aggregator/TruncatedIndexConversionIterator.java b/warehouse/ingest-core/src/main/java/datawave/ingest/table/aggregator/TruncatedIndexConversionIterator.java index e0fca16fa53..0030e26213f 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/table/aggregator/TruncatedIndexConversionIterator.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/table/aggregator/TruncatedIndexConversionIterator.java @@ -15,7 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import datawave.ingest.table.aggregator.util.TruncatedIndexKeyParser; +import datawave.table.key.parser.TruncatedIndexKeyParser; /** * This iterator can transform a global index table to a truncated index where the shard number becomes an index in a bitset diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/data/RawRecordContainerImplTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/data/RawRecordContainerImplTest.java index 7201732a8a8..e9f06cd967d 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/data/RawRecordContainerImplTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/data/RawRecordContainerImplTest.java @@ -18,10 +18,10 @@ import org.junit.Before; import org.junit.Test; -import datawave.data.hash.UID; import datawave.ingest.config.IngestConfigurationFactory; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.config.MarkingsHelper; +import datawave.table.hash.UID; public class RawRecordContainerImplTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/EventMapperTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/EventMapperTest.java index de1c289d544..7855c9f0b85 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/EventMapperTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/EventMapperTest.java @@ -30,7 +30,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import datawave.data.hash.UIDConstants; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; import datawave.ingest.data.TypeRegistry; @@ -41,6 +40,7 @@ import datawave.ingest.mapreduce.job.metrics.MetricsConfiguration; import datawave.ingest.mapreduce.job.metrics.TestEventCountMetricsReceiver; import datawave.ingest.mapreduce.job.writer.ContextWriter; +import datawave.table.hash.UIDConstants; public class EventMapperTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/SimpleRawRecord.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/SimpleRawRecord.java index 28ffd3d8078..61d75d12bfb 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/SimpleRawRecord.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/SimpleRawRecord.java @@ -14,14 +14,14 @@ import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.hadoop.io.Writable; -import datawave.data.hash.HashUID; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; import datawave.ingest.data.TypeRegistry; import datawave.marking.AccessExpressionMarkings; import datawave.marking.Markings; +import datawave.table.hash.HashUID; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; import datawave.util.CompositeTimestamp; /** diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeleteModeTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeleteModeTest.java index ecceef27fb5..d6685eb6b02 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeleteModeTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeleteModeTest.java @@ -34,7 +34,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.data.normalizer.DateNormalizer; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; @@ -53,6 +52,7 @@ import datawave.ingest.mapreduce.job.writer.ContextWriter; import datawave.ingest.time.Now; import datawave.metadata.protobuf.EdgeMetadata; +import datawave.table.hash.UID; import datawave.util.time.DateHelper; public class ProtobufEdgeDeleteModeTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeletePreconditionTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeletePreconditionTest.java index 7b8c2868ad4..8f956fd7e59 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeletePreconditionTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDeletePreconditionTest.java @@ -21,7 +21,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; @@ -32,6 +31,7 @@ import datawave.ingest.data.config.ingest.FakeIngestHelper; import datawave.ingest.mapreduce.SimpleDataTypeHandler; import datawave.ingest.mapreduce.job.BulkIngestKey; +import datawave.table.hash.UID; public class ProtobufEdgeDeletePreconditionTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDirectionTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDirectionTest.java index aa2f79c44c4..efff7efb2a1 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDirectionTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgeDirectionTest.java @@ -23,7 +23,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; @@ -34,6 +33,7 @@ import datawave.ingest.data.config.ingest.FakeIngestHelper; import datawave.ingest.mapreduce.SimpleDataTypeHandler; import datawave.ingest.mapreduce.job.BulkIngestKey; +import datawave.table.hash.UID; public class ProtobufEdgeDirectionTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgePreconditionTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgePreconditionTest.java index c1a56a8c13a..0eb9a6e44bd 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgePreconditionTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/edge/ProtobufEdgePreconditionTest.java @@ -25,7 +25,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; @@ -37,6 +36,7 @@ import datawave.ingest.mapreduce.SimpleDataTypeHandler; import datawave.ingest.mapreduce.job.BulkIngestKey; import datawave.ingest.time.Now; +import datawave.table.hash.UID; import datawave.util.time.DateHelper; public class ProtobufEdgePreconditionTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/facet/FacetHandlerTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/facet/FacetHandlerTest.java index 1460df0c460..6482d6253fc 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/facet/FacetHandlerTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/facet/FacetHandlerTest.java @@ -34,7 +34,6 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; @@ -52,6 +51,7 @@ import datawave.ingest.mapreduce.job.writer.AbstractContextWriter; import datawave.ingest.test.StandaloneStatusReporter; import datawave.ingest.test.StandaloneTaskAttemptContext; +import datawave.table.hash.UID; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardIdFactoryTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardIdFactoryTest.java index 925f39000f9..3d0a8db9a11 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardIdFactoryTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardIdFactoryTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import datawave.data.hash.HashUID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.RawRecordContainerImplTest; import datawave.ingest.data.Type; import datawave.ingest.data.TypeRegistry; import datawave.ingest.data.config.ingest.CSVIngestHelper; +import datawave.table.hash.HashUID; import datawave.util.time.DateHelper; class ShardIdFactoryTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardedDataTypeHandlerTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardedDataTypeHandlerTest.java index c9f00e26646..1924a7b054f 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardedDataTypeHandlerTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/shard/ShardedDataTypeHandlerTest.java @@ -23,7 +23,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import datawave.data.hash.HashUID; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; import datawave.ingest.data.Type; @@ -40,6 +39,7 @@ import datawave.policy.IngestPolicyEnforcer; import datawave.query.model.Direction; import datawave.table.constants.TableName; +import datawave.table.hash.HashUID; import datawave.util.CompositeTimestamp; public class ShardedDataTypeHandlerTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/tokenize/ContentIndexingColumnBasedHandlerTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/tokenize/ContentIndexingColumnBasedHandlerTest.java index ad666ad0a53..2f44f8a0998 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/tokenize/ContentIndexingColumnBasedHandlerTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/handler/tokenize/ContentIndexingColumnBasedHandlerTest.java @@ -28,7 +28,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.NumberType; import datawave.ingest.config.RawRecordContainerImpl; @@ -42,6 +41,7 @@ import datawave.ingest.input.reader.EventRecordReader; import datawave.ingest.mapreduce.job.BulkIngestKey; import datawave.policy.IngestPolicyEnforcer; +import datawave.table.hash.UID; public class ContentIndexingColumnBasedHandlerTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/CBMutationOutputFormatterTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/CBMutationOutputFormatterTest.java index 3e6d7d5a093..d6a62a40587 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/CBMutationOutputFormatterTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/CBMutationOutputFormatterTest.java @@ -24,10 +24,10 @@ import org.junit.Test; import datawave.common.test.logging.TestLogCollector; -import datawave.data.hash.UID; import datawave.ingest.data.TypeRegistry; import datawave.ingest.data.config.ingest.AccumuloHelper; import datawave.ingest.mapreduce.handler.shard.ShardedDataTypeHandler; +import datawave.table.hash.UID; public class CBMutationOutputFormatterTest { diff --git a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapperTest.java b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapperTest.java index d573b39b9bf..0a6fd17c513 100644 --- a/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapperTest.java +++ b/warehouse/ingest-core/src/test/java/datawave/ingest/mapreduce/job/reindex/ShardReindexMapperTest.java @@ -61,7 +61,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; -import datawave.data.hash.HashUID; import datawave.data.type.NoOpType; import datawave.ingest.config.RawRecordContainerImpl; import datawave.ingest.data.RawRecordContainer; @@ -77,6 +76,7 @@ import datawave.iterators.FrequencyMetadataAggregator; import datawave.query.iterator.SortedListKeyValueIterator; import datawave.query.model.DateFrequencyMap; +import datawave.table.hash.HashUID; import datawave.util.accumulo.RFileUtil; public class ShardReindexMapperTest extends EasyMockSupport { diff --git a/warehouse/query-core/src/main/java/datawave/core/iterators/DescendentFilterIterator.java b/warehouse/query-core/src/main/java/datawave/core/iterators/DescendentFilterIterator.java index 88a8f0239fe..e30b24bd468 100644 --- a/warehouse/query-core/src/main/java/datawave/core/iterators/DescendentFilterIterator.java +++ b/warehouse/query-core/src/main/java/datawave/core/iterators/DescendentFilterIterator.java @@ -20,7 +20,7 @@ import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; -import datawave.data.hash.UIDConstants; +import datawave.table.hash.UIDConstants; /** *

diff --git a/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorUidIntersector.java b/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorUidIntersector.java index 2c112a4038d..d48ae5c7c6b 100644 --- a/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorUidIntersector.java +++ b/warehouse/query-core/src/main/java/datawave/query/ancestor/AncestorUidIntersector.java @@ -11,12 +11,12 @@ import com.google.common.collect.Sets; -import datawave.data.hash.UIDConstants; import datawave.query.index.lookup.IndexMatch; import datawave.query.index.lookup.IndexMatchType; import datawave.query.index.lookup.UidIntersector; import datawave.query.language.parser.jexl.JexlNodeSet; import datawave.query.util.Tuple2; +import datawave.table.hash.UIDConstants; import datawave.table.util.TLD; /** diff --git a/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java b/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java index 2903dbad09c..638c4b8d2f9 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/AbstractVersionFilter.java @@ -27,12 +27,12 @@ import com.google.gson.Gson; -import datawave.data.hash.UID; import datawave.data.type.NumberType; import datawave.data.type.util.NumericalEncoder; import datawave.query.attributes.Attribute; import datawave.query.attributes.Document; import datawave.query.iterator.SourcedOptions; +import datawave.table.hash.UID; /** * This filter validates events in the shard table based on their association with one or more configured data types and number-normalized "version" fields diff --git a/warehouse/query-core/src/main/java/datawave/query/function/AncestorEquality.java b/warehouse/query-core/src/main/java/datawave/query/function/AncestorEquality.java index b5fd75cd731..f20ab29c217 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/AncestorEquality.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/AncestorEquality.java @@ -1,6 +1,6 @@ package datawave.query.function; -import static datawave.data.hash.UIDConstants.DEFAULT_SEPARATOR; +import static datawave.table.hash.UIDConstants.DEFAULT_SEPARATOR; import org.apache.accumulo.core.data.Key; diff --git a/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java b/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java index e21d78aa7de..c850f47d08f 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/DescendantCountFunction.java @@ -28,11 +28,11 @@ import com.google.common.collect.Lists; -import datawave.data.hash.UID; -import datawave.data.hash.UIDConstants; import datawave.query.Constants; import datawave.query.iterator.QueryOptions; import datawave.query.util.Tuple3; +import datawave.table.hash.UID; +import datawave.table.hash.UIDConstants; /** * Count and output the number of descendant events, immediate child events, or both based on the specified tuple elements, including: diff --git a/warehouse/query-core/src/main/java/datawave/query/function/KeyToDocumentData.java b/warehouse/query-core/src/main/java/datawave/query/function/KeyToDocumentData.java index 5611ba051b0..6117f788490 100644 --- a/warehouse/query-core/src/main/java/datawave/query/function/KeyToDocumentData.java +++ b/warehouse/query-core/src/main/java/datawave/query/function/KeyToDocumentData.java @@ -32,14 +32,14 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import datawave.data.hash.UID; -import datawave.data.hash.UIDConstants; import datawave.query.attributes.Document; import datawave.query.exceptions.DatawaveFatalQueryException; import datawave.query.iterator.QueryOptions; import datawave.query.iterator.aggregation.DocumentData; import datawave.query.predicate.EventDataQueryFilter; import datawave.query.util.Tuple3; +import datawave.table.hash.UID; +import datawave.table.hash.UIDConstants; import datawave.webservice.query.exception.DatawaveErrorCode; import datawave.webservice.query.exception.QueryException; diff --git a/warehouse/query-core/src/main/java/datawave/query/index/lookup/AncestorIndexStream.java b/warehouse/query-core/src/main/java/datawave/query/index/lookup/AncestorIndexStream.java index 2e284936bbe..ac4e7547ee9 100644 --- a/warehouse/query-core/src/main/java/datawave/query/index/lookup/AncestorIndexStream.java +++ b/warehouse/query-core/src/main/java/datawave/query/index/lookup/AncestorIndexStream.java @@ -10,8 +10,8 @@ import org.apache.commons.jexl3.parser.JexlNode; -import datawave.data.hash.UIDConstants; import datawave.query.util.Tuple2; +import datawave.table.hash.UIDConstants; /** * Specialty AncestorIndexStream implementation. Wraps existing IndexStream delegate to prevent returning overlapping ranges from ancestors during expansions diff --git a/warehouse/query-core/src/main/java/datawave/query/tld/TLD.java b/warehouse/query-core/src/main/java/datawave/query/tld/TLD.java index 2185c3ce67c..4be31611610 100644 --- a/warehouse/query-core/src/main/java/datawave/query/tld/TLD.java +++ b/warehouse/query-core/src/main/java/datawave/query/tld/TLD.java @@ -1,8 +1,8 @@ package datawave.query.tld; -import static datawave.data.hash.UIDConstants.DEFAULT_SEPARATOR; import static datawave.query.Constants.MAX_UNICODE_STRING; import static datawave.query.Constants.NULL; +import static datawave.table.hash.UIDConstants.DEFAULT_SEPARATOR; import org.apache.accumulo.core.data.ArrayByteSequence; import org.apache.accumulo.core.data.ByteSequence; diff --git a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldIndexCountQueryTransformer.java b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldIndexCountQueryTransformer.java index 28ee4430bf8..755b2f3ac66 100644 --- a/warehouse/query-core/src/main/java/datawave/query/transformer/FieldIndexCountQueryTransformer.java +++ b/warehouse/query-core/src/main/java/datawave/query/transformer/FieldIndexCountQueryTransformer.java @@ -14,12 +14,12 @@ import datawave.core.query.cachedresults.CacheableLogic; import datawave.core.query.logic.BaseQueryLogic; import datawave.core.query.logic.BaseQueryLogicTransformer; -import datawave.data.hash.UID; import datawave.marking.MarkingFunctions; import datawave.marking.Markings; import datawave.microservice.query.Query; import datawave.query.Constants; import datawave.query.tables.shard.FieldIndexCountQueryLogic.Tuple; +import datawave.table.hash.UID; import datawave.util.TextUtil; import datawave.webservice.query.cachedresults.CacheableQueryRow; import datawave.webservice.query.exception.QueryException; diff --git a/warehouse/query-core/src/test/java/datawave/query/IfThisTestFailsThenHitTermsAreBroken.java b/warehouse/query-core/src/test/java/datawave/query/IfThisTestFailsThenHitTermsAreBroken.java index 9dbba1f1579..635ad2980b3 100644 --- a/warehouse/query-core/src/test/java/datawave/query/IfThisTestFailsThenHitTermsAreBroken.java +++ b/warehouse/query-core/src/test/java/datawave/query/IfThisTestFailsThenHitTermsAreBroken.java @@ -39,7 +39,6 @@ import datawave.core.query.configuration.GenericQueryConfiguration; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.Type; import datawave.helpers.PrintUtility; @@ -55,6 +54,7 @@ import datawave.query.util.MetadataHelperFactory; import datawave.security.util.ScannerHelper; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.test.HitTermAssertions; /** diff --git a/warehouse/query-core/src/test/java/datawave/query/MultiNormalizerIngest.java b/warehouse/query-core/src/test/java/datawave/query/MultiNormalizerIngest.java index 3c870b963e3..a2439c65735 100644 --- a/warehouse/query-core/src/test/java/datawave/query/MultiNormalizerIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/MultiNormalizerIngest.java @@ -18,7 +18,6 @@ import com.google.common.collect.Multimap; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.normalizer.LcNoDiacriticsNormalizer; import datawave.data.normalizer.Normalizer; import datawave.data.normalizer.NumberNormalizer; @@ -26,6 +25,7 @@ import datawave.data.type.NumberType; import datawave.ingest.protobuf.Uid; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.util.time.DateHelper; public class MultiNormalizerIngest { diff --git a/warehouse/query-core/src/test/java/datawave/query/UseOccurrenceToCountInJexlContextTest.java b/warehouse/query-core/src/test/java/datawave/query/UseOccurrenceToCountInJexlContextTest.java index dce747f7b8f..73d0d309105 100644 --- a/warehouse/query-core/src/test/java/datawave/query/UseOccurrenceToCountInJexlContextTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/UseOccurrenceToCountInJexlContextTest.java @@ -37,7 +37,6 @@ import datawave.core.query.configuration.GenericQueryConfiguration; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.Type; import datawave.helpers.PrintUtility; @@ -57,6 +56,7 @@ import datawave.query.util.DateIndexHelperFactory; import datawave.query.util.MetadataHelperFactory; import datawave.table.constants.TableName; +import datawave.table.hash.UID; /** * diff --git a/warehouse/query-core/src/test/java/datawave/query/function/DescendantCountFunctionTest.java b/warehouse/query-core/src/test/java/datawave/query/function/DescendantCountFunctionTest.java index 78f1bf0060d..72e24c4639e 100644 --- a/warehouse/query-core/src/test/java/datawave/query/function/DescendantCountFunctionTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/function/DescendantCountFunctionTest.java @@ -28,9 +28,9 @@ import com.google.common.collect.Lists; -import datawave.data.hash.UID; import datawave.query.iterator.QueryOptions; import datawave.query.util.Tuple3; +import datawave.table.hash.UID; /** * Tests for the {@link DescendantCountFunction} diff --git a/warehouse/query-core/src/test/java/datawave/query/iterator/FieldIndexIntegrationTest.java b/warehouse/query-core/src/test/java/datawave/query/iterator/FieldIndexIntegrationTest.java index 25991dffbe7..0eda3d921a2 100644 --- a/warehouse/query-core/src/test/java/datawave/query/iterator/FieldIndexIntegrationTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/iterator/FieldIndexIntegrationTest.java @@ -32,9 +32,6 @@ import datawave.accumulo.inmemory.InMemoryAccumuloClient; import datawave.accumulo.inmemory.InMemoryInstance; -import datawave.data.hash.HashUID; -import datawave.data.hash.UID; -import datawave.data.hash.UIDBuilder; import datawave.query.attributes.AttributeFactory; import datawave.query.attributes.Document; import datawave.query.data.parsers.EventKey; @@ -44,6 +41,9 @@ import datawave.query.jexl.functions.IdentityAggregator; import datawave.query.tld.TLDFieldIndexAggregator; import datawave.query.util.TypeMetadata; +import datawave.table.hash.HashUID; +import datawave.table.hash.UID; +import datawave.table.hash.UIDBuilder; /** * Integration test for several field index related items diff --git a/warehouse/query-core/src/test/java/datawave/query/jexl/functions/GroupingFiltersIngest.java b/warehouse/query-core/src/test/java/datawave/query/jexl/functions/GroupingFiltersIngest.java index 807dafd3180..0850717fbfc 100644 --- a/warehouse/query-core/src/test/java/datawave/query/jexl/functions/GroupingFiltersIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/jexl/functions/GroupingFiltersIngest.java @@ -14,7 +14,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.NumberType; import datawave.data.type.Type; @@ -22,6 +21,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; public class GroupingFiltersIngest { diff --git a/warehouse/query-core/src/test/java/datawave/query/testframework/BooksDataManager.java b/warehouse/query-core/src/test/java/datawave/query/testframework/BooksDataManager.java index b07763d6a1e..900a8105031 100644 --- a/warehouse/query-core/src/test/java/datawave/query/testframework/BooksDataManager.java +++ b/warehouse/query-core/src/test/java/datawave/query/testframework/BooksDataManager.java @@ -24,8 +24,8 @@ import com.google.common.collect.Multimap; import au.com.bytecode.opencsv.CSVReader; -import datawave.data.hash.UID; import datawave.data.normalizer.Normalizer; +import datawave.table.hash.UID; /** * Creates accumulo data as grouping data. However, that does not limit additional test classes for other purposes. diff --git a/warehouse/query-core/src/test/java/datawave/query/testframework/GroupingAccumuloWriter.java b/warehouse/query-core/src/test/java/datawave/query/testframework/GroupingAccumuloWriter.java index 3c899c3034e..34cf9c608b8 100644 --- a/warehouse/query-core/src/test/java/datawave/query/testframework/GroupingAccumuloWriter.java +++ b/warehouse/query-core/src/test/java/datawave/query/testframework/GroupingAccumuloWriter.java @@ -25,7 +25,6 @@ import com.google.common.collect.Multimap; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.normalizer.LcNoDiacriticsNormalizer; import datawave.data.normalizer.Normalizer; import datawave.data.normalizer.NumberNormalizer; @@ -35,6 +34,7 @@ import datawave.ingest.protobuf.Uid; import datawave.query.QueryTestTableHelper; import datawave.table.constants.TableName; +import datawave.table.hash.UID; /** * Populates Accumulo with data utilizes the Grouping format. diff --git a/warehouse/query-core/src/test/java/datawave/query/util/ColorsIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/ColorsIngest.java index 6bc5bb9ab5c..06a7dc27bad 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/ColorsIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/ColorsIngest.java @@ -18,10 +18,10 @@ import com.google.common.collect.Multimap; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.ingest.protobuf.Uid; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.util.time.DateHelper; /** diff --git a/warehouse/query-core/src/test/java/datawave/query/util/CommonalityTokenTestDataIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/CommonalityTokenTestDataIngest.java index c355ebcf0b7..8ec23803b36 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/CommonalityTokenTestDataIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/CommonalityTokenTestDataIngest.java @@ -14,7 +14,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.NumberListType; import datawave.data.type.NumberType; @@ -24,6 +23,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.util.CompositeTimestamp; /** diff --git a/warehouse/query-core/src/test/java/datawave/query/util/CompositeTestingIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/CompositeTestingIngest.java index 9fbce118251..5b565523a3a 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/CompositeTestingIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/CompositeTestingIngest.java @@ -16,7 +16,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.normalizer.AbstractNormalizer; import datawave.data.type.BaseType; import datawave.data.type.DateType; @@ -30,6 +29,7 @@ import datawave.query.index.day.IndexIngestUtil; import datawave.query.parser.JavaRegexAnalyzer; import datawave.table.constants.TableName; +import datawave.table.hash.UID; public class CompositeTestingIngest { diff --git a/warehouse/query-core/src/test/java/datawave/query/util/IndexFieldHoleDataIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/IndexFieldHoleDataIngest.java index e68484ef2f0..81ad5c3386b 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/IndexFieldHoleDataIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/IndexFieldHoleDataIngest.java @@ -26,7 +26,6 @@ import org.javatuples.Pair; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.BaseType; import datawave.data.type.DateType; import datawave.data.type.GeometryType; @@ -38,6 +37,7 @@ import datawave.ingest.protobuf.Uid; import datawave.query.QueryTestTableHelper; import datawave.table.constants.TableName; +import datawave.table.hash.UID; /** * Test data that contains field index holes. diff --git a/warehouse/query-core/src/test/java/datawave/query/util/LimitFieldsTestingIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/LimitFieldsTestingIngest.java index 653478e05c5..b0f7c2e998c 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/LimitFieldsTestingIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/LimitFieldsTestingIngest.java @@ -14,7 +14,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.DateType; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.Type; @@ -22,6 +21,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; /** * write data in accumulo for testing of the limit.fields function diff --git a/warehouse/query-core/src/test/java/datawave/query/util/ShapesIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/ShapesIngest.java index 50dc7f26d10..02132ce4cfc 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/ShapesIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/ShapesIngest.java @@ -24,7 +24,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.LcNoDiacriticsListType; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.ListType; @@ -32,6 +31,7 @@ import datawave.ingest.protobuf.Uid; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.test.MacTestUtil; /** diff --git a/warehouse/query-core/src/test/java/datawave/query/util/SizesIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/SizesIngest.java index 5c7baca04e1..450f080c39a 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/SizesIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/SizesIngest.java @@ -26,7 +26,6 @@ import com.google.common.collect.Multimap; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.normalizer.LcNoDiacriticsNormalizer; import datawave.data.normalizer.Normalizer; import datawave.data.normalizer.NumberNormalizer; @@ -36,6 +35,7 @@ import datawave.data.type.PointType; import datawave.ingest.protobuf.Uid; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.util.time.DateHelper; /** diff --git a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngest.java index 9626bd51a6b..b5e4cef5243 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngest.java @@ -14,7 +14,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.DateType; import datawave.data.type.LcNoDiacriticsType; import datawave.data.type.NumberType; @@ -23,6 +22,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; public class VisibilityWiseGuysIngest { diff --git a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngestWithModel.java b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngestWithModel.java index bfb0ae1356c..2d42a16ac3b 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngestWithModel.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysIngestWithModel.java @@ -16,7 +16,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.DateType; import datawave.data.type.IpAddressType; import datawave.data.type.LcNoDiacriticsType; @@ -26,6 +25,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; import datawave.test.MacTestUtil; public class VisibilityWiseGuysIngestWithModel { diff --git a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysNoGroupingIngestWithModel.java b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysNoGroupingIngestWithModel.java index 0421ca59abf..dae4892fcce 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysNoGroupingIngestWithModel.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/VisibilityWiseGuysNoGroupingIngestWithModel.java @@ -15,7 +15,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.DateType; import datawave.data.type.IpAddressType; import datawave.data.type.LcNoDiacriticsType; @@ -25,6 +24,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; public class VisibilityWiseGuysNoGroupingIngestWithModel { diff --git a/warehouse/query-core/src/test/java/datawave/query/util/WiseGuysIngest.java b/warehouse/query-core/src/test/java/datawave/query/util/WiseGuysIngest.java index e2630921cfd..67f6fee20ff 100644 --- a/warehouse/query-core/src/test/java/datawave/query/util/WiseGuysIngest.java +++ b/warehouse/query-core/src/test/java/datawave/query/util/WiseGuysIngest.java @@ -21,7 +21,6 @@ import org.apache.hadoop.io.Text; import datawave.data.ColumnFamilyConstants; -import datawave.data.hash.UID; import datawave.data.type.DateType; import datawave.data.type.GeometryType; import datawave.data.type.IpAddressType; @@ -39,6 +38,7 @@ import datawave.query.QueryTestTableHelper; import datawave.query.index.day.IndexIngestUtil; import datawave.table.constants.TableName; +import datawave.table.hash.UID; public class WiseGuysIngest {