You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2010/01/12 01:03:03 UTC
svn commit: r898124 - in /lucene/solr/trunk: CHANGES.txt
src/java/org/apache/solr/schema/FieldProperties.java
Author: hossman
Date: Tue Jan 12 00:03:03 2010
New Revision: 898124
URL: http://svn.apache.org/viewvc?rev=898124&view=rev
Log:
SOLR-1588: Removed some very old dead code.
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/schema/FieldProperties.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=898124&r1=898123&r2=898124&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Tue Jan 12 00:03:03 2010
@@ -200,7 +200,9 @@
(an extremeely small) potential for deadlock.
(gabriele renzi via hossman)
-
+* SOLR-1588: Removed some very old dead code.
+ (Chris A. Mattmann via hossman)
+
Build
----------------------
Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/FieldProperties.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/FieldProperties.java?rev=898124&r1=898123&r2=898124&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/FieldProperties.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/FieldProperties.java Tue Jan 12 00:03:03 2010
@@ -99,40 +99,6 @@
return (bitfield & props) == 0;
}
- /***
- static int normalize(int properties) {
- int p = properties;
- if (on(p,TOKENIZED) && off(p,INDEXED)) {
- throw new RuntimeException("field must be indexed to be tokenized.");
- }
-
- if (on(p,STORE_TERMPOSITIONS)) p|=STORE_TERMVECTORS;
- if (on(p,STORE_TERMOFFSETS)) p|=STORE_TERMVECTORS;
- if (on(p,STORE_TERMOFFSETS) && off(p,INDEXED)) {
- throw new RuntimeException("field must be indexed to store term vectors.");
- }
-
- if (on(p,OMIT_NORMS) && off(p,INDEXED)) {
- throw new RuntimeException("field must be indexed for norms to be omitted.");
- }
-
- if (on(p,SORT_MISSING_FIRST) && on(p,SORT_MISSING_LAST)) {
- throw new RuntimeException("conflicting options sortMissingFirst,sortMissingLast.");
- }
-
- if ((on(p,SORT_MISSING_FIRST) || on(p,SORT_MISSING_LAST)) && off(p,INDEXED)) {
- throw new RuntimeException("field must be indexed to be sorted.");
- }
-
- if ((on(p,BINARY) || on(p,COMPRESSED)) && off(p,STORED)) {
- throw new RuntimeException("field must be stored for compressed or binary options.");
- }
-
- return p;
- }
- ***/
-
-
static int parseProperties(Map<String,String> properties, boolean which) {
int props = 0;
for (Map.Entry<String, String> entry : properties.entrySet()) {