From 1e740831234d724a7b322aa3bc35716996f894ee Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Tue, 18 Dec 2018 10:43:42 -0800 Subject: [PATCH 1/2] fix log typo, add DataSegmentUtils.getIdentifiersString util method --- .../apache/druid/java/util/common/StringUtils.java | 1 + .../org/apache/druid/timeline/DataSegmentUtils.java | 12 ++++++++++++ .../indexing/common/actions/SegmentInsertAction.java | 4 ++-- .../common/actions/SegmentMetadataUpdateAction.java | 3 ++- .../indexing/common/actions/SegmentNukeAction.java | 3 ++- .../actions/SegmentTransactionalInsertAction.java | 3 ++- .../java/org/apache/druid/segment/IndexMerger.java | 2 +- .../helper/DruidCoordinatorSegmentCompactor.java | 3 ++- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java index 85f71d8a7a76..cbfe4bd11e26 100644 --- a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java +++ b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java @@ -286,4 +286,5 @@ public static String utf8Base64(String input) { return fromUtf8(Base64.getEncoder().encode(toUtf8(input))); } + } diff --git a/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java index 7966991a5310..150e09b08540 100644 --- a/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java +++ b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java @@ -28,7 +28,9 @@ import org.joda.time.DateTime; import org.joda.time.Interval; +import java.util.Collection; import java.util.Objects; +import java.util.stream.Collectors; @PublicApi public class DataSegmentUtils @@ -108,6 +110,16 @@ public static String withInterval(final String dataSource, final String identifi return segmentDesc.withInterval(newInterval).toString(); } + /** + * Creates a comma delimited list of segment identifiers + * @param segments + * @return + */ + public static String getIdentifiersString(Collection segments) + { + return segments.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(", ")); + } + public static class SegmentIdentifierParts { private final String dataSource; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java index 42f74e59737a..68a30b679afd 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentInsertAction.java @@ -25,9 +25,9 @@ import com.google.common.collect.ImmutableSet; import org.apache.druid.indexing.common.task.Task; import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegmentUtils; import java.util.Set; -import java.util.stream.Collectors; /** * Insert segments into metadata storage. The segment versions must all be less than or equal to a lock held by @@ -84,7 +84,7 @@ public boolean isAudited() public String toString() { return "SegmentInsertAction{" + - "segments=" + segments.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(",")) + + "segments=" + DataSegmentUtils.getIdentifiersString(segments) + '}'; } } diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java index 4bb70a533d88..761c7586a7ad 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java @@ -31,6 +31,7 @@ import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.druid.query.DruidMetrics; import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegmentUtils; import org.joda.time.Interval; import java.util.List; @@ -114,7 +115,7 @@ public boolean isAudited() public String toString() { return "SegmentMetadataUpdateAction{" + - "segments=" + segments.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(",")) + + "segments=" + DataSegmentUtils.getIdentifiersString(segments) + '}'; } } diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java index db632a78507a..31a65d0f3575 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java @@ -31,6 +31,7 @@ import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.druid.query.DruidMetrics; import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegmentUtils; import org.joda.time.Interval; import java.util.List; @@ -116,7 +117,7 @@ public boolean isAudited() public String toString() { return "SegmentNukeAction{" + - "segments=" + segments.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(",")) + + "segments=" + DataSegmentUtils.getIdentifiersString(segments) + '}'; } } diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java index 3d733f90eff2..01e3db7e0f3d 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java @@ -31,6 +31,7 @@ import org.apache.druid.java.util.emitter.service.ServiceMetricEvent; import org.apache.druid.query.DruidMetrics; import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegmentUtils; import java.util.Set; import java.util.stream.Collectors; @@ -154,7 +155,7 @@ public boolean isAudited() public String toString() { return "SegmentInsertAction{" + - "segments=" + segments.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(",")) + + "segments=" + DataSegmentUtils.getIdentifiersString(segments) + ", startMetadata=" + startMetadata + ", endMetadata=" + endMetadata + '}'; diff --git a/processing/src/main/java/org/apache/druid/segment/IndexMerger.java b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java index 87466d255e3e..2826b9d47250 100644 --- a/processing/src/main/java/org/apache/druid/segment/IndexMerger.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java @@ -493,7 +493,7 @@ public void close() mergeBufferTotalSize += bufferAllocation.rhs; ByteBufferUtils.free(bufferAllocation.lhs); } - log.info("Freed [,%d] bytes of dictionary merging direct buffers", mergeBufferTotalSize); + log.info("Freed [%,d] bytes of dictionary merging direct buffers", mergeBufferTotalSize); } } } diff --git a/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java index 4067b3a7a5d2..82be5c4458da 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/helper/DruidCoordinatorSegmentCompactor.java @@ -30,6 +30,7 @@ import org.apache.druid.server.coordinator.DataSourceCompactionConfig; import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams; import org.apache.druid.timeline.DataSegment; +import org.apache.druid.timeline.DataSegmentUtils; import org.apache.druid.timeline.VersionedIntervalTimeline; import javax.annotation.Nullable; @@ -163,7 +164,7 @@ private CoordinatorStats doRun( LOG.info( "Submitted a compactTask[%s] for segments[%s]", taskId, - segmentsToCompact.stream().map(DataSegment::getIdentifier).collect(Collectors.joining(",")) + DataSegmentUtils.getIdentifiersString(segmentsToCompact) ); } else if (segmentsToCompact.size() == 1) { throw new ISE("Found one segments[%s] to compact", segmentsToCompact); From 5880bc7271cf452cc42cdedddb54d3ab53c15768 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Tue, 18 Dec 2018 11:00:54 -0800 Subject: [PATCH 2/2] fix indecisive oops --- .../main/java/org/apache/druid/java/util/common/StringUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java index cbfe4bd11e26..85f71d8a7a76 100644 --- a/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java +++ b/core/src/main/java/org/apache/druid/java/util/common/StringUtils.java @@ -286,5 +286,4 @@ public static String utf8Base64(String input) { return fromUtf8(Base64.getEncoder().encode(toUtf8(input))); } - }