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 2016/03/04 23:25:36 UTC
lucene-solr git commit: LUCENE-7067: add missing checkIntegrity calls
for Points
Repository: lucene-solr
Updated Branches:
refs/heads/master 91e29bab6 -> 144273a81
LUCENE-7067: add missing checkIntegrity calls for Points
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/144273a8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/144273a8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/144273a8
Branch: refs/heads/master
Commit: 144273a8149b3cb0cd256ee54523994dc53a3d98
Parents: 91e29ba
Author: Robert Muir <rm...@apache.org>
Authored: Fri Mar 4 17:24:17 2016 -0500
Committer: Robert Muir <rm...@apache.org>
Committed: Fri Mar 4 17:25:22 2016 -0500
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/codecs/PointWriter.java | 7 +++++++
.../apache/lucene/codecs/lucene60/Lucene60PointWriter.java | 5 +++++
lucene/core/src/java/org/apache/lucene/index/CodecReader.java | 5 +++++
3 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/144273a8/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java
index d244093..c2972a8 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java
@@ -131,6 +131,13 @@ public abstract class PointWriter implements Closeable {
/** Default merge implementation to merge incoming points readers by visiting all their points and
* adding to this writer */
public void merge(MergeState mergeState) throws IOException {
+ // check each incoming reader
+ for (PointReader reader : mergeState.pointReaders) {
+ if (reader != null) {
+ reader.checkIntegrity();
+ }
+ }
+ // merge field at a time
for (FieldInfo fieldInfo : mergeState.mergeFieldInfos) {
if (fieldInfo.getPointDimensionCount() != 0) {
mergeOneField(mergeState, fieldInfo);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/144273a8/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java
index 63fc134..8a00d4c 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java
@@ -122,6 +122,11 @@ public class Lucene60PointWriter extends PointWriter implements Closeable {
return;
}
}
+ for (PointReader reader : mergeState.pointReaders) {
+ if (reader != null) {
+ reader.checkIntegrity();
+ }
+ }
for (FieldInfo fieldInfo : mergeState.mergeFieldInfos) {
if (fieldInfo.getPointDimensionCount() != 0) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/144273a8/lucene/core/src/java/org/apache/lucene/index/CodecReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/CodecReader.java b/lucene/core/src/java/org/apache/lucene/index/CodecReader.java
index 8a492c2..eb53648 100644
--- a/lucene/core/src/java/org/apache/lucene/index/CodecReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/CodecReader.java
@@ -392,5 +392,10 @@ public abstract class CodecReader extends LeafReader implements Accountable {
if (getTermVectorsReader() != null) {
getTermVectorsReader().checkIntegrity();
}
+
+ // points
+ if (getPointReader() != null) {
+ getPointReader().checkIntegrity();
+ }
}
}