forked from pinterest/secor
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
few changes to fix issues #2
Open
dorjeetsering
wants to merge
8
commits into
master
Choose a base branch
from
PCGM-1314
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0617d67
Fixed mismatch between serialization with Avro and Deserialization wi…
zyuan-paytm bc302f9
Merge branch 'master' of https://github.com/breadpowder/secor
zyuan-paytm 3f1ea66
Merge remote-tracking branch 'upstream/master'
zyuan-paytm 6722605
Merge remote-tracking branch 'upstream/master'
zyuan-paytm 82c0c16
Merge remote-tracking branch 'upstream/master'
zyuan-paytm af9da35
Update logger for internal use
zyuan-paytm a119c61
Update configure for shorting metadata/topic discovery time
zyuan-paytm 5e8f14d
few changes to fix issues
dorjeetsering File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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 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 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
89 changes: 89 additions & 0 deletions
89
src/main/java/com/pinterest/secor/common/SingleProcessCounter.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package com.pinterest.secor.common; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| public class SingleProcessCounter { | ||
| private static final Logger LOG = LoggerFactory.getLogger(SingleProcessCounter.class); | ||
|
|
||
| private ConcurrentHashMap<TopicPartition, Long> mMessageUploadCounter; | ||
|
|
||
| private ConcurrentHashMap<TopicPartition, Long> mMessageLocalCounter; | ||
|
|
||
| private static volatile SingleProcessCounter counter = null; | ||
|
|
||
| private static Object lock = new Object(); | ||
|
|
||
| private SingleProcessCounter() { | ||
| mMessageLocalCounter = new ConcurrentHashMap<>(); | ||
| mMessageUploadCounter = new ConcurrentHashMap<>(); | ||
| } | ||
|
|
||
| public static SingleProcessCounter getSingleProcessCounter() { | ||
| if (counter != null) return counter; | ||
|
|
||
| synchronized (lock) { | ||
| if (counter == null) | ||
| counter = new SingleProcessCounter(); | ||
| } | ||
| return counter; | ||
| } | ||
|
|
||
| public void increment(TopicPartition tp, Long delta) { | ||
| long bufferValue = mMessageLocalCounter.merge(tp, delta, (v_old, v_delta) -> v_old + v_delta); | ||
|
|
||
| if (LOG.isDebugEnabled()) | ||
| LOG.debug("Topic {} Partition {} local message {}", tp.getTopic(), tp.getPartition(), bufferValue); | ||
|
|
||
| } | ||
|
|
||
| public void decrement(TopicPartition tp, Long delta) { | ||
| long bufferValue = mMessageLocalCounter.merge(tp, delta, (v_old, v_delta) -> v_old - v_delta); | ||
|
|
||
| if (LOG.isDebugEnabled()) | ||
| LOG.debug("Topic {} Partition {} local message {}", tp.getTopic(), tp.getPartition(), bufferValue); | ||
| } | ||
|
|
||
| public void topicUploaded(TopicPartition tp) { | ||
| long counter = getLocalCounter(tp); | ||
| mMessageUploadCounter.merge(tp, counter, (v_old, v_delta) -> v_old + v_delta); | ||
| decrement(tp, counter); | ||
| } | ||
|
|
||
| public long getLocalCounter(TopicPartition tp) { | ||
| return mMessageLocalCounter.getOrDefault(tp, 0l); | ||
| } | ||
|
|
||
| public long getTotalCounter(TopicPartition tp) { | ||
| return mMessageLocalCounter.values().stream().reduce((a, b) -> a + b).orElse(0l) + mMessageUploadCounter.values().stream().reduce((a, b) -> a + b).orElse(0l); | ||
|
|
||
| } | ||
|
|
||
| public String toString() { | ||
|
|
||
| StringBuilder sb = new StringBuilder(); | ||
| sb.append("Message completed stats: \n"); | ||
| toString(mMessageLocalCounter, sb, "Current local Msg written counter: "); | ||
| toString(mMessageUploadCounter, sb, "Uploaded Msg counter "); | ||
|
|
||
| return sb.toString(); | ||
| } | ||
|
|
||
| private void toString(Map<TopicPartition, Long> map, StringBuilder sb, String msg) { | ||
| map.forEach((tp, offset) -> { | ||
| sb | ||
| .append("[") | ||
| .append(tp.toString()) | ||
| .append("," + msg + offset) | ||
| .append("]") | ||
| .append("\n"); | ||
| }); | ||
| } | ||
|
|
||
| public void resetLocalCount(TopicPartition topicPartition) { | ||
| mMessageLocalCounter.merge(topicPartition, 0l, (v_old, v_set) -> v_set); | ||
| } | ||
| } |
This file contains 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 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 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 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 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 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.
hi @dorjeetsering, just curious here, do we need remove this line, looks like nothing get updated to the record
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.
That's the main change we want. We can remove the null check block.
if (record != null) {
Schema schema = record.getSchema();
}
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.
thanks @dorjeetsering