Fix num_rows in sys.segments #6888
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,6 @@ | |
| import org.apache.druid.timeline.SegmentId; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
|
|
@@ -36,15 +35,25 @@ public static Builder builder( | |
| long isPublished, | ||
| long isAvailable, | ||
| long isRealtime, | ||
| Set<String> segmentServers, | ||
| RowSignature rowSignature, | ||
| long numRows | ||
| ) | ||
| { | ||
| return new Builder(segmentId, isPublished, isAvailable, isRealtime, segmentServers, rowSignature, numRows); | ||
| } | ||
|
|
||
| public static Builder from(SegmentMetadataHolder h) | ||
| { | ||
| return new Builder( | ||
| h.getSegmentId(), | ||
| h.isPublished(), | ||
| h.isAvailable(), | ||
| h.isRealtime(), | ||
| h.getReplicas(), | ||
| h.getRowSignature(), | ||
| h.getNumRows() | ||
| ); | ||
| } | ||
|
|
||
| private final SegmentId segmentId; | ||
|
|
@@ -54,8 +63,8 @@ public static Builder from(SegmentMetadataHolder h) | |
| private final long isPublished; | ||
| private final long isAvailable; | ||
| private final long isRealtime; | ||
| // set of servers that contain the segment | ||
| private final Set<String> segmentServers; | ||
| private final long numRows; | ||
| @Nullable | ||
| private final RowSignature rowSignature; | ||
|
|
@@ -66,7 +75,7 @@ private SegmentMetadataHolder(Builder builder) | |
| this.isPublished = builder.isPublished; | ||
| this.isAvailable = builder.isAvailable; | ||
| this.isRealtime = builder.isRealtime; | ||
| this.segmentServers = builder.segmentServers; | ||
| this.numRows = builder.numRows; | ||
| this.segmentId = builder.segmentId; | ||
| } | ||
|
|
@@ -91,14 +100,14 @@ public SegmentId getSegmentId() | |
| return segmentId; | ||
| } | ||
|
|
||
| public Set<String> getReplicas() | ||
| { | ||
| return segmentServers; | ||
| } | ||
|
|
||
| public long getNumReplicas() | ||
| { | ||
| return segmentServers.size(); | ||
|
Contributor
There was a problem hiding this comment. Why do we return long in this method when Set#size() returns an int? Might not be worth changing because it might blow up other stuff.
Author
There was a problem hiding this comment. It used to be int, and then got changed to long at some point. The reason is because we support nulls for long here, but not for ints ? Not very sure...but will likely leave it to be long here. |
||
| } | ||
|
|
||
| public long getNumRows() | ||
|
|
@@ -119,7 +128,7 @@ public static class Builder | |
| private final long isAvailable; | ||
| private final long isRealtime; | ||
|
|
||
| private Set<String> segmentServers; | ||
| @Nullable | ||
| private RowSignature rowSignature; | ||
| private long numRows; | ||
|
|
@@ -129,14 +138,18 @@ private Builder( | |
| long isPublished, | ||
| long isAvailable, | ||
| long isRealtime, | ||
| Set<String> servers, | ||
| RowSignature rowSignature, | ||
| long numRows | ||
| ) | ||
| { | ||
| this.segmentId = segmentId; | ||
| this.isPublished = isPublished; | ||
| this.isAvailable = isAvailable; | ||
| this.isRealtime = isRealtime; | ||
| this.segmentServers = servers; | ||
| this.rowSignature = rowSignature; | ||
| this.numRows = numRows; | ||
| } | ||
|
|
||
| public Builder withRowSignature(RowSignature rowSignature) | ||
|
|
@@ -151,9 +164,9 @@ public Builder withNumRows(long numRows) | |
| return this; | ||
| } | ||
|
|
||
| public Builder withReplicas(Set<String> servers) | ||
| { | ||
| this.segmentServers = servers; | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of this comment, you could add
@GuardedBy("lock"). It sends the same message, and could also help with automated bug detection.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good suggestion, thanks.