You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2017/01/07 16:59:41 UTC
[2/2] lucene-solr:branch_6x: LUCENE-7611: Remove unnecessary
Exception wrapping from DocumentValueSourceDictionary
LUCENE-7611: Remove unnecessary Exception wrapping from DocumentValueSourceDictionary
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/31db19d3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/31db19d3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/31db19d3
Branch: refs/heads/branch_6x
Commit: 31db19d3e4e0dec89ece38ef27577e8b668c93c2
Parents: d268055
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Jan 7 16:25:57 2017 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Jan 7 16:25:57 2017 +0000
----------------------------------------------------------------------
.../search/suggest/DocumentDictionary.java | 2 +-
.../suggest/DocumentValueSourceDictionary.java | 20 ++++++--------------
2 files changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31db19d3/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
index 9006ae2..1536295 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
@@ -239,7 +239,7 @@ public class DocumentDictionary implements Dictionary {
* or if it's indexed as {@link NumericDocValues} (using <code>docId</code>) for the document.
* If no value is found, then the weight is 0.
*/
- protected long getWeight(Document doc, int docId) {
+ protected long getWeight(Document doc, int docId) throws IOException {
IndexableField weight = doc.getField(weightField);
if (weight != null) { // found weight as stored
return (weight.numericValue() != null) ? weight.numericValue().longValue() : 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/31db19d3/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java
index 3496aad..58c30aa 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java
@@ -177,27 +177,19 @@ public class DocumentValueSourceDictionary extends DocumentDictionary {
* by the <code>weightsValueSource</code>
* */
@Override
- protected long getWeight(Document doc, int docId) {
+ protected long getWeight(Document doc, int docId) throws IOException {
if (currentWeightValues == null) {
return 0;
}
int subIndex = ReaderUtil.subIndex(docId, starts);
if (subIndex != currentLeafIndex) {
currentLeafIndex = subIndex;
- try {
- currentWeightValues = weightsValueSource.getValues(leaves.get(currentLeafIndex), null);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- try {
- if (currentWeightValues.advanceExact(docId - starts[subIndex]))
- return currentWeightValues.longValue();
- else
- return 0;
- } catch (IOException e) {
- throw new RuntimeException(e);
+ currentWeightValues = weightsValueSource.getValues(leaves.get(currentLeafIndex), null);
}
+ if (currentWeightValues.advanceExact(docId - starts[subIndex]))
+ return currentWeightValues.longValue();
+ else
+ return 0;
}
}