You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/06/17 15:58:25 UTC
svn commit: r1351109 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/FieldCache.java
lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
Author: uschindler
Date: Sun Jun 17 13:58:25 2012
New Revision: 1351109
URL: http://svn.apache.org/viewvc?rev=1351109&view=rev
Log:
Merged revision(s) 1351108 from lucene/dev/trunk:
LUCENE-4106: Fix duplicate FieldCache.StopFillCacheException
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCache.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCache.java?rev=1351109&r1=1351108&r2=1351109&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCache.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCache.java Sun Jun 17 13:58:25 2012
@@ -53,6 +53,7 @@ public interface FieldCache {
* Hack: When thrown from a Parser (NUMERIC_UTILS_* ones), this stops
* processing terms and returns the current FieldCache
* array.
+ * @lucene.internal
*/
public static final class StopFillCacheException extends RuntimeException {
}
@@ -213,7 +214,7 @@ public interface FieldCache {
public static final IntParser NUMERIC_UTILS_INT_PARSER=new IntParser(){
public int parseInt(BytesRef term) {
if (NumericUtils.getPrefixCodedIntShift(term) > 0)
- throw new FieldCacheImpl.StopFillCacheException();
+ throw new StopFillCacheException();
return NumericUtils.prefixCodedToInt(term);
}
@Override
@@ -229,7 +230,7 @@ public interface FieldCache {
public static final FloatParser NUMERIC_UTILS_FLOAT_PARSER=new FloatParser(){
public float parseFloat(BytesRef term) {
if (NumericUtils.getPrefixCodedIntShift(term) > 0)
- throw new FieldCacheImpl.StopFillCacheException();
+ throw new StopFillCacheException();
return NumericUtils.sortableIntToFloat(NumericUtils.prefixCodedToInt(term));
}
@Override
@@ -245,7 +246,7 @@ public interface FieldCache {
public static final LongParser NUMERIC_UTILS_LONG_PARSER = new LongParser(){
public long parseLong(BytesRef term) {
if (NumericUtils.getPrefixCodedLongShift(term) > 0)
- throw new FieldCacheImpl.StopFillCacheException();
+ throw new StopFillCacheException();
return NumericUtils.prefixCodedToLong(term);
}
@Override
@@ -261,7 +262,7 @@ public interface FieldCache {
public static final DoubleParser NUMERIC_UTILS_DOUBLE_PARSER = new DoubleParser(){
public double parseDouble(BytesRef term) {
if (NumericUtils.getPrefixCodedLongShift(term) > 0)
- throw new FieldCacheImpl.StopFillCacheException();
+ throw new StopFillCacheException();
return NumericUtils.sortableLongToDouble(NumericUtils.prefixCodedToLong(term));
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=1351109&r1=1351108&r2=1351109&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java Sun Jun 17 13:58:25 2012
@@ -380,7 +380,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
if (setDocsWithField) {
@@ -453,7 +453,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
if (setDocsWithField) {
@@ -557,7 +557,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
@@ -707,7 +707,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
@@ -795,7 +795,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
@@ -884,7 +884,7 @@ class FieldCacheImpl implements FieldCac
}
}
}
- } catch (StopFillCacheException stop) {
+ } catch (FieldCache.StopFillCacheException stop) {
}
}
if (retArray == null) { // no values