You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/08 04:40:37 UTC
svn commit: r1430130 [7/27] - in /lucene/dev/branches/lucene4547: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/solr/
dev-tools/maven/solr/contrib/analysis-extras/
dev-tools/maven/solr/contrib/cluster...
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimitedDirectoryWrapper.java Tue Jan 8 03:40:16 2013
@@ -40,26 +40,31 @@ public final class RateLimitedDirectoryW
this.delegate = wrapped;
}
+ @Override
public String[] listAll() throws IOException {
ensureOpen();
return delegate.listAll();
}
+ @Override
public boolean fileExists(String name) throws IOException {
ensureOpen();
return delegate.fileExists(name);
}
+ @Override
public void deleteFile(String name) throws IOException {
ensureOpen();
delegate.deleteFile(name);
}
+ @Override
public long fileLength(String name) throws IOException {
ensureOpen();
return delegate.fileLength(name);
}
+ @Override
public IndexOutput createOutput(String name, IOContext context)
throws IOException {
ensureOpen();
@@ -71,22 +76,26 @@ public final class RateLimitedDirectoryW
return output;
}
+ @Override
public void sync(Collection<String> names) throws IOException {
ensureOpen();
delegate.sync(names);
}
+ @Override
public IndexInput openInput(String name, IOContext context)
throws IOException {
ensureOpen();
return delegate.openInput(name, context);
}
+ @Override
public void close() throws IOException {
isOpen = false;
delegate.close();
}
+ @Override
public IndexInputSlicer createSlicer(String name, IOContext context)
throws IOException {
ensureOpen();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java Tue Jan 8 03:40:16 2013
@@ -64,6 +64,7 @@ public abstract class RateLimiter {
/**
* Sets an updated mb per second rate limit.
*/
+ @Override
public void setMbPerSec(double mbPerSec) {
this.mbPerSec = mbPerSec;
nsPerByte = 1000000000. / (1024*1024*mbPerSec);
@@ -73,6 +74,7 @@ public abstract class RateLimiter {
/**
* The current mb per second rate limit.
*/
+ @Override
public double getMbPerSec() {
return this.mbPerSec;
}
@@ -86,6 +88,7 @@ public abstract class RateLimiter {
* with a biggish count, not one byte at a time.
* @return the pause time in nano seconds
* */
+ @Override
public long pause(long bytes) {
if (bytes == 1) {
return 0;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java Tue Jan 8 03:40:16 2013
@@ -58,6 +58,7 @@ public class SimpleFSDirectory extends F
return new SimpleFSIndexInput("SimpleFSIndexInput(path=\"" + path.getPath() + "\")", path, context, getReadChunkSize());
}
+ @Override
public IndexInputSlicer createSlicer(final String name,
final IOContext context) throws IOException {
ensureOpen();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java Tue Jan 8 03:40:16 2013
@@ -51,6 +51,7 @@ public abstract class AttributeImpl impl
public final String reflectAsString(final boolean prependAttClass) {
final StringBuilder buffer = new StringBuilder();
reflectWith(new AttributeReflector() {
+ @Override
public void reflect(Class<? extends Attribute> attClass, String key, Object value) {
if (buffer.length() > 0) {
buffer.append(',');
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java Tue Jan 8 03:40:16 2013
@@ -175,10 +175,12 @@ public class AttributeSource {
return new Iterator<AttributeImpl>() {
private State state = initState;
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
+ @Override
public AttributeImpl next() {
if (state == null)
throw new NoSuchElementException();
@@ -187,6 +189,7 @@ public class AttributeSource {
return att;
}
+ @Override
public boolean hasNext() {
return state != null;
}
@@ -425,6 +428,7 @@ public class AttributeSource {
public final String reflectAsString(final boolean prependAttClass) {
final StringBuilder buffer = new StringBuilder();
reflectWith(new AttributeReflector() {
+ @Override
public void reflect(Class<? extends Attribute> attClass, String key, Object value) {
if (buffer.length() > 0) {
buffer.append(',');
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/Bits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/Bits.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/Bits.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/Bits.java Tue Jan 8 03:40:16 2013
@@ -47,10 +47,12 @@ public interface Bits {
this.len = len;
}
+ @Override
public boolean get(int index) {
return true;
}
+ @Override
public int length() {
return len;
}
@@ -66,10 +68,12 @@ public interface Bits {
this.len = len;
}
+ @Override
public boolean get(int index) {
return false;
}
+ @Override
public int length() {
return len;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java Tue Jan 8 03:40:16 2013
@@ -99,6 +99,7 @@ public final class ByteBlockPool {
this.bytesUsed = bytesUsed;
}
+ @Override
public byte[] getByteBlock() {
bytesUsed.addAndGet(blockSize);
return new byte[blockSize];
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRef.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRef.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRef.java Tue Jan 8 03:40:16 2013
@@ -226,6 +226,7 @@ public final class BytesRef implements C
}
/** Unsigned byte order comparison */
+ @Override
public int compareTo(BytesRef other) {
return utf8SortedAsUnicodeSortOrder.compare(this, other);
}
@@ -240,6 +241,7 @@ public final class BytesRef implements C
// Only singleton
private UTF8SortedAsUnicodeComparator() {};
+ @Override
public int compare(BytesRef a, BytesRef b) {
final byte[] aBytes = a.bytes;
int aUpto = a.offset;
@@ -278,6 +280,7 @@ public final class BytesRef implements C
// Only singleton
private UTF8SortedAsUTF16Comparator() {};
+ @Override
public int compare(BytesRef a, BytesRef b) {
final byte[] aBytes = a.bytes;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java Tue Jan 8 03:40:16 2013
@@ -54,6 +54,7 @@ public interface BytesRefIterator {
return null;
}
+ @Override
public Comparator<BytesRef> getComparator() {
return null;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CharsRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CharsRef.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CharsRef.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CharsRef.java Tue Jan 8 03:40:16 2013
@@ -118,6 +118,7 @@ public final class CharsRef implements C
}
/** Signed int order comparison */
+ @Override
public int compareTo(CharsRef other) {
if (this == other)
return 0;
@@ -197,10 +198,12 @@ public final class CharsRef implements C
return new String(chars, offset, length);
}
+ @Override
public int length() {
return length;
}
+ @Override
public char charAt(int index) {
// NOTE: must do a real check here to meet the specs of CharSequence
if (index < 0 || index >= length) {
@@ -209,6 +212,7 @@ public final class CharsRef implements C
return chars[offset + index];
}
+ @Override
public CharSequence subSequence(int start, int end) {
// NOTE: must do a real check here to meet the specs of CharSequence
if (start < 0 || end > length || start > end) {
@@ -233,6 +237,7 @@ public final class CharsRef implements C
// Only singleton
private UTF16SortedAsUTF8Comparator() {};
+ @Override
public int compare(CharsRef a, CharsRef b) {
if (a == b)
return 0;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java Tue Jan 8 03:40:16 2013
@@ -128,6 +128,7 @@ public class CloseableThreadLocal<T> imp
}
}
+ @Override
public void close() {
// Clear the hard refs; then, the only remaining refs to
// all values we were storing are weak (unless somewhere
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java Tue Jan 8 03:40:16 2013
@@ -41,10 +41,12 @@ public abstract class FilterIterator<T,
this.iterator = baseIterator;
}
+ @Override
public final boolean hasNext() {
return nextIsSet || setNext();
}
+ @Override
public final T next() {
if (!hasNext()) {
throw new NoSuchElementException();
@@ -58,6 +60,7 @@ public abstract class FilterIterator<T,
}
}
+ @Override
public final void remove() {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java Tue Jan 8 03:40:16 2013
@@ -99,6 +99,7 @@ public final class FixedBitSet extends D
return (int) BitUtil.pop_array(bits, 0, bits.length);
}
+ @Override
public boolean get(int index) {
assert index >= 0 && index < numBits: "index=" + index;
int i = index >> 6; // div 64
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/IntsRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/IntsRef.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/IntsRef.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/IntsRef.java Tue Jan 8 03:40:16 2013
@@ -103,6 +103,7 @@ public final class IntsRef implements Co
}
/** Signed int order comparison */
+ @Override
public int compareTo(IntsRef other) {
if (this == other) return 0;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/LongsRef.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/LongsRef.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/LongsRef.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/LongsRef.java Tue Jan 8 03:40:16 2013
@@ -102,6 +102,7 @@ public final class LongsRef implements C
}
/** Signed int order comparison */
+ @Override
public int compareTo(LongsRef other) {
if (this == other) return 0;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java Tue Jan 8 03:40:16 2013
@@ -110,6 +110,7 @@ public final class NamedSPILoader<S exte
return services.keySet();
}
+ @Override
public Iterator<S> iterator() {
return services.values().iterator();
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java Tue Jan 8 03:40:16 2013
@@ -57,6 +57,7 @@ public class NamedThreadFactory implemen
*
* @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable)
*/
+ @Override
public Thread newThread(Runnable r) {
final Thread t = new Thread(group, r, String.format(Locale.ROOT, "%s-%d",
this.threadNamePrefix, threadNumber.getAndIncrement()), 0);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java Tue Jan 8 03:40:16 2013
@@ -162,6 +162,7 @@ public class OpenBitSet extends DocIdSet
/** Returns true or false for the specified bit index. */
+ @Override
public boolean get(int index) {
int i = index >> 6; // div 64
// signed shift will keep a negative index and force an
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/StringHelper.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/StringHelper.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/StringHelper.java Tue Jan 8 03:40:16 2013
@@ -60,6 +60,7 @@ public abstract class StringHelper {
}
private static Comparator<String> versionComparator = new Comparator<String>() {
+ @Override
public int compare(String a, String b) {
StringTokenizer aTokens = new StringTokenizer(a, ".");
StringTokenizer bTokens = new StringTokenizer(b, ".");
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java Tue Jan 8 03:40:16 2013
@@ -202,10 +202,12 @@ public final class WeakIdentityMap<K,V>
hash = System.identityHashCode(obj);
}
+ @Override
public int hashCode() {
return hash;
}
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/BasicOperations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/BasicOperations.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/BasicOperations.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/BasicOperations.java Tue Jan 8 03:40:16 2013
@@ -473,6 +473,7 @@ final public class BasicOperations {
int point;
final TransitionList ends = new TransitionList();
final TransitionList starts = new TransitionList();
+ @Override
public int compareTo(PointTransitions other) {
return point - other.point;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/State.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/State.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/State.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/State.java Tue Jan 8 03:40:16 2013
@@ -68,15 +68,19 @@ public class State implements Comparable
}
private class TransitionsIterable implements Iterable<Transition> {
+ @Override
public Iterator<Transition> iterator() {
return new Iterator<Transition>() {
int upto;
+ @Override
public boolean hasNext() {
return upto < numTransitions;
}
+ @Override
public Transition next() {
return transitionsArray[upto++];
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -269,6 +273,7 @@ public class State implements Comparable
* Compares this object with the specified object for order. States are
* ordered by the time of construction.
*/
+ @Override
public int compareTo(State s) {
return s.id - id;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java Tue Jan 8 03:40:16 2013
@@ -179,6 +179,7 @@ public class Transition implements Clone
}
private static final class CompareByDestThenMinMaxSingle implements Comparator<Transition> {
+ @Override
public int compare(Transition t1, Transition t2) {
if (t1.to != t2.to) {
if (t1.to.number < t2.to.number) return -1;
@@ -195,6 +196,7 @@ public class Transition implements Clone
public static final Comparator<Transition> CompareByDestThenMinMax = new CompareByDestThenMinMaxSingle();
private static final class CompareByMinMaxThenDestSingle implements Comparator<Transition> {
+ @Override
public int compare(Transition t1, Transition t2) {
if (t1.min < t2.min) return -1;
if (t1.min > t2.min) return 1;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java Tue Jan 8 03:40:16 2013
@@ -62,6 +62,10 @@ public class Builder<T> {
private final int shareMaxTailLength;
private final IntsRef lastInput = new IntsRef();
+
+ // for packing
+ private final boolean doPackFST;
+ private final float acceptableOverheadRatio;
// NOTE: cutting this over to ArrayList instead loses ~6%
// in build performance on 9.8M Wikipedia terms; so we
@@ -135,23 +139,22 @@ public class Builder<T> {
* FSA, use {@link NoOutputs#getSingleton()} and {@link NoOutputs#getNoOutput()} as the
* singleton output object.
*
- * @param willPackFST Pass true if you will pack the FST before saving. This
- * causes the FST to create additional data structures internally to enable packing, but
- * it means the resulting FST cannot be saved until it
- * is packed using {@link FST#pack(int, int, float)}
- *
+ * @param doPackFST Pass true to create a packed FST.
+ *
* @param acceptableOverheadRatio How to trade speed for space when building the FST. This option
- * is only relevant when willPackFST is true. @see PackedInts#getMutable(int, int, float)
+ * is only relevant when doPackFST is true. @see PackedInts#getMutable(int, int, float)
*/
public Builder(FST.INPUT_TYPE inputType, int minSuffixCount1, int minSuffixCount2, boolean doShareSuffix,
boolean doShareNonSingletonNodes, int shareMaxTailLength, Outputs<T> outputs,
- FreezeTail<T> freezeTail, boolean willPackFST, float acceptableOverheadRatio) {
+ FreezeTail<T> freezeTail, boolean doPackFST, float acceptableOverheadRatio) {
this.minSuffixCount1 = minSuffixCount1;
this.minSuffixCount2 = minSuffixCount2;
this.freezeTail = freezeTail;
this.doShareNonSingletonNodes = doShareNonSingletonNodes;
this.shareMaxTailLength = shareMaxTailLength;
- fst = new FST<T>(inputType, outputs, willPackFST, acceptableOverheadRatio);
+ this.doPackFST = doPackFST;
+ this.acceptableOverheadRatio = acceptableOverheadRatio;
+ fst = new FST<T>(inputType, outputs, doPackFST, acceptableOverheadRatio);
if (doShareSuffix) {
dedupHash = new NodeHash<T>(fst);
} else {
@@ -474,7 +477,11 @@ public class Builder<T> {
//if (DEBUG) System.out.println(" builder.finish root.isFinal=" + root.isFinal + " root.output=" + root.output);
fst.finish(compileNode(root, lastInput.length).node);
- return fst;
+ if (doPackFST) {
+ return fst.pack(3, Math.max(10, fst.getNodeCount()/4), acceptableOverheadRatio);
+ } else {
+ return fst;
+ }
}
private void compileAllTargets(UnCompiledNode<T> node, int tailLength) throws IOException {
@@ -511,6 +518,7 @@ public class Builder<T> {
static final class CompiledNode implements Node {
int node;
+ @Override
public boolean isCompiled() {
return true;
}
@@ -547,6 +555,7 @@ public class Builder<T> {
this.depth = depth;
}
+ @Override
public boolean isCompiled() {
return false;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Tue Jan 8 03:40:16 2013
@@ -275,7 +275,7 @@ public final class FST<T> {
inCounts = null;
}
- writer = new BytesWriter();
+ writer = new DefaultBytesWriter();
emptyOutput = null;
packed = false;
@@ -360,8 +360,8 @@ public final class FST<T> {
if (this.startNode != -1) {
throw new IllegalStateException("already finished");
}
- byte[] finalBytes = new byte[writer.posWrite];
- System.arraycopy(bytes, 0, finalBytes, 0, writer.posWrite);
+ byte[] finalBytes = new byte[writer.getPosition()];
+ System.arraycopy(bytes, 0, finalBytes, 0, writer.getPosition());
bytes = finalBytes;
this.startNode = startNode;
@@ -415,23 +415,23 @@ public final class FST<T> {
// TODO: this is messy -- replace with sillyBytesWriter; maybe make
// bytes private
- final int posSave = writer.posWrite;
+ final int posSave = writer.getPosition();
outputs.writeFinalOutput(emptyOutput, writer);
- emptyOutputBytes = new byte[writer.posWrite-posSave];
+ emptyOutputBytes = new byte[writer.getPosition()-posSave];
if (!packed) {
// reverse
- final int stopAt = (writer.posWrite - posSave)/2;
+ final int stopAt = (writer.getPosition() - posSave)/2;
int upto = 0;
while(upto < stopAt) {
final byte b = bytes[posSave + upto];
- bytes[posSave+upto] = bytes[writer.posWrite-upto-1];
- bytes[writer.posWrite-upto-1] = b;
+ bytes[posSave+upto] = bytes[writer.getPosition()-upto-1];
+ bytes[writer.getPosition()-upto-1] = b;
upto++;
}
}
- System.arraycopy(bytes, posSave, emptyOutputBytes, 0, writer.posWrite-posSave);
- writer.posWrite = posSave;
+ System.arraycopy(bytes, posSave, emptyOutputBytes, 0, writer.getPosition()-posSave);
+ writer.setPosition(posSave);
}
public void save(DataOutput out) throws IOException {
@@ -562,7 +562,7 @@ public final class FST<T> {
}
}
- int startAddress = writer.posWrite;
+ int startAddress = writer.getPosition();
//System.out.println(" startAddr=" + startAddress);
final boolean doFixedArray = shouldExpand(nodeIn);
@@ -578,7 +578,7 @@ public final class FST<T> {
// of bytes per arc (int) here:
// TODO: we could make this a vInt instead
writer.writeInt(0);
- fixedArrayStart = writer.posWrite;
+ fixedArrayStart = writer.getPosition();
//System.out.println(" do fixed arcs array arcsStart=" + fixedArrayStart);
} else {
fixedArrayStart = 0;
@@ -588,7 +588,7 @@ public final class FST<T> {
final int lastArc = nodeIn.numArcs-1;
- int lastArcStart = writer.posWrite;
+ int lastArcStart = writer.getPosition();
int maxBytesPerArc = 0;
for(int arcIdx=0;arcIdx<nodeIn.numArcs;arcIdx++) {
final Builder.Arc<T> arc = nodeIn.arcs[arcIdx];
@@ -653,8 +653,8 @@ public final class FST<T> {
// but record how many bytes each one took, and max
// byte size:
if (doFixedArray) {
- bytesPerArc[arcIdx] = writer.posWrite - lastArcStart;
- lastArcStart = writer.posWrite;
+ bytesPerArc[arcIdx] = writer.getPosition() - lastArcStart;
+ lastArcStart = writer.getPosition();
maxBytesPerArc = Math.max(maxBytesPerArc, bytesPerArc[arcIdx]);
//System.out.println(" bytes=" + bytesPerArc[arcIdx]);
}
@@ -681,9 +681,9 @@ public final class FST<T> {
bytes[fixedArrayStart-1] = (byte) maxBytesPerArc;
// expand the arcs in place, backwards
- int srcPos = writer.posWrite;
+ int srcPos = writer.getPosition();
int destPos = fixedArrayStart + nodeIn.numArcs*maxBytesPerArc;
- writer.posWrite = destPos;
+ writer.setPosition(destPos);
for(int arcIdx=nodeIn.numArcs-1;arcIdx>=0;arcIdx--) {
//System.out.println(" repack arcIdx=" + arcIdx + " srcPos=" + srcPos + " destPos=" + destPos);
destPos -= maxBytesPerArc;
@@ -698,7 +698,7 @@ public final class FST<T> {
// reverse bytes in-place; we do this so that the
// "BIT_TARGET_NEXT" opto can work, ie, it reads the
// node just before the current one
- final int endAddress = writer.posWrite - 1;
+ final int endAddress = writer.getPosition() - 1;
int left = startAddress;
int right = endAddress;
@@ -908,17 +908,18 @@ public final class FST<T> {
if (arc.label == END_LABEL) {
//System.out.println(" nextArc fake " + arc.nextArc);
- in.pos = getNodeAddress(arc.nextArc);
- final byte b = bytes[in.pos];
+ int pos = in.pos = getNodeAddress(arc.nextArc);
+ final byte b = in.readByte();
if (b == ARCS_AS_FIXED_ARRAY) {
//System.out.println(" nextArc fake array");
- in.skip(1);
in.readVInt();
if (packed) {
in.readVInt();
} else {
in.readInt();
}
+ } else {
+ in.pos = pos;
}
} else {
if (arc.bytesPerArc != 0) {
@@ -1183,12 +1184,17 @@ public final class FST<T> {
((node.depth <= FIXED_ARRAY_SHALLOW_DISTANCE && node.numArcs >= FIXED_ARRAY_NUM_ARCS_SHALLOW) ||
node.numArcs >= FIXED_ARRAY_NUM_ARCS_DEEP);
}
+
+ static abstract class BytesWriter extends DataOutput {
+ public abstract void setPosition(int posWrite);
+ public abstract int getPosition();
+ }
// Non-static: writes to FST's byte[]
- class BytesWriter extends DataOutput {
+ class DefaultBytesWriter extends BytesWriter {
int posWrite;
- public BytesWriter() {
+ public DefaultBytesWriter() {
// pad: ensure no node gets address 0 which is reserved to mean
// the stop state w/ no arcs
posWrite = 1;
@@ -1205,7 +1211,13 @@ public final class FST<T> {
bytes[posWrite++] = b;
}
- public void setPosWrite(int posWrite) {
+ @Override
+ public int getPosition() {
+ return posWrite;
+ }
+
+ @Override
+ public void setPosition(int posWrite) {
this.posWrite = posWrite;
if (bytes.length < posWrite) {
assert bytes.length < Integer.MAX_VALUE: "FST too large (> 2.1 GB)";
@@ -1273,10 +1285,12 @@ public final class FST<T> {
}
}
+ @Override
public void skip(int count) {
pos -= count;
}
+ @Override
public void skip(int base, int count) {
pos = base - count;
}
@@ -1301,10 +1315,12 @@ public final class FST<T> {
pos += len;
}
+ @Override
public void skip(int count) {
pos += count;
}
+ @Override
public void skip(int base, int count) {
pos = base + count;
}
@@ -1436,7 +1452,7 @@ public final class FST<T> {
this.nodeRefToAddress = nodeRefToAddress;
this.outputs = outputs;
NO_OUTPUT = outputs.getNoOutput();
- writer = new BytesWriter();
+ writer = new DefaultBytesWriter();
}
/** Expert: creates an FST by packing this one. This
@@ -1451,7 +1467,7 @@ public final class FST<T> {
* However, this is not a strict implementation of the
* algorithms described in this paper.
*/
- public FST<T> pack(int minInCountDeref, int maxDerefNodes, float acceptableOverheadRatio) throws IOException {
+ FST<T> pack(int minInCountDeref, int maxDerefNodes, float acceptableOverheadRatio) throws IOException {
// TODO: other things to try
// - renumber the nodes to get more next / better locality?
@@ -1529,7 +1545,7 @@ public final class FST<T> {
// for assert:
boolean negDelta = false;
- writer.posWrite = 0;
+ writer.setPosition(0);
// Skip 0 byte since 0 is reserved target:
writer.writeByte((byte) 0);
@@ -1550,7 +1566,7 @@ public final class FST<T> {
// unchanged:
for(int node=nodeCount;node>=1;node--) {
fst.nodeCount++;
- final int address = writer.posWrite;
+ final int address = writer.getPosition();
//System.out.println(" node: " + node + " address=" + address);
if (address != newNodeAddress.get(node)) {
addressError = address - (int) newNodeAddress.get(node);
@@ -1592,7 +1608,7 @@ public final class FST<T> {
while(true) { // iterate over all arcs for this node
//System.out.println(" arc label=" + arc.label + " target=" + arc.target + " pos=" + writer.posWrite);
- final int arcStartPos = writer.posWrite;
+ final int arcStartPos = writer.getPosition();
nodeArcCount++;
byte flags = 0;
@@ -1639,7 +1655,7 @@ public final class FST<T> {
absPtr = topNodeMap.size() + (int) newNodeAddress.get(arc.target) + addressError;
}
- int delta = (int) newNodeAddress.get(arc.target) + addressError - writer.posWrite - 2;
+ int delta = (int) newNodeAddress.get(arc.target) + addressError - writer.getPosition() - 2;
if (delta < 0) {
//System.out.println("neg: " + delta);
anyNegDelta = true;
@@ -1669,7 +1685,7 @@ public final class FST<T> {
if (doWriteTarget) {
- int delta = (int) newNodeAddress.get(arc.target) + addressError - writer.posWrite;
+ int delta = (int) newNodeAddress.get(arc.target) + addressError - writer.getPosition();
if (delta < 0) {
anyNegDelta = true;
//System.out.println("neg: " + delta);
@@ -1702,7 +1718,7 @@ public final class FST<T> {
}
if (useArcArray) {
- final int arcBytes = writer.posWrite - arcStartPos;
+ final int arcBytes = writer.getPosition() - arcStartPos;
//System.out.println(" " + arcBytes + " bytes");
maxBytesPerArc = Math.max(maxBytesPerArc, arcBytes);
// NOTE: this may in fact go "backwards", if
@@ -1712,7 +1728,7 @@ public final class FST<T> {
// will retry (below) so it's OK to ovewrite
// bytes:
//wasted += bytesPerArc - arcBytes;
- writer.setPosWrite(arcStartPos + bytesPerArc);
+ writer.setPosition(arcStartPos + bytesPerArc);
}
if (arc.isLast()) {
@@ -1737,7 +1753,7 @@ public final class FST<T> {
// Retry:
bytesPerArc = maxBytesPerArc;
- writer.posWrite = address;
+ writer.setPosition(address);
nodeArcCount = 0;
retry = true;
anyNegDelta = false;
@@ -1784,9 +1800,9 @@ public final class FST<T> {
assert fst.arcCount == arcCount;
assert fst.arcWithOutputCount == arcWithOutputCount: "fst.arcWithOutputCount=" + fst.arcWithOutputCount + " arcWithOutputCount=" + arcWithOutputCount;
- final byte[] finalBytes = new byte[writer.posWrite];
+ final byte[] finalBytes = new byte[writer.getPosition()];
//System.out.println("resize " + fst.bytes.length + " down to " + writer.posWrite);
- System.arraycopy(fst.bytes, 0, finalBytes, 0, writer.posWrite);
+ System.arraycopy(fst.bytes, 0, finalBytes, 0, writer.getPosition());
fst.bytes = finalBytes;
fst.cacheRootArcs();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/mutable/MutableValue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/mutable/MutableValue.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/mutable/MutableValue.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/mutable/MutableValue.java Tue Jan 8 03:40:16 2013
@@ -34,6 +34,7 @@ public abstract class MutableValue imple
return exists;
}
+ @Override
public int compareTo(MutableValue other) {
Class<? extends MutableValue> c1 = this.getClass();
Class<? extends MutableValue> c2 = other.getClass();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java Tue Jan 8 03:40:16 2013
@@ -54,6 +54,7 @@ final class Direct16 extends PackedInts.
return values[index] & 0xFFFFL;
}
+ @Override
public void set(final int index, final long value) {
values[index] = (short) (value);
}
@@ -67,6 +68,7 @@ final class Direct16 extends PackedInts.
+ RamUsageEstimator.sizeOf(values);
}
+ @Override
public void clear() {
Arrays.fill(values, (short) 0L);
}
@@ -94,6 +96,7 @@ final class Direct16 extends PackedInts.
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java Tue Jan 8 03:40:16 2013
@@ -54,6 +54,7 @@ final class Direct32 extends PackedInts.
return values[index] & 0xFFFFFFFFL;
}
+ @Override
public void set(final int index, final long value) {
values[index] = (int) (value);
}
@@ -67,6 +68,7 @@ final class Direct32 extends PackedInts.
+ RamUsageEstimator.sizeOf(values);
}
+ @Override
public void clear() {
Arrays.fill(values, (int) 0L);
}
@@ -94,6 +96,7 @@ final class Direct32 extends PackedInts.
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java Tue Jan 8 03:40:16 2013
@@ -49,6 +49,7 @@ final class Direct64 extends PackedInts.
return values[index];
}
+ @Override
public void set(final int index, final long value) {
values[index] = (value);
}
@@ -62,6 +63,7 @@ final class Direct64 extends PackedInts.
+ RamUsageEstimator.sizeOf(values);
}
+ @Override
public void clear() {
Arrays.fill(values, 0L);
}
@@ -87,6 +89,7 @@ final class Direct64 extends PackedInts.
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java Tue Jan 8 03:40:16 2013
@@ -52,6 +52,7 @@ final class Direct8 extends PackedInts.M
return values[index] & 0xFFL;
}
+ @Override
public void set(final int index, final long value) {
values[index] = (byte) (value);
}
@@ -65,6 +66,7 @@ final class Direct8 extends PackedInts.M
+ RamUsageEstimator.sizeOf(values);
}
+ @Override
public void clear() {
Arrays.fill(values, (byte) 0L);
}
@@ -92,6 +94,7 @@ final class Direct8 extends PackedInts.M
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java Tue Jan 8 03:40:16 2013
@@ -40,14 +40,17 @@ public class GrowableWriter implements P
currentMaxValue = PackedInts.maxValue(current.getBitsPerValue());
}
+ @Override
public long get(int index) {
return current.get(index);
}
+ @Override
public int size() {
return current.size();
}
+ @Override
public int getBitsPerValue() {
return current.getBitsPerValue();
}
@@ -79,11 +82,13 @@ public class GrowableWriter implements P
currentMaxValue = PackedInts.maxValue(current.getBitsPerValue());
}
+ @Override
public void set(int index, long value) {
ensureCapacity(value);
current.set(index, value);
}
+ @Override
public void clear() {
current.clear();
}
@@ -95,6 +100,7 @@ public class GrowableWriter implements P
return next;
}
+ @Override
public int get(int index, long[] arr, int off, int len) {
return current.get(index, arr, off, len);
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java Tue Jan 8 03:40:16 2013
@@ -577,22 +577,27 @@ public class PackedInts {
this.valueCount = valueCount;
}
+ @Override
public int getBitsPerValue() {
return bitsPerValue;
}
+ @Override
public int size() {
return valueCount;
}
+ @Override
public Object getArray() {
return null;
}
+ @Override
public boolean hasArray() {
return false;
}
+ @Override
public int get(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
@@ -613,6 +618,7 @@ public class PackedInts {
super(valueCount, bitsPerValue);
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
@@ -625,6 +631,7 @@ public class PackedInts {
return len;
}
+ @Override
public void fill(int fromIndex, int toIndex, long val) {
assert val <= maxValue(bitsPerValue);
assert fromIndex <= toIndex;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java Tue Jan 8 03:40:16 2013
@@ -224,8 +224,11 @@ public class TestCharTermAttributeImpl e
// finally use a completely custom CharSequence that is not catched by instanceof checks
final String longTestString = "012345678901234567890123456789";
t.append(new CharSequence() {
+ @Override
public char charAt(int i) { return longTestString.charAt(i); }
+ @Override
public int length() { return longTestString.length(); }
+ @Override
public CharSequence subSequence(int start, int end) { return longTestString.subSequence(start, end); }
@Override
public String toString() { return longTestString; }
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java Tue Jan 8 03:40:16 2013
@@ -23,6 +23,7 @@ import com.carrotsearch.randomizedtestin
public abstract class AbstractTestLZ4CompressionMode extends AbstractTestCompressionMode {
+ @Override
public byte[] test(byte[] decompressed) throws IOException {
final byte[] compressed = super.test(decompressed);
int off = 0;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java Tue Jan 8 03:40:16 2013
@@ -54,6 +54,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.junit.Test;
import com.carrotsearch.randomizedtesting.generators.RandomInts;
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -66,6 +67,7 @@ public class TestCompressingStoredFields
IndexWriterConfig iwConf;
private RandomIndexWriter iw;
+ @Override
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
@@ -75,6 +77,7 @@ public class TestCompressingStoredFields
iw = new RandomIndexWriter(random(), dir, iwConf);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
IOUtils.close(iw, dir);
@@ -360,5 +363,46 @@ public class TestCompressingStoredFields
}
rd.close();
}
+
+ @Test(expected=IllegalArgumentException.class)
+ public void testDeletePartiallyWrittenFilesIfAbort() throws IOException {
+ // disable CFS because this test checks file names
+ iwConf.setMergePolicy(newLogMergePolicy(false));
+ iw.close();
+ iw = new RandomIndexWriter(random(), dir, iwConf);
+
+ final Document validDoc = new Document();
+ validDoc.add(new IntField("id", 0, Store.YES));
+ iw.addDocument(validDoc);
+ iw.commit();
+
+ // make sure that #writeField will fail to trigger an abort
+ final Document invalidDoc = new Document();
+ FieldType fieldType = new FieldType();
+ fieldType.setStored(true);
+ invalidDoc.add(new Field("invalid", fieldType) {
+
+ @Override
+ public String stringValue() {
+ return null;
+ }
+
+ });
+
+ try {
+ iw.addDocument(invalidDoc);
+ iw.commit();
+ }
+ finally {
+ int counter = 0;
+ for (String fileName : dir.listAll()) {
+ if (fileName.endsWith(".fdt") || fileName.endsWith(".fdx")) {
+ counter++;
+ }
+ }
+ // Only one .fdt and one .fdx files must have been found
+ assertEquals(2, counter);
+ }
+ }
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java Tue Jan 8 03:40:16 2013
@@ -19,6 +19,7 @@ package org.apache.lucene.codecs.compres
public class TestFastCompressionMode extends AbstractTestLZ4CompressionMode {
+ @Override
public void setUp() throws Exception {
super.setUp();
mode = CompressionMode.FAST;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java Tue Jan 8 03:40:16 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
public class TestFastDecompressionMode extends AbstractTestLZ4CompressionMode {
+ @Override
public void setUp() throws Exception {
super.setUp();
mode = CompressionMode.FAST_DECOMPRESSION;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java Tue Jan 8 03:40:16 2013
@@ -20,6 +20,7 @@ package org.apache.lucene.codecs.compres
public class TestHighCompressionMode extends AbstractTestCompressionMode {
+ @Override
public void setUp() throws Exception {
super.setUp();
mode = CompressionMode.HIGH_COMPRESSION;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java Tue Jan 8 03:40:16 2013
@@ -58,7 +58,7 @@ public class TestReuseDocsEnum extends L
IdentityHashMap<DocsEnum, Boolean> enums = new IdentityHashMap<DocsEnum, Boolean>();
MatchNoBits bits = new Bits.MatchNoBits(indexReader.maxDoc());
while ((iterator.next()) != null) {
- DocsEnum docs = iterator.docs(random().nextBoolean() ? bits : new Bits.MatchNoBits(indexReader.maxDoc()), null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ DocsEnum docs = iterator.docs(random().nextBoolean() ? bits : new Bits.MatchNoBits(indexReader.maxDoc()), null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
@@ -85,7 +85,7 @@ public class TestReuseDocsEnum extends L
MatchNoBits bits = new Bits.MatchNoBits(open.maxDoc());
DocsEnum docs = null;
while ((iterator.next()) != null) {
- docs = iterator.docs(bits, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ docs = iterator.docs(bits, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
@@ -94,7 +94,7 @@ public class TestReuseDocsEnum extends L
iterator = terms.iterator(null);
docs = null;
while ((iterator.next()) != null) {
- docs = iterator.docs(new Bits.MatchNoBits(open.maxDoc()), docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ docs = iterator.docs(new Bits.MatchNoBits(open.maxDoc()), docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
assertEquals(terms.size(), enums.size());
@@ -103,7 +103,7 @@ public class TestReuseDocsEnum extends L
iterator = terms.iterator(null);
docs = null;
while ((iterator.next()) != null) {
- docs = iterator.docs(null, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ docs = iterator.docs(null, docs, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
assertEquals(1, enums.size());
@@ -135,7 +135,7 @@ public class TestReuseDocsEnum extends L
DocsEnum docs = null;
BytesRef term = null;
while ((term = iterator.next()) != null) {
- docs = iterator.docs(null, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ docs = iterator.docs(null, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
assertEquals(terms.size(), enums.size());
@@ -144,7 +144,7 @@ public class TestReuseDocsEnum extends L
enums.clear();
docs = null;
while ((term = iterator.next()) != null) {
- docs = iterator.docs(bits, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ docs = iterator.docs(bits, randomDocsEnum("body", term, leaves2, bits), random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
enums.put(docs, true);
}
assertEquals(terms.size(), enums.size());
@@ -163,7 +163,7 @@ public class TestReuseDocsEnum extends L
}
TermsEnum iterator = terms.iterator(null);
if (iterator.seekExact(term, true)) {
- return iterator.docs(bits, null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : 0);
+ return iterator.docs(bits, null, random().nextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE);
}
return null;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java Tue Jan 8 03:40:16 2013
@@ -332,17 +332,17 @@ public class TestBlockPostingsFormat3 ex
rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsAndPositionsEnum.FLAG_OFFSETS));
// with positions only
- assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, 0),
- rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, 0));
- assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, 0),
- rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, 0));
+ assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE),
+ rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE));
+ assertDocsAndPositionsEnum(leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE),
+ rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE));
assertPositionsSkipping(leftTermsEnum.docFreq(),
- leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, 0),
- rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, 0));
+ leftPositions = leftTermsEnum.docsAndPositions(null, leftPositions, DocsEnum.FLAG_NONE),
+ rightPositions = rightTermsEnum.docsAndPositions(null, rightPositions, DocsEnum.FLAG_NONE));
assertPositionsSkipping(leftTermsEnum.docFreq(),
- leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, 0),
- rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, 0));
+ leftPositions = leftTermsEnum.docsAndPositions(randomBits, leftPositions, DocsEnum.FLAG_NONE),
+ rightPositions = rightTermsEnum.docsAndPositions(randomBits, rightPositions, DocsEnum.FLAG_NONE));
// with freqs:
assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs),
@@ -351,10 +351,10 @@ public class TestBlockPostingsFormat3 ex
rightDocs = rightTermsEnum.docs(randomBits, rightDocs));
// w/o freqs:
- assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, 0),
- rightDocs = rightTermsEnum.docs(null, rightDocs, 0));
- assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0),
- rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0));
+ assertDocsEnum(leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE),
+ rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE));
+ assertDocsEnum(leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE),
+ rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE));
// with freqs:
assertDocsSkipping(leftTermsEnum.docFreq(),
@@ -366,11 +366,11 @@ public class TestBlockPostingsFormat3 ex
// w/o freqs:
assertDocsSkipping(leftTermsEnum.docFreq(),
- leftDocs = leftTermsEnum.docs(null, leftDocs, 0),
- rightDocs = rightTermsEnum.docs(null, rightDocs, 0));
+ leftDocs = leftTermsEnum.docs(null, leftDocs, DocsEnum.FLAG_NONE),
+ rightDocs = rightTermsEnum.docs(null, rightDocs, DocsEnum.FLAG_NONE));
assertDocsSkipping(leftTermsEnum.docFreq(),
- leftDocs = leftTermsEnum.docs(randomBits, leftDocs, 0),
- rightDocs = rightTermsEnum.docs(randomBits, rightDocs, 0));
+ leftDocs = leftTermsEnum.docs(randomBits, leftDocs, DocsEnum.FLAG_NONE),
+ rightDocs = rightTermsEnum.docs(randomBits, rightDocs, DocsEnum.FLAG_NONE));
}
}
assertNull(rightTermsEnum.next());
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/document/TestDocument.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/document/TestDocument.java Tue Jan 8 03:40:16 2013
@@ -20,13 +20,9 @@ package org.apache.lucene.document;
import java.io.StringReader;
import java.util.List;
-import org.apache.lucene.analysis.EmptyTokenizer;
-import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.StorableField;
import org.apache.lucene.index.StoredDocument;
@@ -318,7 +314,7 @@ public class TestDocument extends Lucene
// LUCENE-3616
public void testInvalidFields() {
try {
- new Field("foo", new EmptyTokenizer(new StringReader("")), StringField.TYPE_STORED);
+ new Field("foo", new MockTokenizer(new StringReader("")), StringField.TYPE_STORED);
fail("did not hit expected exc");
} catch (IllegalArgumentException iae) {
// expected
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/BinaryTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/BinaryTokenStream.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/BinaryTokenStream.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/BinaryTokenStream.java Tue Jan 8 03:40:16 2013
@@ -58,18 +58,22 @@ public final class BinaryTokenStream ext
public static class ByteTermAttributeImpl extends AttributeImpl implements ByteTermAttribute,TermToBytesRefAttribute {
private BytesRef bytes;
+ @Override
public int fillBytesRef() {
return bytes.hashCode();
}
+ @Override
public BytesRef getBytesRef() {
return bytes;
}
+ @Override
public void setBytesRef(BytesRef bytes) {
this.bytes = bytes;
}
+ @Override
public void clear() {}
@Override
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Tue Jan 8 03:40:16 2013
@@ -86,10 +86,12 @@ public class Test2BTerms extends LuceneT
}
private final static class MyTermAttributeImpl extends AttributeImpl implements TermToBytesRefAttribute {
+ @Override
public int fillBytesRef() {
return bytes.hashCode();
}
+ @Override
public BytesRef getBytesRef() {
return bytes;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Tue Jan 8 03:40:16 2013
@@ -537,7 +537,7 @@ public class TestAddIndexes extends Luce
private void verifyTermDocs(Directory dir, Term term, int numDocs)
throws IOException {
IndexReader reader = DirectoryReader.open(dir);
- DocsEnum docsEnum = _TestUtil.docs(random(), reader, term.field, term.bytes, null, null, 0);
+ DocsEnum docsEnum = _TestUtil.docs(random(), reader, term.field, term.bytes, null, null, DocsEnum.FLAG_NONE);
int count = 0;
while (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS)
count++;
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Tue Jan 8 03:40:16 2013
@@ -730,7 +730,7 @@ public class TestBackwardsCompatibility
// should be found exactly
assertEquals(TermsEnum.SeekStatus.FOUND,
terms.seekCeil(aaaTerm));
- assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, 0)));
+ assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, DocsEnum.FLAG_NONE)));
assertNull(terms.next());
// should hit end of field
@@ -742,12 +742,12 @@ public class TestBackwardsCompatibility
assertEquals(TermsEnum.SeekStatus.NOT_FOUND,
terms.seekCeil(new BytesRef("a")));
assertTrue(terms.term().bytesEquals(aaaTerm));
- assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, 0)));
+ assertEquals(35, countDocs(_TestUtil.docs(random(), terms, null, null, DocsEnum.FLAG_NONE)));
assertNull(terms.next());
assertEquals(TermsEnum.SeekStatus.FOUND,
terms.seekCeil(aaaTerm));
- assertEquals(35, countDocs(_TestUtil.docs(random(), terms,null, null, 0)));
+ assertEquals(35, countDocs(_TestUtil.docs(random(), terms,null, null, DocsEnum.FLAG_NONE)));
assertNull(terms.next());
r.close();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Tue Jan 8 03:40:16 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
@@ -31,7 +32,9 @@ import org.apache.lucene.codecs.TermStat
import org.apache.lucene.codecs.TermsConsumer;
import org.apache.lucene.codecs.mocksep.MockSepPostingsFormat;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.search.DocIdSetIterator;
@@ -100,6 +103,7 @@ public class TestCodecs extends LuceneTe
Arrays.sort(terms);
}
+ @Override
public int compareTo(final FieldData other) {
return fieldInfo.name.compareTo(other.fieldInfo.name);
}
@@ -145,6 +149,7 @@ public class TestCodecs extends LuceneTe
this.positions = positions;
}
+ @Override
public int compareTo(final TermData o) {
return text.compareTo(o.text);
}
@@ -277,7 +282,7 @@ public class TestCodecs extends LuceneTe
// make sure it properly fully resets (rewinds) its
// internal state:
for(int iter=0;iter<2;iter++) {
- docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, 0);
+ docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE);
assertEquals(terms[i].docs[0], docsEnum.nextDoc());
assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc());
}
@@ -474,7 +479,7 @@ public class TestCodecs extends LuceneTe
assertEquals(status, TermsEnum.SeekStatus.FOUND);
assertEquals(term.docs.length, termsEnum.docFreq());
if (field.omitTF) {
- this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, 0), false);
+ this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false);
} else {
this.verifyDocs(term.docs, term.positions, termsEnum.docsAndPositions(null, null), true);
}
@@ -494,7 +499,7 @@ public class TestCodecs extends LuceneTe
assertTrue(termsEnum.term().bytesEquals(new BytesRef(term.text2)));
assertEquals(term.docs.length, termsEnum.docFreq());
if (field.omitTF) {
- this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, 0), false);
+ this.verifyDocs(term.docs, term.positions, _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false);
} else {
this.verifyDocs(term.docs, term.positions, termsEnum.docsAndPositions(null, null), true);
}
@@ -557,7 +562,7 @@ public class TestCodecs extends LuceneTe
} else {
postings = null;
docsAndFreqs = null;
- docs = _TestUtil.docs(random(), termsEnum, null, null, 0);
+ docs = _TestUtil.docs(random(), termsEnum, null, null, DocsEnum.FLAG_NONE);
}
assertNotNull(docs);
int upto2 = -1;
@@ -628,4 +633,33 @@ public class TestCodecs extends LuceneTe
}
consumer.close();
}
+
+ public void testDocsOnlyFreq() throws Exception {
+ // tests that when fields are indexed with DOCS_ONLY, the Codec
+ // returns 1 in docsEnum.freq()
+ Directory dir = newDirectory();
+ Random random = random();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
+ TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ // we don't need many documents to assert this, but don't use one document either
+ int numDocs = atLeast(random, 50);
+ for (int i = 0; i < numDocs; i++) {
+ Document doc = new Document();
+ doc.add(new StringField("f", "doc", Store.NO));
+ writer.addDocument(doc);
+ }
+ writer.close();
+
+ Term term = new Term("f", new BytesRef("doc"));
+ DirectoryReader reader = DirectoryReader.open(dir);
+ for (AtomicReaderContext ctx : reader.leaves()) {
+ DocsEnum de = ctx.reader().termDocsEnum(term);
+ while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
+ assertEquals("wrong freq for doc " + de.docID(), 1, de.freq());
+ }
+ }
+ reader.close();
+
+ dir.close();
+ }
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java Tue Jan 8 03:40:16 2013
@@ -61,10 +61,12 @@ public class TestDeletionPolicy extends
int numOnInit;
int numOnCommit;
Directory dir;
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
verifyCommitOrder(commits);
numOnInit++;
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {
IndexCommit lastCommit = commits.get(commits.size()-1);
DirectoryReader r = DirectoryReader.open(dir);
@@ -82,6 +84,7 @@ public class TestDeletionPolicy extends
class KeepNoneOnInitDeletionPolicy implements IndexDeletionPolicy {
int numOnInit;
int numOnCommit;
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
verifyCommitOrder(commits);
numOnInit++;
@@ -91,6 +94,7 @@ public class TestDeletionPolicy extends
assertTrue(commit.isDeleted());
}
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {
verifyCommitOrder(commits);
int size = commits.size();
@@ -113,6 +117,7 @@ public class TestDeletionPolicy extends
this.numToKeep = numToKeep;
}
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
if (VERBOSE) {
System.out.println("TEST: onInit");
@@ -123,6 +128,7 @@ public class TestDeletionPolicy extends
doDeletes(commits, false);
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {
if (VERBOSE) {
System.out.println("TEST: onCommit");
@@ -170,11 +176,13 @@ public class TestDeletionPolicy extends
this.expirationTimeSeconds = seconds;
}
+ @Override
public void onInit(List<? extends IndexCommit> commits) throws IOException {
verifyCommitOrder(commits);
onCommit(commits);
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) throws IOException {
verifyCommitOrder(commits);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Tue Jan 8 03:40:16 2013
@@ -716,7 +716,9 @@ public void testFilesOpenClose() throws
// DirectoryReader on a non-existent directory, you get a
// good exception
public void testNoDir() throws Throwable {
- Directory dir = newFSDirectory(_TestUtil.getTempDir("doesnotexist"));
+ File tempDir = _TestUtil.getTempDir("doesnotexist");
+ _TestUtil.rmDir(tempDir);
+ Directory dir = newFSDirectory(tempDir);
try {
DirectoryReader.open(dir);
fail("did not hit expected exception");
@@ -961,6 +963,7 @@ public void testFilesOpenClose() throws
final DirectoryReader reader = writer.getReader();
final int[] closeCount = new int[1];
final IndexReader.ReaderClosedListener listener = new IndexReader.ReaderClosedListener() {
+ @Override
public void onClose(IndexReader reader) {
closeCount[0]++;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java Tue Jan 8 03:40:16 2013
@@ -534,8 +534,10 @@ public class TestDirectoryReaderReopen e
}
static class KeepAllCommits implements IndexDeletionPolicy {
+ @Override
public void onInit(List<? extends IndexCommit> commits) {
}
+ @Override
public void onCommit(List<? extends IndexCommit> commits) {
}
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java Tue Jan 8 03:40:16 2013
@@ -70,7 +70,7 @@ public class TestDocCount extends Lucene
FixedBitSet visited = new FixedBitSet(ir.maxDoc());
TermsEnum te = terms.iterator(null);
while (te.next() != null) {
- DocsEnum de = _TestUtil.docs(random(), te, null, null, 0);
+ DocsEnum de = _TestUtil.docs(random(), te, null, null, DocsEnum.FLAG_NONE);
while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
visited.set(de.docID());
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Tue Jan 8 03:40:16 2013
@@ -334,7 +334,7 @@ public class TestDocsAndPositions extend
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
AtomicReader r = getOnlySegmentReader(reader);
- DocsEnum disi = _TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, 0);
+ DocsEnum disi = _TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE);
int docid = disi.docID();
assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
@@ -342,7 +342,7 @@ public class TestDocsAndPositions extend
// now reuse and check again
TermsEnum te = r.terms("foo").iterator(null);
assertTrue(te.seekExact(new BytesRef("bar"), true));
- disi = _TestUtil.docs(random(), te, null, disi, 0);
+ disi = _TestUtil.docs(random(), te, null, disi, DocsEnum.FLAG_NONE);
docid = disi.docID();
assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java Tue Jan 8 03:40:16 2013
@@ -155,6 +155,7 @@ public class TestDocumentsWriterDeleteQu
ReentrantLock lock = (ReentrantLock) field.get(queue);
lock.lock();
Thread t = new Thread() {
+ @Override
public void run() {
queue.addDelete(new Term("foo", "bar"));
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java?rev=1430130&r1=1430129&r2=1430130&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java Tue Jan 8 03:40:16 2013
@@ -62,6 +62,7 @@ public class TestDocumentsWriterStallCon
for (int i = 0; i < stallThreads.length; i++) {
final int stallProbability = 1 +random().nextInt(10);
stallThreads[i] = new Thread() {
+ @Override
public void run() {
int iters = atLeast(1000);
@@ -220,6 +221,7 @@ public class TestDocumentsWriterStallCon
this.exceptions = exceptions;
}
+ @Override
public void run() {
try {
while (!stop.get()) {
@@ -261,6 +263,7 @@ public class TestDocumentsWriterStallCon
this.exceptions = exceptions;
}
+ @Override
public void run() {
try {
@@ -318,6 +321,7 @@ public class TestDocumentsWriterStallCon
Thread[] array = new Thread[num];
for (int i = 0; i < array.length; i++) {
array[i] = new Thread() {
+ @Override
public void run() {
ctrl.waitIfStalled();
}