You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/07/25 06:43:41 UTC
[1/2] lucene-solr:branch_6x: SOLR-9310: The variable name is
confusing. maxInHash is not a hash
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x dc54f97a3 -> 3416dda96
SOLR-9310: The variable name is confusing. maxInHash is not a hash
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3740156a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3740156a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3740156a
Branch: refs/heads/branch_6x
Commit: 3740156adfd8c85ce59af1f257df8c9b53c688ca
Parents: a6655a9
Author: Noble Paul <no...@gmail.com>
Authored: Mon Jul 25 12:10:49 2016 +0530
Committer: Noble Paul <no...@gmail.com>
Committed: Mon Jul 25 12:10:49 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/update/IndexFingerprint.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3740156a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
index 01cf9a6..349b703 100644
--- a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
+++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
@@ -42,7 +42,7 @@ public class IndexFingerprint {
private long maxVersionSpecified;
private long maxVersionEncountered;
- private long maxInHash;
+ private long maxVersionsUsedInHash;
private long versionsHash;
private long numVersions;
private long numDocs;
@@ -56,8 +56,8 @@ public class IndexFingerprint {
return maxVersionEncountered;
}
- public long getMaxInHash() {
- return maxInHash;
+ public long getMaxVersionsUsedInHash() {
+ return maxVersionsUsedInHash;
}
public long getVersionsHash() {
@@ -113,7 +113,7 @@ public class IndexFingerprint {
long v = fv.longVal(doc);
f.maxVersionEncountered = Math.max(v, f.maxVersionEncountered);
if (v <= f.maxVersionSpecified) {
- f.maxInHash = Math.max(v, f.maxInHash);
+ f.maxVersionsUsedInHash = Math.max(v, f.maxVersionsUsedInHash);
f.versionsHash += Hash.fmix64(v);
f.numVersions++;
}
@@ -139,7 +139,7 @@ public class IndexFingerprint {
}
// Go by the highest version under the requested max.
- cmp = Long.compare(f1.maxInHash, f2.maxInHash);
+ cmp = Long.compare(f1.maxVersionsUsedInHash, f2.maxVersionsUsedInHash);
if (cmp != 0) return cmp;
// go by who has the most documents in the index
@@ -158,7 +158,7 @@ public class IndexFingerprint {
Map<String,Object> map = new LinkedHashMap<>();
map.put("maxVersionSpecified", maxVersionSpecified);
map.put("maxVersionEncountered", maxVersionEncountered);
- map.put("maxInHash", maxInHash);
+ map.put("maxVersionsUsedInHash", maxVersionsUsedInHash);
map.put("versionsHash", versionsHash);
map.put("numVersions", numVersions);
map.put("numDocs", numDocs);
@@ -186,7 +186,7 @@ public class IndexFingerprint {
IndexFingerprint f = new IndexFingerprint();
f.maxVersionSpecified = getLong(o, "maxVersionSpecified", Long.MAX_VALUE);
f.maxVersionEncountered = getLong(o, "maxVersionEncountered", -1);
- f.maxInHash = getLong(o, "maxInHash", -1);
+ f.maxVersionsUsedInHash = getLong(o, "maxVersionsUsedInHash", -1);
f.versionsHash = getLong(o, "versionsHash", -1);
f.numVersions = getLong(o, "numVersions", -1);
f.numDocs = getLong(o, "numDocs", -1);
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3416dda9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3416dda9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3416dda9
Branch: refs/heads/branch_6x
Commit: 3416dda961e06c8097f25c743f4fe083ce1fd2e6
Parents: 3740156 dc54f97
Author: Noble Paul <no...@gmail.com>
Authored: Mon Jul 25 12:13:34 2016 +0530
Committer: Noble Paul <no...@gmail.com>
Committed: Mon Jul 25 12:13:34 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
lucene/core/src/java/org/apache/lucene/document/FieldType.java | 2 +-
lucene/core/src/test/org/apache/lucene/index/TestPointValues.java | 3 +--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------