You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ji...@apache.org on 2017/01/17 14:41:54 UTC
lucene-solr:branch_6x: LUCENE-7579: fix 6.x backport compilation
errors
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 5c2f5bd02 -> d73e3fb05
LUCENE-7579: fix 6.x backport compilation errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d73e3fb0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d73e3fb0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d73e3fb0
Branch: refs/heads/branch_6x
Commit: d73e3fb05c917739bcf0899171a024897d1b0269
Parents: 5c2f5bd
Author: Jim Ferenczi <ji...@elastic.co>
Authored: Tue Jan 17 15:39:15 2017 +0100
Committer: Jim Ferenczi <ji...@elastic.co>
Committed: Tue Jan 17 15:39:15 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/lucene/index/BinaryDocValuesWriter.java | 4 ++--
.../src/java/org/apache/lucene/index/DefaultIndexingChain.java | 3 +--
.../src/java/org/apache/lucene/index/PointValuesWriter.java | 6 +++++-
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d73e3fb0/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
index 432285d..0a59278 100644
--- a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
@@ -152,7 +152,7 @@ class BinaryDocValuesWriter extends DocValuesWriter {
private class BytesIterator implements Iterator<BytesRef> {
final BytesRefBuilder value = new BytesRefBuilder();
final PackedLongValues.Iterator lengthsIterator;
- final PagedBytes.PagedBytesDataInput bytesIterator = (PagedBytes.PagedBytesDataInput) bytes.getDataInput();
+ final PagedBytes.PagedBytesDataInput bytesIterator = bytes.getDataInput();
final int size = (int) lengths.size();
final int maxDoc;
int upto;
@@ -202,7 +202,7 @@ class BinaryDocValuesWriter extends DocValuesWriter {
final PackedLongValues values;
final PackedLongValues.Iterator lengthsIterator;
final long[] starts;
- final PagedBytes.PagedBytesDataInput bytesIterator = (PagedBytes.PagedBytesDataInput) bytes.getDataInput();
+ final PagedBytes.PagedBytesDataInput bytesIterator = bytes.getDataInput();
final Sorter.DocMap sortMap;
final int size = (int) lengths.size();
final int maxDoc;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d73e3fb0/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java b/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
index 29bf40d..fc6c308 100644
--- a/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
+++ b/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
@@ -121,9 +121,8 @@ final class DefaultIndexingChain extends DocConsumer {
return Integer.compare(docID1, docID2); // docid order tiebreak
}
};
- Sorter sorter = new Sorter(indexSort);
// returns null if documents are already sorted
- return sorter.sort(state.segmentInfo.maxDoc(), docComparator);
+ return Sorter.sort(state.segmentInfo.maxDoc(), docComparator);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d73e3fb0/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java
index 3d41d6d..ef0533e 100644
--- a/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.codecs.MutablePointsReader;
-import org.apache.lucene.codecs.PointsReader;
import org.apache.lucene.codecs.PointsWriter;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.ByteBlockPool;
@@ -215,6 +214,11 @@ class PointValuesWriter {
}
@Override
+ public long estimatePointCount(String fieldName, IntersectVisitor visitor) {
+ return Long.MAX_VALUE;
+ }
+
+ @Override
public byte[] getMinPackedValue(String field) throws IOException {
return in.getMinPackedValue(field);
}