AmatyaAvadhanula commented on code in PR #15141:
URL: https://github.com/apache/druid/pull/15141#discussion_r1445865193
##########
indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbers.java:
##########
@@ -147,6 +148,38 @@ public SeekableStreamSequenceNumbers<PartitionIdType,
SequenceOffsetType> plus(
}
}
+ @Override
+ public int compareTo(SeekableStreamSequenceNumbers<PartitionIdType,
SequenceOffsetType> other, Comparator<SequenceOffsetType> comparator)
+ {
+ if (this.getClass() != other.getClass()) {
+ throw new IAE(
+ "Expected instance of %s, got %s",
+ this.getClass().getName(),
+ other.getClass().getName()
+ );
+ }
+
+ final SeekableStreamEndSequenceNumbers<PartitionIdType,
SequenceOffsetType> otherStart =
+ (SeekableStreamEndSequenceNumbers<PartitionIdType,
SequenceOffsetType>) other;
+
+ if (stream.equals(otherStart.stream)) {
+ //Same stream, compare the offset
+ boolean res = false;
+ for (Map.Entry<PartitionIdType, SequenceOffsetType> entry :
partitionSequenceNumberMap.entrySet()) {
+ PartitionIdType partitionId = entry.getKey();
+ SequenceOffsetType sequenceOffset = entry.getValue();
+ if (otherStart.partitionSequenceNumberMap.get(partitionId) != null &&
comparator.compare(sequenceOffset,
otherStart.partitionSequenceNumberMap.get(partitionId)) > 0) {
Review Comment:
Would startMetadataMatchesExisting be true if the entire metadata is null or
if any one of the partitions has it as null as well?
I think it's just the former
##########
server/src/main/java/org/apache/druid/segment/realtime/appenderator/BaseAppenderatorDriver.java:
##########
@@ -652,19 +656,16 @@ ListenableFuture<SegmentsAndCommitMetadata>
publishInBackground(
segmentsAndCommitMetadata.getSegments().forEach(dataSegmentKiller::killQuietly);
}
} else {
+ log.errorSegments(ourSegments, "Failed to publish segments");
+ if (publishResult.getErrorMsg() != null &&
publishResult.getErrorMsg().contains(("Failed to update the metadata Store. The
new start metadata is ahead of last commited end state."))) {
+ throw new ISE(publishResult.getErrorMsg());
+ }
// Our segments aren't active. Publish failed for some reason.
Clean them up and then throw an error.
segmentsAndCommitMetadata.getSegments().forEach(dataSegmentKiller::killQuietly);
Review Comment:
Yes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]