You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/08/26 14:15:06 UTC
[1/2] lucene-solr:branch_6x: LUCENE-7427: in
DocumentsWriterDeleteQueue remove unused private members and tweak javadoc.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 35382a815 -> cdc317131
LUCENE-7427: in DocumentsWriterDeleteQueue remove unused private members and tweak javadoc.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9bda3e9b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9bda3e9b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9bda3e9b
Branch: refs/heads/branch_6x
Commit: 9bda3e9b55107c2a204f46b220de708d53537dcf
Parents: 35382a8
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Aug 26 13:44:25 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Aug 26 14:43:06 2016 +0100
----------------------------------------------------------------------
.../lucene/index/DocumentsWriterDeleteQueue.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9bda3e9b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
index dac2e4c..db0e571 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.index.DocValuesUpdate.BinaryDocValuesUpdate;
@@ -32,7 +31,8 @@ import org.apache.lucene.util.BytesRef;
* queue. In contrast to other queue implementation we only maintain the
* tail of the queue. A delete queue is always used in a context of a set of
* DWPTs and a global delete pool. Each of the DWPT and the global pool need to
- * maintain their 'own' head of the queue (as a DeleteSlice instance per DWPT).
+ * maintain their 'own' head of the queue (as a DeleteSlice instance per
+ * {@link DocumentsWriterPerThread}).
* The difference between the DWPT and the global pool is that the DWPT starts
* maintaining a head once it has added its first document since for its segments
* private deletes only the deletes after that document are relevant. The global
@@ -71,10 +71,6 @@ final class DocumentsWriterDeleteQueue implements Accountable {
// the current end (latest delete operation) in the delete queue:
private volatile Node<?> tail;
-
- @SuppressWarnings("rawtypes")
- private static final AtomicReferenceFieldUpdater<DocumentsWriterDeleteQueue,Node> tailUpdater = AtomicReferenceFieldUpdater
- .newUpdater(DocumentsWriterDeleteQueue.class, Node.class, "tail");
/** Used to record deletes against all prior (already written to disk) segments. Whenever any segment flushes, we bundle up this set of
* deletes and insert into the buffered updates stream before the newly flushed segment(s). */
@@ -322,17 +318,9 @@ final class DocumentsWriterDeleteQueue implements Accountable {
this.item = item;
}
- @SuppressWarnings("rawtypes")
- static final AtomicReferenceFieldUpdater<Node,Node> nextUpdater = AtomicReferenceFieldUpdater
- .newUpdater(Node.class, Node.class, "next");
-
void apply(BufferedUpdates bufferedDeletes, int docIDUpto) {
throw new IllegalStateException("sentinel item must never be applied");
}
-
- boolean casNext(Node<?> cmp, Node<?> val) {
- return nextUpdater.compareAndSet(this, cmp, val);
- }
}
private static final class TermNode extends Node<Term> {
[2/2] lucene-solr:branch_6x: SOLR-9436: remove no longer used
acceptsDocsOutOfOrder methods (LUCENE-6179 removed out-of-order scoring)
Posted by cp...@apache.org.
SOLR-9436: remove no longer used acceptsDocsOutOfOrder methods (LUCENE-6179 removed out-of-order scoring)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cdc31713
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cdc31713
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cdc31713
Branch: refs/heads/branch_6x
Commit: cdc317131ca3a49078f8cfe33353c07a6eb7aada
Parents: 9bda3e9
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Aug 26 13:45:36 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Aug 26 14:43:25 2016 +0100
----------------------------------------------------------------------
.../org/apache/solr/search/CollapsingQParserPlugin.java | 10 ----------
.../test/org/apache/solr/search/TestRankQueryPlugin.java | 4 ----
2 files changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cdc31713/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
index b9d292e..896387e 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -909,11 +909,6 @@ public class CollapsingQParserPlugin extends QParserPlugin {
}
}
- public boolean acceptsDocsOutOfOrder() {
- //Documents must be sent in order to this collector.
- return false;
- }
-
public void setScorer(Scorer scorer) {
this.collapseStrategy.setScorer(scorer);
}
@@ -1074,11 +1069,6 @@ public class CollapsingQParserPlugin extends QParserPlugin {
}
}
- public boolean acceptsDocsOutOfOrder() {
- //Documents must be sent in order to this collector.
- return false;
- }
-
public void setScorer(Scorer scorer) {
this.collapseStrategy.setScorer(scorer);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cdc31713/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
index 6b36375..30337ca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
@@ -691,10 +691,6 @@ public class TestRankQueryPlugin extends QParserPlugin {
@Override
public void setScorer(Scorer scorer) throws IOException {}
- public boolean acceptsDocsOutOfOrder() {
- return false;
- }
-
public void collect(int doc) {
list.add(new ScoreDoc(doc+base, (float)values.get(doc)));
}