This is an automated email from the ASF dual-hosted git repository.
FrankChen021 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 282c9d2f3c0 refactor: replace deprecated DataSegment constructors in
storage extension tests (#20788)
282c9d2f3c0 is described below
commit 282c9d2f3c03c7362cbc6754ebc6c02c2feab4dc
Author: Akshat Lakhera <[email protected]>
AuthorDate: Fri Oct 30 08:06:52 2026 +0530
refactor: replace deprecated DataSegment constructors in storage extension
tests (#20788)
Part of #20525.
Signed-off-by: Akshat Lakhera <[email protected]>
---
.../storage/aliyun/OssDataSegmentMoverTest.java | 88 +++++++++-----------
.../storage/aliyun/OssDataSegmentPusherTest.java | 20 ++---
.../CloudFilesDataSegmentPusherTest.java | 20 ++---
.../storage/azure/AzureDataSegmentPusherTest.java | 37 ++++-----
.../google/GoogleDataSegmentKillerTest.java | 18 ++--
.../google/GoogleDataSegmentPusherTest.java | 19 ++---
.../storage/hdfs/HdfsDataSegmentKillerTest.java | 26 +++---
.../storage/hdfs/HdfsDataSegmentPusherTest.java | 96 +++++++++-------------
.../druid/storage/s3/S3DataSegmentKillerTest.java | 75 +++++++----------
.../druid/storage/s3/S3DataSegmentMoverTest.java | 88 +++++++++-----------
.../druid/storage/s3/S3DataSegmentPusherTest.java | 20 ++---
11 files changed, 218 insertions(+), 289 deletions(-)
diff --git
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
index 6e9a72af280..2f3fafa8cc2 100644
---
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
+++
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentMoverTest.java
@@ -36,6 +36,7 @@ import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.MapUtils;
import org.apache.druid.segment.loading.SegmentLoadingException;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,22 +51,19 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class OssDataSegmentMoverTest
{
- private static final DataSegment SOURCE_SEGMENT = new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "main"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- );
+ private static final DataSegment SOURCE_SEGMENT =
DataSegment.builder(SegmentId.of("test", Intervals.of("2013-01-01/2013-01-02"),
"1", 0))
+
.loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+
"bucket",
+ "main"
+ ))
+
.dimensions(ImmutableList.of("dim1", "dim1"))
+
.metrics(ImmutableList.of("metric1", "metric2"))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
@Test
public void testMove() throws Exception
@@ -137,22 +135,19 @@ public class OssDataSegmentMoverTest
{
MockClient mockOssClient = new MockClient();
OssDataSegmentMover mover = new
OssDataSegmentMover(Suppliers.ofInstance(mockOssClient), new
OssStorageConfig());
- mover.move(new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "DOES NOT EXIST"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey"));
+ mover.move(DataSegment.builder(SegmentId.of("test",
Intervals.of("2013-01-01/2013-01-02"), "1", 0))
+ .loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+ "bucket",
+ "DOES NOT EXIST"
+ ))
+ .dimensions(ImmutableList.of("dim1", "dim1"))
+ .metrics(ImmutableList.of("metric1", "metric2"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(1)
+ .build(), ImmutableMap.of("bucket", "DOES NOT
EXIST", "baseKey", "baseKey"));
}
@Test
@@ -161,22 +156,19 @@ public class OssDataSegmentMoverTest
assertThrows(SegmentLoadingException.class, () -> {
MockClient client = new MockClient();
OssDataSegmentMover mover = new
OssDataSegmentMover(Suppliers.ofInstance(client), new OssStorageConfig());
- mover.move(new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "DOES NOT EXIST"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey2"));
+ mover.move(DataSegment.builder(SegmentId.of("test",
Intervals.of("2013-01-01/2013-01-02"), "1", 0))
+ .loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+ "bucket",
+ "DOES NOT EXIST"
+ ))
+ .dimensions(ImmutableList.of("dim1", "dim1"))
+ .metrics(ImmutableList.of("metric1", "metric2"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(1)
+ .build(), ImmutableMap.of("bucket", "DOES NOT
EXIST", "baseKey", "baseKey2"));
});
}
diff --git
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentPusherTest.java
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentPusherTest.java
index 1ef3c4949b5..07cd5cf9543 100644
---
a/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentPusherTest.java
+++
b/extensions-contrib/aliyun-oss-extensions/src/test/java/org/apache/druid/storage/aliyun/OssDataSegmentPusherTest.java
@@ -24,6 +24,7 @@ import com.aliyun.oss.model.PutObjectResult;
import com.google.common.io.Files;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.easymock.EasyMock;
import org.junit.jupiter.api.Assertions;
@@ -96,17 +97,14 @@ public class OssDataSegmentPusherTest
Files.write(data, tmp);
final long size = data.length;
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
DataSegment segment = pusher.push(tempFolder, segmentToPush,
useUniquePath);
diff --git
a/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java
b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java
index 9fee88cfd4c..3a803c35a61 100644
---
a/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java
+++
b/extensions-contrib/cloudfiles-extensions/src/test/java/org/apache/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java
@@ -23,6 +23,7 @@ import com.google.common.io.Files;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.jclouds.openstack.swift.v1.features.ObjectApi;
import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi;
@@ -71,17 +72,14 @@ public class CloudFilesDataSegmentPusherTest
Files.write(data, tmp);
final long size = data.length;
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
DataSegment segment = pusher.push(tempFolder, segmentToPush, false);
diff --git
a/extensions-core/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java
b/extensions-core/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java
index d8a32f634e1..93b9f40915c 100644
---
a/extensions-core/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java
+++
b/extensions-core/azure-extensions/src/test/java/org/apache/druid/storage/azure/AzureDataSegmentPusherTest.java
@@ -33,6 +33,7 @@ import org.apache.druid.segment.IndexBuilder;
import org.apache.druid.segment.IndexIO;
import org.apache.druid.segment.loading.DeepStorageSegmentConfig;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.LinearShardSpec;
import org.easymock.Capture;
import org.easymock.EasyMock;
@@ -61,17 +62,12 @@ public class AzureDataSegmentPusherTest extends
EasyMockSupport
private static final String CONTAINER_NAME = "container";
private static final String PREFIX = "prefix";
private static final String BLOB_PATH = " Россия 한국
中国!?/2015-04-12T00:00:00.000Z_2015-04-13T00:00:00.000Z/1/0/index.zip";
- private static final DataSegment DATA_SEGMENT = new DataSegment(
- " Россия 한국 中国!?",
- Intervals.of("2015-04-12/2015-04-13"),
- "1",
- ImmutableMap.of("containerName", CONTAINER_NAME, "blobPath", BLOB_PATH),
- null,
- null,
- new LinearShardSpec(0),
- 0,
- 1
- );
+ private static final DataSegment DATA_SEGMENT =
DataSegment.builder(SegmentId.of(" Россия 한국 中国!?",
Intervals.of("2015-04-12/2015-04-13"), "1", 0))
+
.loadSpec(ImmutableMap.of("containerName", CONTAINER_NAME, "blobPath",
BLOB_PATH))
+ .shardSpec(new
LinearShardSpec(0))
+ .binaryVersion(0)
+ .size(1)
+ .build();
private static final DeepStorageSegmentConfig ZIP_CONFIG = new
DeepStorageSegmentConfig(true);
private static final DeepStorageSegmentConfig NO_ZIP_CONFIG = new
DeepStorageSegmentConfig(false);
private static final byte[] DATA = new byte[]{0x0, 0x0, 0x0, 0x1};
@@ -81,17 +77,14 @@ public class AzureDataSegmentPusherTest extends
EasyMockSupport
private static final String NON_UNIQUE_WITH_PREFIX_MATCHER = PREFIX + "/" +
"foo/20150101T000000\\.000Z_20160101T000000\\.000Z/0/0/index\\.zip";
private static final int MAX_TRIES = 3;
- private static final DataSegment SEGMENT_TO_PUSH = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- new LinearShardSpec(0),
- 0,
- DATA.length
- );
+ private static final DataSegment SEGMENT_TO_PUSH =
DataSegment.builder(SegmentId.of("foo", Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new
HashMap<>())
+
.dimensions(new ArrayList<>())
+ .metrics(new
ArrayList<>())
+ .shardSpec(new
LinearShardSpec(0))
+
.binaryVersion(0)
+
.size(DATA.length)
+ .build();
private AzureStorage azureStorage;
private AzureAccountConfig azureAccountConfig;
diff --git
a/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java
index 41a55af1ac6..6909246eb02 100644
---
a/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java
+++
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentKillerTest.java
@@ -28,6 +28,7 @@ import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.segment.loading.DataSegmentKiller;
import org.apache.druid.segment.loading.SegmentLoadingException;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
@@ -54,17 +55,12 @@ public class GoogleDataSegmentKillerTest extends
EasyMockSupport
private static final Exception NON_RECOVERABLE_EXCEPTION = new
StorageException(404, "non-recoverable");
- private static final DataSegment DATA_SEGMENT = new DataSegment(
- "test",
- Intervals.of("2015-04-12/2015-04-13"),
- "1",
- ImmutableMap.of("bucket", BUCKET, "path", INDEX_PATH),
- null,
- null,
- NoneShardSpec.instance(),
- 0,
- 1
- );
+ private static final DataSegment DATA_SEGMENT =
DataSegment.builder(SegmentId.of("test", Intervals.of("2015-04-12/2015-04-13"),
"1", 0))
+
.loadSpec(ImmutableMap.of("bucket", BUCKET, "path", INDEX_PATH))
+
.shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(1)
+ .build();
private GoogleStorage storage;
private GoogleAccountConfig accountConfig;
diff --git
a/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java
index 8d9e7af6e69..781eceba432 100644
---
a/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java
+++
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleDataSegmentPusherTest.java
@@ -76,17 +76,14 @@ public class GoogleDataSegmentPusherTest extends
EasyMockSupport
Files.write(data, tmp);
final long size = data.length;
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
GoogleDataSegmentPusher pusher =
createMockBuilder(GoogleDataSegmentPusher.class)
.withConstructor(storage, googleAccountConfig, INPUT_DATA_CONFIG,
ZIP_CONFIG)
diff --git
a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java
b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java
index 8cfb2239815..108be4830f3 100644
---
a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java
+++
b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentKillerTest.java
@@ -26,6 +26,7 @@ import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.segment.loading.SegmentLoadingException;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -473,19 +474,16 @@ public class HdfsDataSegmentKillerTest
private DataSegment getSegmentWithPath(String path)
{
- return new DataSegment(
- "dataSource",
- Intervals.of("2000/3000"),
- "ver",
- ImmutableMap.of(
- "type", "hdfs",
- "path", path
- ),
- ImmutableList.of("product"),
- ImmutableList.of("visited_sum", "unique_hosts"),
- NoneShardSpec.instance(),
- 9,
- 12334
- );
+ return DataSegment.builder(SegmentId.of("dataSource",
Intervals.of("2000/3000"), "ver", 0))
+ .loadSpec(ImmutableMap.of(
+ "type", "hdfs",
+ "path", path
+ ))
+ .dimensions(ImmutableList.of("product"))
+ .metrics(ImmutableList.of("visited_sum", "unique_hosts"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(9)
+ .size(12334)
+ .build();
}
}
diff --git
a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
index edbe31c72fc..877b3aa695e 100644
---
a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
+++
b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
@@ -38,6 +38,7 @@ import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.testing.TemporaryFolderExtension;
import org.apache.druid.timeline.DataSegment;
import org.apache.druid.timeline.DataSegment.PruneSpecsHolder;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.apache.druid.timeline.partition.NumberedShardSpec;
import org.apache.druid.utils.CompressionUtils;
@@ -137,17 +138,14 @@ public class HdfsDataSegmentPusherTest
config.setStorageDirectory(StringUtils.format("file://%s",
storageDirectory.getAbsolutePath()));
HdfsDataSegmentPusher pusher = new HdfsDataSegmentPusher(config, conf);
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
DataSegment segment = pusher.push(segmentDir, segmentToPush, true);
@@ -178,17 +176,14 @@ public class HdfsDataSegmentPusherTest
config.setStorageDirectory(StringUtils.format("file://%s",
storageDirectory.getAbsolutePath()));
HdfsDataSegmentPusher pusher = new HdfsDataSegmentPusher(config, conf);
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
final String storageDirSuffix =
"shuffle-data/index_parallel_session_analysis_test_bkdhhedd_2023-09-08T03:18:21.121Z/2023-08-29T16:00:00.000Z/2023-08-29T17:00:00.000Z";
DataSegment segment = pusher.pushToPath(segmentDir, segmentToPush,
storageDirSuffix);
@@ -225,17 +220,14 @@ public class HdfsDataSegmentPusherTest
HdfsDataSegmentPusher pusher = new HdfsDataSegmentPusher(config, conf);
for (int i = 0; i < numberOfSegments; i++) {
- segments[i] = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- new NumberedShardSpec(i, i),
- 0,
- size
- );
+ segments[i] = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", i))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(new NumberedShardSpec(i, i))
+ .binaryVersion(0)
+ .size(size)
+ .build();
}
for (int i = 0; i < numberOfSegments; i++) {
@@ -322,17 +314,14 @@ public class HdfsDataSegmentPusherTest
);
HdfsDataSegmentPusher pusher = new HdfsDataSegmentPusher(config, conf);
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
DataSegment segment = pusher.push(segmentDir, segmentToPush, false);
@@ -425,17 +414,14 @@ public class HdfsDataSegmentPusherTest
Interval interval = Intervals.of("2011-10-01/2011-10-02");
ImmutableMap<String, Object> loadSpec = ImmutableMap.of("something",
"or_other");
- DataSegment segment = new DataSegment(
- "something",
- interval,
- "brand:new:version",
- loadSpec,
- Arrays.asList("dim1", "dim2"),
- Arrays.asList("met1", "met2"),
- NoneShardSpec.instance(),
- null,
- 1
- );
+ DataSegment segment = DataSegment.builder(SegmentId.of("something",
interval, "brand:new:version", 0))
+ .loadSpec(loadSpec)
+ .dimensions(Arrays.asList("dim1", "dim2"))
+ .metrics(Arrays.asList("met1", "met2"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(null)
+ .size(1)
+ .build();
String storageDir = hdfsDataSegmentPusher.getStorageDir(segment, false);
Assertions.assertEquals("something/20111001T000000.000Z_20111002T000000.000Z/brand_new_version",
storageDir);
diff --git
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentKillerTest.java
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentKillerTest.java
index 6f3ebdd8007..6e041b8c0e5 100644
---
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentKillerTest.java
+++
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentKillerTest.java
@@ -27,6 +27,7 @@ import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.segment.loading.SegmentLoadingException;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.easymock.EasyMock;
import org.easymock.EasyMockExtension;
@@ -70,53 +71,33 @@ public class S3DataSegmentKillerTest extends EasyMockSupport
private static final Exception RECOVERABLE_EXCEPTION =
SdkClientException.builder().cause(new IOException()).build();
private static final Exception NON_RECOVERABLE_EXCEPTION =
SdkClientException.builder().cause(new NullPointerException()).build();
- private static final DataSegment DATA_SEGMENT_1 = new DataSegment(
- "test",
- Intervals.of("2015-04-12/2015-04-13"),
- "1",
- ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_1_PATH),
- null,
- null,
- NoneShardSpec.instance(),
- 0,
- 1
- );
-
- private static final DataSegment DATA_SEGMENT_2 = new DataSegment(
- "test",
- Intervals.of("2015-04-13/2015-04-14"),
- "1",
- ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_2_PATH),
- null,
- null,
- NoneShardSpec.instance(),
- 0,
- 1
- );
-
- private static final DataSegment DATA_SEGMENT_1_NO_ZIP = new DataSegment(
- "test",
- Intervals.of("2015-04-12/2015-04-13"),
- "1",
- ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_1 + "/"),
- null,
- null,
- NoneShardSpec.instance(),
- 0,
- 1
- );
-
- private static final DataSegment DATA_SEGMENT_2_NO_ZIP = new DataSegment(
- "test",
- Intervals.of("2015-04-13/2015-04-14"),
- "1",
- ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_2 + "/"),
- null,
- null,
- NoneShardSpec.instance(),
- 0,
- 1
- );
+ private static final DataSegment DATA_SEGMENT_1 =
DataSegment.builder(SegmentId.of("test", Intervals.of("2015-04-12/2015-04-13"),
"1", 0))
+
.loadSpec(ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_1_PATH))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
+
+ private static final DataSegment DATA_SEGMENT_2 =
DataSegment.builder(SegmentId.of("test", Intervals.of("2015-04-13/2015-04-14"),
"1", 0))
+
.loadSpec(ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_2_PATH))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
+
+ private static final DataSegment DATA_SEGMENT_1_NO_ZIP =
DataSegment.builder(SegmentId.of("test", Intervals.of("2015-04-12/2015-04-13"),
"1", 0))
+
.loadSpec(ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_1 + "/"))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
+
+ private static final DataSegment DATA_SEGMENT_2_NO_ZIP =
DataSegment.builder(SegmentId.of("test", Intervals.of("2015-04-13/2015-04-14"),
"1", 0))
+
.loadSpec(ImmutableMap.of("bucket", TEST_BUCKET, "key", KEY_2 + "/"))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
@Mock
private ServerSideEncryptingAmazonS3 s3Client;
diff --git
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java
index af37354bbda..a1fd3deb4ce 100644
---
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java
+++
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentMoverTest.java
@@ -26,6 +26,7 @@ import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.MapUtils;
import org.apache.druid.segment.loading.SegmentLoadingException;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -57,22 +58,19 @@ import java.util.Set;
public class S3DataSegmentMoverTest
{
- private static final DataSegment SOURCE_SEGMENT = new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "main"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- );
+ private static final DataSegment SOURCE_SEGMENT =
DataSegment.builder(SegmentId.of("test", Intervals.of("2013-01-01/2013-01-02"),
"1", 0))
+
.loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+
"bucket",
+ "main"
+ ))
+
.dimensions(ImmutableList.of("dim1", "dim1"))
+
.metrics(ImmutableList.of("metric1", "metric2"))
+
.shardSpec(NoneShardSpec.instance())
+
.binaryVersion(0)
+ .size(1)
+ .build();
@Test
public void testMove() throws Exception
@@ -196,22 +194,19 @@ public class S3DataSegmentMoverTest
Suppliers.ofInstance(mockS3Client),
new S3DataSegmentPusherConfig()
);
- mover.move(new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "DOES NOT EXIST"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey"));
+ mover.move(DataSegment.builder(SegmentId.of("test",
Intervals.of("2013-01-01/2013-01-02"), "1", 0))
+ .loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+ "bucket",
+ "DOES NOT EXIST"
+ ))
+ .dimensions(ImmutableList.of("dim1", "dim1"))
+ .metrics(ImmutableList.of("metric1", "metric2"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(1)
+ .build(), ImmutableMap.of("bucket", "DOES NOT
EXIST", "baseKey", "baseKey"));
}
@Test
@@ -224,22 +219,19 @@ public class S3DataSegmentMoverTest
);
Assertions.assertThrows(
SegmentLoadingException.class,
- () -> mover.move(new DataSegment(
- "test",
- Intervals.of("2013-01-01/2013-01-02"),
- "1",
- ImmutableMap.of(
- "key",
-
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
- "bucket",
- "DOES NOT EXIST"
- ),
- ImmutableList.of("dim1", "dim1"),
- ImmutableList.of("metric1", "metric2"),
- NoneShardSpec.instance(),
- 0,
- 1
- ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey2"))
+ () -> mover.move(DataSegment.builder(SegmentId.of("test",
Intervals.of("2013-01-01/2013-01-02"), "1", 0))
+ .loadSpec(ImmutableMap.of(
+ "key",
+
"baseKey/test/2013-01-01T00:00:00.000Z_2013-01-02T00:00:00.000Z/1/0/index.zip",
+ "bucket",
+ "DOES NOT EXIST"
+ ))
+ .dimensions(ImmutableList.of("dim1",
"dim1"))
+ .metrics(ImmutableList.of("metric1",
"metric2"))
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(1)
+ .build(), ImmutableMap.of("bucket", "DOES
NOT EXIST", "baseKey", "baseKey2"))
);
}
diff --git
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java
index c92f28c40f0..47ed60fefd0 100644
---
a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java
+++
b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/S3DataSegmentPusherTest.java
@@ -32,6 +32,7 @@ import org.apache.druid.segment.IndexBuilder;
import org.apache.druid.segment.IndexIO;
import org.apache.druid.segment.loading.DeepStorageSegmentConfig;
import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
import org.apache.druid.timeline.partition.NoneShardSpec;
import org.easymock.Capture;
import org.easymock.CaptureType;
@@ -428,17 +429,14 @@ public class S3DataSegmentPusherTest
{
S3DataSegmentPusher pusher = new S3DataSegmentPusher(s3Client, config, new
DeepStorageSegmentConfig(zip));
- DataSegment segmentToPush = new DataSegment(
- "foo",
- Intervals.of("2015/2016"),
- "0",
- new HashMap<>(),
- new ArrayList<>(),
- new ArrayList<>(),
- NoneShardSpec.instance(),
- 0,
- size
- );
+ DataSegment segmentToPush = DataSegment.builder(SegmentId.of("foo",
Intervals.of("2015/2016"), "0", 0))
+ .loadSpec(new HashMap<>())
+ .dimensions(new ArrayList<>())
+ .metrics(new ArrayList<>())
+ .shardSpec(NoneShardSpec.instance())
+ .binaryVersion(0)
+ .size(size)
+ .build();
DataSegment segment = pusher.push(segmentDir, segmentToPush,
useUniquePath);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
