gianm closed pull request #6755: fix log typo
URL: https://github.com/apache/incubator-druid/pull/6755
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/main/java/org/apache/druid/timeline/DataSegmentUtils.java
b/core/src/main/java/org/apache/druid/timeline/DataSegmentUtils.java
index 7966991a531..150e09b0854 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<DataSegment> 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 42f74e59737..68a30b679af 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 4bb70a533d8..761c7586a7a 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 db632a78507..31a65d0f357 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 3d733f90eff..01e3db7e0f3 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 87466d255e3..2826b9d4725 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 4067b3a7a5d..82be5c4458d 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);
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
