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/08/31 15:55:26 UTC
svn commit: r1379450 - in /lucene/dev/trunk/lucene:
benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/
core/src/java/org/apache/lucene/codecs/lucene40/
core/src/java/org/apache/lucene/document/
core/src/java/org/apache/lucene/index/ core/src/...
Author: uschindler
Date: Fri Aug 31 13:55:25 2012
New Revision: 1379450
URL: http://svn.apache.org/viewvc?rev=1379450&view=rev
Log:
Turn some "assert false" in switch and switch-like statements into AssertionErrors. If we get into the default block we are wrong and we can also throw Ex, because then there is logic error (e.g. after new enum constant was added)
Modified:
lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Field.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
Modified: lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Fri Aug 31 13:55:25 2012
@@ -170,7 +170,7 @@ public class DocMaker implements Closeab
f = new DoubleField(name, 0.0, Field.Store.NO);
break;
default:
- assert false;
+ throw new AssertionError("Cannot get here");
}
if (reuseFields) {
numericFields.put(name, f);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java Fri Aug 31 13:55:25 2012
@@ -186,7 +186,7 @@ public final class Lucene40StoredFieldsW
} else if (number instanceof Double) {
fieldsStream.writeLong(Double.doubleToLongBits(number.doubleValue()));
} else {
- assert false;
+ throw new AssertionError("Cannot get here");
}
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Field.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/Field.java Fri Aug 31 13:55:25 2012
@@ -521,7 +521,7 @@ public class Field implements IndexableF
nts.setDoubleValue(val.doubleValue());
break;
default:
- assert false : "Should never get here";
+ throw new AssertionError("Should never get here");
}
return internalTokenStream;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java Fri Aug 31 13:55:25 2012
@@ -365,7 +365,7 @@ final class DocumentsWriter {
if (!perThread.isActive()) {
ensureOpen();
- assert false: "perThread is not active but we are still open";
+ throw new IllegalStateException("perThread is not active but we are still open");
}
final DocumentsWriterPerThread dwpt = perThread.dwpt;
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java Fri Aug 31 13:55:25 2012
@@ -324,7 +324,7 @@ final class DocumentsWriterDeleteQueue {
.newUpdater(Node.class, Node.class, "next");
void apply(BufferedDeletes bufferedDeletes, int docIDUpto) {
- assert false : "sentinel item must never be applied";
+ throw new IllegalStateException("sentinel item must never be applied");
}
boolean casNext(Node<?> cmp, Node<?> val) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java Fri Aug 31 13:55:25 2012
@@ -401,8 +401,8 @@ public final class MultiTermsEnum extend
subDocs[upto].slice = entry.subSlice;
upto++;
} else {
- // One of our subs cannot provide a docsenum:
- assert false;
+ // should this be an error?
+ assert false : "One of our subs cannot provide a docsenum";
}
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java Fri Aug 31 13:55:25 2012
@@ -362,8 +362,7 @@ public abstract class BufferedIndexInput
case MERGE:
return MERGE_BUFFER_SIZE;
default:
- assert false : "unknown IOContext " + context.context;
- return BUFFER_SIZE;
+ throw new AssertionError("unknown IOContext " + context.context);
}
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1379450&r1=1379449&r2=1379450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Fri Aug 31 13:55:25 2012
@@ -223,7 +223,7 @@ public class TestNumericQueryParser exte
field = new DoubleField(type.name(), 0.0, ft);
break;
default:
- assert false;
+ fail();
field = null;
}
numericFieldMap.put(type.name(), field);