You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2018/12/18 23:10:31 UTC
[incubator-druid] branch master updated: fix log typo (#6755)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 9505074 fix log typo (#6755)
9505074 is described below
commit 95050745306f671af9d50729e9b0cb3d4bc39adb
Author: Clint Wylie <cj...@gmail.com>
AuthorDate: Tue Dec 18 15:10:25 2018 -0800
fix log typo (#6755)
* fix log typo, add DataSegmentUtils.getIdentifiersString util method
* fix indecisive oops
---
.../java/org/apache/druid/timeline/DataSegmentUtils.java | 12 ++++++++++++
.../druid/indexing/common/actions/SegmentInsertAction.java | 4 ++--
.../indexing/common/actions/SegmentMetadataUpdateAction.java | 3 ++-
.../druid/indexing/common/actions/SegmentNukeAction.java | 3 ++-
.../common/actions/SegmentTransactionalInsertAction.java | 3 ++-
.../src/main/java/org/apache/druid/segment/IndexMerger.java | 2 +-
.../coordinator/helper/DruidCoordinatorSegmentCompactor.java | 3 ++-
7 files changed, 23 insertions(+), 7 deletions(-)
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 7966991..150e09b 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.apache.druid.java.util.common.logger.Logger;
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 class DataSegmentUtils
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 42f74e5..68a30b6 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.fasterxml.jackson.core.type.TypeReference;
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 class SegmentInsertAction implements TaskAction<Set<DataSegment>>
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 4bb70a5..761c758 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.common.ISE;
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 class SegmentMetadataUpdateAction implements TaskAction<Void>
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 db632a7..31a65d0 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.common.ISE;
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 class SegmentNukeAction implements TaskAction<Void>
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 3d733f9..01e3db7 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.indexing.overlord.SegmentPublishResult;
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 class SegmentTransactionalInsertAction implements TaskAction<SegmentPubli
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 87466d2..2826b9d 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 interface IndexMerger
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 4067b3a..82be5c4 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.CoordinatorStats;
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 @@ public class DruidCoordinatorSegmentCompactor implements DruidCoordinatorHelper
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org