You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/11/27 23:13:40 UTC
[GitHub] fjy closed pull request #6669: Remove duplicate DataSegmentTest
(fixes #6064)
fjy closed pull request #6669: Remove duplicate DataSegmentTest (fixes #6064)
URL: https://github.com/apache/incubator-druid/pull/6669
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
index 6d2b22e68f1..b080afc5aa5 100644
--- a/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
+++ b/core/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
@@ -51,7 +51,7 @@
public class DataSegmentTest
{
private static final ObjectMapper mapper = new TestObjectMapper();
- private static final int TEST_VERSION = 0x7;
+ private static final int TEST_VERSION = 0x9;
private static ShardSpec getShardSpec(final int partitionNum)
{
diff --git a/server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
deleted file mode 100644
index 6c9c88fcd6c..00000000000
--- a/server/src/test/java/org/apache/druid/timeline/DataSegmentTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.timeline;
-
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.apache.druid.java.util.common.DateTimes;
-import org.apache.druid.java.util.common.Intervals;
-import org.apache.druid.java.util.common.jackson.JacksonUtils;
-import org.apache.druid.segment.IndexIO;
-import org.apache.druid.timeline.partition.NoneShardSpec;
-import org.apache.druid.timeline.partition.SingleDimensionShardSpec;
-import org.joda.time.Interval;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- */
-public class DataSegmentTest
-{
- final ObjectMapper mapper = new DefaultObjectMapper();
-
- @Before
- public void setUp()
- {
- InjectableValues.Std injectableValues = new InjectableValues.Std();
- injectableValues.addValue(DataSegment.PruneLoadSpecHolder.class, DataSegment.PruneLoadSpecHolder.DEFAULT);
- mapper.setInjectableValues(injectableValues);
- }
-
- @Test
- public void testV1Serialization() throws Exception
- {
-
- final Interval interval = Intervals.of("2011-10-01/2011-10-02");
- final ImmutableMap<String, Object> loadSpec = ImmutableMap.of("something", "or_other");
-
- DataSegment segment = new DataSegment(
- "something",
- interval,
- "1",
- loadSpec,
- Arrays.asList("dim1", "dim2"),
- Arrays.asList("met1", "met2"),
- NoneShardSpec.instance(),
- IndexIO.CURRENT_VERSION_ID,
- 1
- );
-
- final Map<String, Object> objectMap = mapper.readValue(
- mapper.writeValueAsString(segment),
- JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT
- );
-
- Assert.assertEquals(10, objectMap.size());
- Assert.assertEquals("something", objectMap.get("dataSource"));
- Assert.assertEquals(interval.toString(), objectMap.get("interval"));
- Assert.assertEquals("1", objectMap.get("version"));
- Assert.assertEquals(loadSpec, objectMap.get("loadSpec"));
- Assert.assertEquals("dim1,dim2", objectMap.get("dimensions"));
- Assert.assertEquals("met1,met2", objectMap.get("metrics"));
- Assert.assertEquals(ImmutableMap.of("type", "none"), objectMap.get("shardSpec"));
- Assert.assertEquals(IndexIO.CURRENT_VERSION_ID, objectMap.get("binaryVersion"));
- Assert.assertEquals(1, objectMap.get("size"));
-
- DataSegment deserializedSegment = mapper.readValue(mapper.writeValueAsString(segment), DataSegment.class);
-
- Assert.assertEquals(segment.getDataSource(), deserializedSegment.getDataSource());
- Assert.assertEquals(segment.getInterval(), deserializedSegment.getInterval());
- Assert.assertEquals(segment.getVersion(), deserializedSegment.getVersion());
- Assert.assertEquals(segment.getLoadSpec(), deserializedSegment.getLoadSpec());
- Assert.assertEquals(segment.getDimensions(), deserializedSegment.getDimensions());
- Assert.assertEquals(segment.getMetrics(), deserializedSegment.getMetrics());
- Assert.assertEquals(segment.getShardSpec(), deserializedSegment.getShardSpec());
- Assert.assertEquals(segment.getSize(), deserializedSegment.getSize());
- Assert.assertEquals(segment.getIdentifier(), deserializedSegment.getIdentifier());
-
- deserializedSegment = mapper.readValue(mapper.writeValueAsString(segment), DataSegment.class);
- Assert.assertEquals(0, segment.compareTo(deserializedSegment));
-
- deserializedSegment = mapper.readValue(mapper.writeValueAsString(segment), DataSegment.class);
- Assert.assertEquals(0, deserializedSegment.compareTo(segment));
-
- deserializedSegment = mapper.readValue(mapper.writeValueAsString(segment), DataSegment.class);
- Assert.assertEquals(segment.hashCode(), deserializedSegment.hashCode());
- }
-
- @Test
- public void testIdentifier()
- {
- final DataSegment segment = DataSegment.builder()
- .dataSource("foo")
- .interval(Intervals.of("2012-01-01/2012-01-02"))
- .version(DateTimes.of("2012-01-01T11:22:33.444Z").toString())
- .shardSpec(NoneShardSpec.instance())
- .build();
-
- Assert.assertEquals(
- "foo_2012-01-01T00:00:00.000Z_2012-01-02T00:00:00.000Z_2012-01-01T11:22:33.444Z",
- segment.getIdentifier()
- );
- }
-
- @Test
- public void testIdentifierWithZeroPartition()
- {
- final DataSegment segment = DataSegment.builder()
- .dataSource("foo")
- .interval(Intervals.of("2012-01-01/2012-01-02"))
- .version(DateTimes.of("2012-01-01T11:22:33.444Z").toString())
- .shardSpec(new SingleDimensionShardSpec("bar", null, "abc", 0))
- .build();
-
- Assert.assertEquals(
- "foo_2012-01-01T00:00:00.000Z_2012-01-02T00:00:00.000Z_2012-01-01T11:22:33.444Z",
- segment.getIdentifier()
- );
- }
-
- @Test
- public void testIdentifierWithNonzeroPartition()
- {
- final DataSegment segment = DataSegment.builder()
- .dataSource("foo")
- .interval(Intervals.of("2012-01-01/2012-01-02"))
- .version(DateTimes.of("2012-01-01T11:22:33.444Z").toString())
- .shardSpec(new SingleDimensionShardSpec("bar", "abc", "def", 1))
- .build();
-
- Assert.assertEquals(
- "foo_2012-01-01T00:00:00.000Z_2012-01-02T00:00:00.000Z_2012-01-01T11:22:33.444Z_1",
- segment.getIdentifier()
- );
- }
-
- @Test
- public void testV1SerializationNullMetrics() throws Exception
- {
- final DataSegment segment = DataSegment.builder()
- .dataSource("foo")
- .interval(Intervals.of("2012-01-01/2012-01-02"))
- .version(DateTimes.of("2012-01-01T11:22:33.444Z").toString())
- .build();
-
- final DataSegment segment2 = mapper.readValue(mapper.writeValueAsString(segment), DataSegment.class);
- Assert.assertEquals("empty dimensions", ImmutableList.of(), segment2.getDimensions());
- Assert.assertEquals("empty metrics", ImmutableList.of(), segment2.getMetrics());
- }
-
- @Test
- public void testBucketMonthComparator()
- {
- DataSegment[] sortedOrder = {
- makeDataSegment("test1", "2011-01-01/2011-01-02", "a"),
- makeDataSegment("test1", "2011-01-02/2011-01-03", "a"),
- makeDataSegment("test1", "2011-01-02/2011-01-03", "b"),
- makeDataSegment("test2", "2011-01-01/2011-01-02", "a"),
- makeDataSegment("test2", "2011-01-02/2011-01-03", "a"),
- makeDataSegment("test1", "2011-02-01/2011-02-02", "a"),
- makeDataSegment("test1", "2011-02-02/2011-02-03", "a"),
- makeDataSegment("test1", "2011-02-02/2011-02-03", "b"),
- makeDataSegment("test2", "2011-02-01/2011-02-02", "a"),
- makeDataSegment("test2", "2011-02-02/2011-02-03", "a"),
- };
-
- List<DataSegment> shuffled = new ArrayList<>(Arrays.asList(sortedOrder));
- Collections.shuffle(shuffled);
-
- Set<DataSegment> theSet = new TreeSet<>(DataSegment.bucketMonthComparator());
- theSet.addAll(shuffled);
-
- int index = 0;
- for (DataSegment dataSegment : theSet) {
- Assert.assertEquals(sortedOrder[index], dataSegment);
- ++index;
- }
- }
-
- private DataSegment makeDataSegment(String dataSource, String interval, String version)
- {
- return DataSegment.builder()
- .dataSource(dataSource)
- .interval(Intervals.of(interval))
- .version(version)
- .size(1)
- .build();
- }
-}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org