s1monw commented on a change in pull request #1925:
URL: https://github.com/apache/lucene-solr/pull/1925#discussion_r496489937
##########
File path:
lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
##########
@@ -157,25 +157,18 @@ private boolean updatePeaks(long delta) {
}
DocumentsWriterPerThread doAfterDocument(DocumentsWriterPerThread perThread,
boolean isUpdate) {
- final long delta = perThread.getCommitLastBytesUsedDelta();
+ final long delta = perThread.commitLastBytesUsed();
synchronized (this) {
- // we need to commit this under lock but calculate it outside of the
lock to minimize the time this lock is held
- // per document. The reason we update this under lock is that we mark
DWPTs as pending without acquiring it's
- // lock in #setFlushPending and this also reads the committed bytes and
modifies the flush/activeBytes.
- // In the future we can clean this up to be more intuitive.
- perThread.commitLastBytesUsed(delta);
try {
/*
* We need to differentiate here if we are pending since
setFlushPending
* moves the perThread memory to the flushBytes and we could be set to
* pending during a delete
*/
- if (perThread.isFlushPending()) {
- flushBytes += delta;
- assert updatePeaks(delta);
- } else {
- activeBytes += delta;
- assert updatePeaks(delta);
+ activeBytes += delta;
+ assert updatePeaks(delta);
+ if (perThread.isFlushPending() == false) {
+ assert perThread.getState() == DocumentsWriterPerThread.State.ACTIVE
: "expected ACTIVE state but was: " + perThread.getState();
Review comment:
that makes sense to me.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
