summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
authorAdrien Grand <jpountz@gmail.com>2017-07-04 18:33:38 +0200
committerAdrien Grand <jpountz@gmail.com>2017-07-04 18:35:51 +0200
commite7e5216382a4988cba47df95ab7b2a5f9a27c695 (patch)
tree40fbba31df8a35a5c5c71328bc3cdcb0c8aaa8c1 /core/src/main
parentc52c3cea685f6f613d71447cde07aa3f93eadf61 (diff)
Make totalHits a long in CollapseTopFieldDocs.
Relates to #25349.
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java4
-rw-r--r--core/src/main/java/org/elasticsearch/common/lucene/Lucene.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java b/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
index b4d3c82343..c5362cbf85 100644
--- a/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
+++ b/core/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java
@@ -40,7 +40,7 @@ public final class CollapseTopFieldDocs extends TopFieldDocs {
/** The collapse value for each top doc */
public final Object[] collapseValues;
- public CollapseTopFieldDocs(String field, int totalHits, ScoreDoc[] scoreDocs,
+ public CollapseTopFieldDocs(String field, long totalHits, ScoreDoc[] scoreDocs,
SortField[] sortFields, Object[] values, float maxScore) {
super(totalHits, scoreDocs, sortFields, maxScore);
this.field = field;
@@ -170,7 +170,7 @@ public final class CollapseTopFieldDocs extends TopFieldDocs {
}
final PriorityQueue<ShardRef> queue = new MergeSortQueue(sort, shardHits);
- int totalHitCount = 0;
+ long totalHitCount = 0;
int availHitCount = 0;
float maxScore = Float.MIN_VALUE;
for(int shardIDX=0;shardIDX<shardHits.length;shardIDX++) {
diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index 10adf530b1..b156c9bb29 100644
--- a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -295,7 +295,7 @@ public class Lucene {
}
return new TopFieldDocs(totalHits, fieldDocs, fields, maxScore);
} else if (type == 2) {
- int totalHits = in.readVInt();
+ long totalHits = in.readVLong();
float maxScore = in.readFloat();
String field = in.readString();