You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/07/01 13:52:55 UTC
svn commit: r1607055 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
Author: rmuir
Date: Tue Jul 1 11:52:55 2014
New Revision: 1607055
URL: http://svn.apache.org/r1607055
Log:
LUCENE-5798: Optimize MultiDocsEnum reuse
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1607055&r1=1607054&r2=1607055&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Tue Jul 1 11:52:55 2014
@@ -22,6 +22,8 @@ Optimizations
* LUCENE-5782: OrdinalMap now sorts enums before being built in order to
improve compression. (Adrien Grand)
+* LUCENE-5798: Optimize MultiDocsEnum reuse. (Robert Muir)
+
======================= Lucene 4.9.0 =======================
Changes in Runtime Behavior
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java?rev=1607055&r1=1607054&r2=1607055&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java Tue Jul 1 11:52:55 2014
@@ -31,7 +31,7 @@ import java.util.Arrays;
public final class MultiDocsAndPositionsEnum extends DocsAndPositionsEnum {
private final MultiTermsEnum parent;
final DocsAndPositionsEnum[] subDocsAndPositionsEnum;
- private EnumWithSlice[] subs;
+ private final EnumWithSlice[] subs;
int numSubs;
int upto;
DocsAndPositionsEnum current;
@@ -42,6 +42,10 @@ public final class MultiDocsAndPositions
public MultiDocsAndPositionsEnum(MultiTermsEnum parent, int subReaderCount) {
this.parent = parent;
subDocsAndPositionsEnum = new DocsAndPositionsEnum[subReaderCount];
+ this.subs = new EnumWithSlice[subReaderCount];
+ for (int i = 0; i < subs.length; i++) {
+ subs[i] = new EnumWithSlice();
+ }
}
/** Returns {@code true} if this instance can be reused by
@@ -53,9 +57,7 @@ public final class MultiDocsAndPositions
/** Rre-use and reset this instance on the provided slices. */
public MultiDocsAndPositionsEnum reset(final EnumWithSlice[] subs, final int numSubs) {
this.numSubs = numSubs;
- this.subs = new EnumWithSlice[subs.length];
- for(int i=0;i<subs.length;i++) {
- this.subs[i] = new EnumWithSlice();
+ for(int i=0;i<numSubs;i++) {
this.subs[i].docsAndPositionsEnum = subs[i].docsAndPositionsEnum;
this.subs[i].slice = subs[i].slice;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java?rev=1607055&r1=1607054&r2=1607055&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java Tue Jul 1 11:52:55 2014
@@ -31,7 +31,7 @@ import java.util.Arrays;
public final class MultiDocsEnum extends DocsEnum {
private final MultiTermsEnum parent;
final DocsEnum[] subDocsEnum;
- private EnumWithSlice[] subs;
+ private final EnumWithSlice[] subs;
int numSubs;
int upto;
DocsEnum current;
@@ -44,14 +44,16 @@ public final class MultiDocsEnum extends
public MultiDocsEnum(MultiTermsEnum parent, int subReaderCount) {
this.parent = parent;
subDocsEnum = new DocsEnum[subReaderCount];
+ this.subs = new EnumWithSlice[subReaderCount];
+ for (int i = 0; i < subs.length; i++) {
+ subs[i] = new EnumWithSlice();
+ }
}
MultiDocsEnum reset(final EnumWithSlice[] subs, final int numSubs) {
this.numSubs = numSubs;
- this.subs = new EnumWithSlice[subs.length];
- for(int i=0;i<subs.length;i++) {
- this.subs[i] = new EnumWithSlice();
+ for(int i=0;i<numSubs;i++) {
this.subs[i].docsEnum = subs[i].docsEnum;
this.subs[i].slice = subs[i].slice;
}