You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2012/09/17 18:02:02 UTC
svn commit: r1386681 [6/8] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound...
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java Mon Sep 17 16:01:56 2012
@@ -54,11 +54,12 @@ public abstract class DualFloatFunction
return new FloatDocValues(this) {
@Override
public float floatVal(int doc) {
- return func(doc, aVals, bVals);
+ return func(doc, aVals, bVals);
}
+
@Override
public String toString(int doc) {
- return name() + '(' + aVals.toString(doc) + ',' + bVals.toString(doc) + ')';
+ return name() + '(' + aVals.toString(doc) + ',' + bVals.toString(doc) + ')';
}
};
}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java Mon Sep 17 16:01:56 2012
@@ -50,7 +50,7 @@ public abstract class MultiBoolFunction
return new BoolDocValues(this) {
@Override
public boolean boolVal(int doc) {
- return func(doc, vals);
+ return func(doc, vals);
}
@Override
@@ -105,4 +105,4 @@ public abstract class MultiBoolFunction
source.createWeight(context, searcher);
}
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java Mon Sep 17 16:01:56 2012
@@ -115,11 +115,11 @@ public class ScaleFloatFunction extends
return new FloatDocValues(this) {
@Override
public float floatVal(int doc) {
- return (vals.floatVal(doc) - minSource) * scale + min;
+ return (vals.floatVal(doc) - minSource) * scale + min;
}
@Override
public String toString(int doc) {
- return "scale(" + vals.toString(doc) + ",toMin=" + min + ",toMax=" + max
+ return "scale(" + vals.toString(doc) + ",toMin=" + min + ",toMax=" + max
+ ",fromMin=" + minSource
+ ",fromMax=" + maxSource
+ ")";
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java Mon Sep 17 16:01:56 2012
@@ -44,11 +44,11 @@ public abstract class SimpleBoolFunction
return new BoolDocValues(this) {
@Override
public boolean boolVal(int doc) {
- return func(doc, vals);
+ return func(doc, vals);
}
@Override
public String toString(int doc) {
- return name() + '(' + vals.toString(doc) + ')';
+ return name() + '(' + vals.toString(doc) + ')';
}
};
}
@@ -74,4 +74,4 @@ public abstract class SimpleBoolFunction
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
source.createWeight(context, searcher);
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java (original)
+++ lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java Mon Sep 17 16:01:56 2012
@@ -40,11 +40,11 @@ import java.util.Map;
return new FloatDocValues(this) {
@Override
public float floatVal(int doc) {
- return func(doc, vals);
+ return func(doc, vals);
}
@Override
public String toString(int doc) {
- return name() + '(' + vals.toString(doc) + ')';
+ return name() + '(' + vals.toString(doc) + ')';
}
};
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java Mon Sep 17 16:01:56 2012
@@ -29,13 +29,13 @@ import java.io.*;
public final class FastCharStream implements CharStream {
char[] buffer = null;
- int bufferLength = 0; // end of valid chars
- int bufferPosition = 0; // next char to read
+ int bufferLength = 0; // end of valid chars
+ int bufferPosition = 0; // next char to read
- int tokenStart = 0; // offset in buffer
- int bufferStart = 0; // position in file of buffer
+ int tokenStart = 0; // offset in buffer
+ int bufferStart = 0; // position in file of buffer
- Reader input; // source of chars
+ Reader input; // source of chars
/** Constructs from a Reader. */
public FastCharStream(Reader r) {
@@ -51,24 +51,24 @@ public final class FastCharStream implem
private final void refill() throws IOException {
int newPosition = bufferLength - tokenStart;
- if (tokenStart == 0) { // token won't fit in buffer
- if (buffer == null) { // first time: alloc buffer
- buffer = new char[2048];
+ if (tokenStart == 0) { // token won't fit in buffer
+ if (buffer == null) { // first time: alloc buffer
+ buffer = new char[2048];
} else if (bufferLength == buffer.length) { // grow buffer
- char[] newBuffer = new char[buffer.length*2];
- System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
- buffer = newBuffer;
+ char[] newBuffer = new char[buffer.length*2];
+ System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
+ buffer = newBuffer;
}
- } else { // shift token to front
+ } else { // shift token to front
System.arraycopy(buffer, tokenStart, buffer, 0, newPosition);
}
- bufferLength = newPosition; // update state
+ bufferLength = newPosition; // update state
bufferPosition = newPosition;
bufferStart += tokenStart;
tokenStart = 0;
- int charsRead = // fill space in buffer
+ int charsRead = // fill space in buffer
input.read(buffer, newPosition, buffer.length-newPosition);
if (charsRead == -1)
throw new IOException("read past eof");
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java Mon Sep 17 16:01:56 2012
@@ -166,10 +166,10 @@ public class QueryParser extends QueryPa
// This makes sure that there is no garbage after the query string
final public Query TopLevelQuery(String field) throws ParseException {
- Query q;
+ Query q;
q = Query(field);
jj_consume_token(0);
- {if (true) return q;}
+ {if (true) return q;}
throw new Error("Missing return statement in function");
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj Mon Sep 17 16:01:56 2012
@@ -211,13 +211,13 @@ int Modifiers() : {
// This makes sure that there is no garbage after the query string
Query TopLevelQuery(String field) :
{
- Query q;
+ Query q;
}
{
- q=Query(field) <EOF>
- {
- return q;
- }
+ q=Query(field) <EOF>
+ {
+ return q;
+ }
}
Query Query(String field) :
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java Mon Sep 17 16:01:56 2012
@@ -179,12 +179,12 @@ public class FieldQueryNode extends Quer
}
- public CharSequence getValue() {
- return getText();
- }
+ public CharSequence getValue() {
+ return getText();
+ }
- public void setValue(CharSequence value) {
- setText(value);
- }
+ public void setValue(CharSequence value) {
+ setText(value);
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java Mon Sep 17 16:01:56 2012
@@ -29,13 +29,13 @@ import java.io.*;
public final class FastCharStream implements CharStream {
char[] buffer = null;
- int bufferLength = 0; // end of valid chars
- int bufferPosition = 0; // next char to read
+ int bufferLength = 0; // end of valid chars
+ int bufferPosition = 0; // next char to read
- int tokenStart = 0; // offset in buffer
- int bufferStart = 0; // position in file of buffer
+ int tokenStart = 0; // offset in buffer
+ int bufferStart = 0; // position in file of buffer
- Reader input; // source of chars
+ Reader input; // source of chars
/** Constructs from a Reader. */
public FastCharStream(Reader r) {
@@ -51,24 +51,24 @@ public final class FastCharStream implem
private final void refill() throws IOException {
int newPosition = bufferLength - tokenStart;
- if (tokenStart == 0) { // token won't fit in buffer
- if (buffer == null) { // first time: alloc buffer
- buffer = new char[2048];
+ if (tokenStart == 0) { // token won't fit in buffer
+ if (buffer == null) { // first time: alloc buffer
+ buffer = new char[2048];
} else if (bufferLength == buffer.length) { // grow buffer
- char[] newBuffer = new char[buffer.length*2];
- System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
- buffer = newBuffer;
+ char[] newBuffer = new char[buffer.length * 2];
+ System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
+ buffer = newBuffer;
}
- } else { // shift token to front
+ } else { // shift token to front
System.arraycopy(buffer, tokenStart, buffer, 0, newPosition);
}
- bufferLength = newPosition; // update state
+ bufferLength = newPosition; // update state
bufferPosition = newPosition;
bufferStart += tokenStart;
tokenStart = 0;
- int charsRead = // fill space in buffer
+ int charsRead = // fill space in buffer
input.read(buffer, newPosition, buffer.length-newPosition);
if (charsRead == -1)
throw new IOException("read past eof");
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java Mon Sep 17 16:01:56 2012
@@ -45,14 +45,14 @@ import org.apache.lucene.queryparser.fle
*/
public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants {
- private static final int CONJ_NONE =0;
- private static final int CONJ_AND =2;
- private static final int CONJ_OR =2;
+ private static final int CONJ_NONE =0;
+ private static final int CONJ_AND =2;
+ private static final int CONJ_OR =2;
// syntax parser constructor
public StandardSyntaxParser() {
- this(new FastCharStream(new StringReader("")));
+ this(new FastCharStream(new StringReader("")));
}
/** Parses a query string, returning a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.
* @param query the query string to be parsed.
@@ -143,10 +143,10 @@ public class StandardSyntaxParser implem
// This makes sure that there is no garbage after the query string
final public QueryNode TopLevelQuery(CharSequence field) throws ParseException {
- QueryNode q;
+ QueryNode q;
q = Query(field);
jj_consume_token(0);
- {if (true) return q;}
+ {if (true) return q;}
throw new Error("Missing return statement in function");
}
@@ -184,23 +184,23 @@ public class StandardSyntaxParser implem
break label_1;
}
c = DisjQuery(field);
- if (clauses == null) {
- clauses = new Vector<QueryNode>();
- clauses.addElement(first);
- }
- clauses.addElement(c);
+ if (clauses == null) {
+ clauses = new Vector<QueryNode>();
+ clauses.addElement(first);
+ }
+ clauses.addElement(c);
}
if (clauses != null) {
- {if (true) return new BooleanQueryNode(clauses);}
- } else {
- {if (true) return first;}
- }
+ {if (true) return new BooleanQueryNode(clauses);}
+ } else {
+ {if (true) return first;}
+ }
throw new Error("Missing return statement in function");
}
final public QueryNode DisjQuery(CharSequence field) throws ParseException {
- QueryNode first, c;
- Vector<QueryNode> clauses = null;
+ QueryNode first, c;
+ Vector<QueryNode> clauses = null;
first = ConjQuery(field);
label_2:
while (true) {
@@ -221,7 +221,7 @@ public class StandardSyntaxParser implem
clauses.addElement(c);
}
if (clauses != null) {
- {if (true) return new OrQueryNode(clauses);}
+ {if (true) return new OrQueryNode(clauses);}
} else {
{if (true) return first;}
}
@@ -229,8 +229,8 @@ public class StandardSyntaxParser implem
}
final public QueryNode ConjQuery(CharSequence field) throws ParseException {
- QueryNode first, c;
- Vector<QueryNode> clauses = null;
+ QueryNode first, c;
+ Vector<QueryNode> clauses = null;
first = ModClause(field);
label_3:
while (true) {
@@ -251,7 +251,7 @@ public class StandardSyntaxParser implem
clauses.addElement(c);
}
if (clauses != null) {
- {if (true) return new AndQueryNode(clauses);}
+ {if (true) return new AndQueryNode(clauses);}
} else {
{if (true) return first;}
}
@@ -272,27 +272,27 @@ public class StandardSyntaxParser implem
// if (mods == ModifierQueryNode.Modifier.MOD_NONE) firstQuery=q;
//
// // do not create modifier nodes with MOD_NONE
-// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
-// q = new ModifierQueryNode(q, mods);
-// }
-// clauses.add(q);
+// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+// q = new ModifierQueryNode(q, mods);
+// }
+// clauses.add(q);
// }
// (
// conj=Conjunction() mods=Modifiers() q=Clause(field)
// {
-// // do not create modifier nodes with MOD_NONE
-// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
-// q = new ModifierQueryNode(q, mods);
-// }
-// clauses.add(q);
-// //TODO: figure out what to do with AND and ORs
+// // do not create modifier nodes with MOD_NONE
+// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+// q = new ModifierQueryNode(q, mods);
+// }
+// clauses.add(q);
+// //TODO: figure out what to do with AND and ORs
// }
// )*
// {
// if (clauses.size() == 1 && firstQuery != null)
// return firstQuery;
// else {
-// return new BooleanQueryNode(clauses);
+// return new BooleanQueryNode(clauses);
// }
// }
// }
@@ -301,10 +301,10 @@ public class StandardSyntaxParser implem
ModifierQueryNode.Modifier mods;
mods = Modifiers();
q = Clause(field);
- if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
- q = new ModifierQueryNode(q, mods);
- }
- {if (true) return q;}
+ if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+ q = new ModifierQueryNode(q, mods);
+ }
+ {if (true) return q;}
throw new Error("Missing return statement in function");
}
@@ -378,18 +378,18 @@ public class StandardSyntaxParser implem
}
switch (operator.kind) {
case OP_LESSTHAN:
- lowerInclusive = true;
- upperInclusive = false;
+ lowerInclusive = true;
+ upperInclusive = false;
- qLower = new FieldQueryNode(field,
+ qLower = new FieldQueryNode(field,
"*", term.beginColumn, term.endColumn);
- qUpper = new FieldQueryNode(field,
+ qUpper = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
break;
case OP_LESSTHANEQ:
- lowerInclusive = true;
- upperInclusive = true;
+ lowerInclusive = true;
+ upperInclusive = true;
qLower = new FieldQueryNode(field,
"*", term.beginColumn, term.endColumn);
@@ -397,8 +397,8 @@ public class StandardSyntaxParser implem
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
break;
case OP_MORETHAN:
- lowerInclusive = false;
- upperInclusive = true;
+ lowerInclusive = false;
+ upperInclusive = true;
qLower = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
@@ -406,8 +406,8 @@ public class StandardSyntaxParser implem
"*", term.beginColumn, term.endColumn);
break;
case OP_MORETHANEQ:
- lowerInclusive = true;
- upperInclusive = true;
+ lowerInclusive = true;
+ upperInclusive = true;
qLower = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
@@ -488,18 +488,18 @@ public class StandardSyntaxParser implem
}
}
if (boost != null) {
- float f = (float)1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- // avoid boosting null queries, such as those caused by stop words
- if (q != null) {
- q = new BoostQueryNode(q, f);
- }
- } catch (Exception ignored) {
- /* Should this be handled somehow? (defaults to "no boost", if
+ float f = (float)1.0;
+ try {
+ f = Float.valueOf(boost.image).floatValue();
+ // avoid boosting null queries, such as those caused by stop words
+ if (q != null) {
+ q = new BoostQueryNode(q, f);
+ }
+ } catch (Exception ignored) {
+ /* Should this be handled somehow? (defaults to "no boost", if
* boost number is invalid)
*/
- }
+ }
}
if (group) { q = new GroupQueryNode(q);}
{if (true) return q;}
@@ -522,7 +522,7 @@ public class StandardSyntaxParser implem
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TERM:
term = jj_consume_token(TERM);
- q = new FieldQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ q = new FieldQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
break;
case REGEXPTERM:
term = jj_consume_token(REGEXPTERM);
@@ -564,16 +564,16 @@ public class StandardSyntaxParser implem
;
}
if (fuzzy) {
- float fms = defaultMinSimilarity;
- try {
+ float fms = defaultMinSimilarity;
+ try {
fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue();
- } catch (Exception ignored) { }
- if(fms < 0.0f){
- {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));}
- } else if (fms >= 1.0f && fms != (int) fms) {
- {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));}
- }
- q = new FuzzyQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);
+ } catch (Exception ignored) { }
+ if(fms < 0.0f){
+ {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));}
+ } else if (fms >= 1.0f && fms != (int) fms) {
+ {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));}
+ }
+ q = new FuzzyQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);
} else if (regexp) {
String re = term.image.substring(1, term.image.length()-1);
q = new RegexpQueryNode(field, re, 0, re.length());
@@ -656,9 +656,9 @@ public class StandardSyntaxParser implem
}
qLower = new FieldQueryNode(field,
- EscapeQuerySyntaxImpl.discardEscapeChar(goop1.image), goop1.beginColumn, goop1.endColumn);
- qUpper = new FieldQueryNode(field,
- EscapeQuerySyntaxImpl.discardEscapeChar(goop2.image), goop2.beginColumn, goop2.endColumn);
+ EscapeQuerySyntaxImpl.discardEscapeChar(goop1.image), goop1.beginColumn, goop1.endColumn);
+ qUpper = new FieldQueryNode(field,
+ EscapeQuerySyntaxImpl.discardEscapeChar(goop2.image), goop2.beginColumn, goop2.endColumn);
q = new TermRangeQueryNode(qLower, qUpper, startInc ? true : false, endInc ? true : false);
break;
case QUOTED:
@@ -690,8 +690,8 @@ public class StandardSyntaxParser implem
}
catch (Exception ignored) {
/* Should this be handled somehow? (defaults to "no PhraseSlop", if
- * slop number is invalid)
- */
+ * slop number is invalid)
+ */
}
}
break;
@@ -700,20 +700,20 @@ public class StandardSyntaxParser implem
jj_consume_token(-1);
throw new ParseException();
}
- if (boost != null) {
- float f = (float)1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- // avoid boosting null queries, such as those caused by stop words
- if (q != null) {
- q = new BoostQueryNode(q, f);
- }
- } catch (Exception ignored) {
- /* Should this be handled somehow? (defaults to "no boost", if
- * boost number is invalid)
- */
- }
+ if (boost != null) {
+ float f = (float)1.0;
+ try {
+ f = Float.valueOf(boost.image).floatValue();
+ // avoid boosting null queries, such as those caused by stop words
+ if (q != null) {
+ q = new BoostQueryNode(q, f);
}
+ } catch (Exception ignored) {
+ /* Should this be handled somehow? (defaults to "no boost", if
+ * boost number is invalid)
+ */
+ }
+ }
{if (true) return q;}
throw new Error("Missing return statement in function");
}
@@ -748,11 +748,6 @@ public class StandardSyntaxParser implem
return false;
}
- private boolean jj_3R_10() {
- if (jj_scan_token(TERM)) return true;
- return false;
- }
-
private boolean jj_3R_11() {
if (jj_scan_token(REGEXPTERM)) return true;
return false;
@@ -779,6 +774,11 @@ public class StandardSyntaxParser implem
return false;
}
+ private boolean jj_3R_10() {
+ if (jj_scan_token(TERM)) return true;
+ return false;
+ }
+
private boolean jj_3R_7() {
Token xsp;
xsp = jj_scanpos;
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj Mon Sep 17 16:01:56 2012
@@ -57,14 +57,14 @@ import org.apache.lucene.queryparser.fle
*/
public class StandardSyntaxParser implements SyntaxParser {
- private static final int CONJ_NONE =0;
- private static final int CONJ_AND =2;
- private static final int CONJ_OR =2;
+ private static final int CONJ_NONE =0;
+ private static final int CONJ_AND =2;
+ private static final int CONJ_OR =2;
// syntax parser constructor
public StandardSyntaxParser() {
- this(new FastCharStream(new StringReader("")));
+ this(new FastCharStream(new StringReader("")));
}
/** Parses a query string, returning a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.
* @param query the query string to be parsed.
@@ -178,13 +178,13 @@ ModifierQueryNode.Modifier Modifiers() :
// This makes sure that there is no garbage after the query string
QueryNode TopLevelQuery(CharSequence field) :
{
- QueryNode q;
+ QueryNode q;
}
{
- q=Query(field) <EOF>
- {
- return q;
- }
+ q=Query(field) <EOF>
+ {
+ return q;
+ }
}
// These changes were made to introduce operator precedence:
@@ -209,25 +209,25 @@ QueryNode Query(CharSequence field) :
(
c=DisjQuery(field)
{
- if (clauses == null) {
- clauses = new Vector<QueryNode>();
- clauses.addElement(first);
- }
- clauses.addElement(c);
+ if (clauses == null) {
+ clauses = new Vector<QueryNode>();
+ clauses.addElement(first);
+ }
+ clauses.addElement(c);
}
)*
{
if (clauses != null) {
- return new BooleanQueryNode(clauses);
- } else {
- return first;
- }
+ return new BooleanQueryNode(clauses);
+ } else {
+ return first;
+ }
}
}
QueryNode DisjQuery(CharSequence field) : {
- QueryNode first, c;
- Vector<QueryNode> clauses = null;
+ QueryNode first, c;
+ Vector<QueryNode> clauses = null;
}
{
first = ConjQuery(field)
@@ -243,7 +243,7 @@ QueryNode DisjQuery(CharSequence field)
)*
{
if (clauses != null) {
- return new OrQueryNode(clauses);
+ return new OrQueryNode(clauses);
} else {
return first;
}
@@ -251,8 +251,8 @@ QueryNode DisjQuery(CharSequence field)
}
QueryNode ConjQuery(CharSequence field) : {
- QueryNode first, c;
- Vector<QueryNode> clauses = null;
+ QueryNode first, c;
+ Vector<QueryNode> clauses = null;
}
{
first = ModClause(field)
@@ -268,7 +268,7 @@ QueryNode ConjQuery(CharSequence field)
)*
{
if (clauses != null) {
- return new AndQueryNode(clauses);
+ return new AndQueryNode(clauses);
} else {
return first;
}
@@ -289,27 +289,27 @@ QueryNode ConjQuery(CharSequence field)
// if (mods == ModifierQueryNode.Modifier.MOD_NONE) firstQuery=q;
//
// // do not create modifier nodes with MOD_NONE
-// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
-// q = new ModifierQueryNode(q, mods);
-// }
-// clauses.add(q);
+// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+// q = new ModifierQueryNode(q, mods);
+// }
+// clauses.add(q);
// }
// (
// conj=Conjunction() mods=Modifiers() q=Clause(field)
// {
-// // do not create modifier nodes with MOD_NONE
-// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
-// q = new ModifierQueryNode(q, mods);
-// }
-// clauses.add(q);
-// //TODO: figure out what to do with AND and ORs
+// // do not create modifier nodes with MOD_NONE
+// if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+// q = new ModifierQueryNode(q, mods);
+// }
+// clauses.add(q);
+// //TODO: figure out what to do with AND and ORs
// }
// )*
// {
// if (clauses.size() == 1 && firstQuery != null)
// return firstQuery;
// else {
-// return new BooleanQueryNode(clauses);
+// return new BooleanQueryNode(clauses);
// }
// }
// }
@@ -320,10 +320,10 @@ QueryNode ModClause(CharSequence field)
}
{
mods=Modifiers() q= Clause(field) {
- if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
- q = new ModifierQueryNode(q, mods);
- }
- return q;
+ if (mods != ModifierQueryNode.Modifier.MOD_NONE) {
+ q = new ModifierQueryNode(q, mods);
+ }
+ return q;
}
}
@@ -347,18 +347,18 @@ QueryNode Clause(CharSequence field) : {
}
switch (operator.kind) {
case OP_LESSTHAN:
- lowerInclusive = true;
- upperInclusive = false;
-
- qLower = new FieldQueryNode(field,
+ lowerInclusive = true;
+ upperInclusive = false;
+
+ qLower = new FieldQueryNode(field,
"*", term.beginColumn, term.endColumn);
- qUpper = new FieldQueryNode(field,
+ qUpper = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
break;
case OP_LESSTHANEQ:
- lowerInclusive = true;
- upperInclusive = true;
+ lowerInclusive = true;
+ upperInclusive = true;
qLower = new FieldQueryNode(field,
"*", term.beginColumn, term.endColumn);
@@ -366,8 +366,8 @@ QueryNode Clause(CharSequence field) : {
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
break;
case OP_MORETHAN:
- lowerInclusive = false;
- upperInclusive = true;
+ lowerInclusive = false;
+ upperInclusive = true;
qLower = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
@@ -375,9 +375,9 @@ QueryNode Clause(CharSequence field) : {
"*", term.beginColumn, term.endColumn);
break;
case OP_MORETHANEQ:
- lowerInclusive = true;
- upperInclusive = true;
-
+ lowerInclusive = true;
+ upperInclusive = true;
+
qLower = new FieldQueryNode(field,
EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn);
qUpper = new FieldQueryNode(field,
@@ -401,18 +401,18 @@ QueryNode Clause(CharSequence field) : {
)
{
if (boost != null) {
- float f = (float)1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- // avoid boosting null queries, such as those caused by stop words
- if (q != null) {
- q = new BoostQueryNode(q, f);
- }
- } catch (Exception ignored) {
- /* Should this be handled somehow? (defaults to "no boost", if
+ float f = (float)1.0;
+ try {
+ f = Float.valueOf(boost.image).floatValue();
+ // avoid boosting null queries, such as those caused by stop words
+ if (q != null) {
+ q = new BoostQueryNode(q, f);
+ }
+ } catch (Exception ignored) {
+ /* Should this be handled somehow? (defaults to "no boost", if
* boost number is invalid)
- */
- }
+ */
+ }
}
if (group) { q = new GroupQueryNode(q);}
return q;
@@ -433,7 +433,7 @@ QueryNode Term(CharSequence field) : {
{
(
(
- term=<TERM> { q = new FieldQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn); }
+ term=<TERM> { q = new FieldQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), term.beginColumn, term.endColumn); }
| term=<REGEXPTERM> { regexp=true; }
| term=<NUMBER>
)
@@ -441,16 +441,16 @@ QueryNode Term(CharSequence field) : {
[ <CARAT> boost=<NUMBER> [ fuzzySlop=<FUZZY_SLOP> { fuzzy=true; } ] ]
{
if (fuzzy) {
- float fms = defaultMinSimilarity;
- try {
+ float fms = defaultMinSimilarity;
+ try {
fms = Float.valueOf(fuzzySlop.image.substring(1)).floatValue();
- } catch (Exception ignored) { }
- if(fms < 0.0f){
- throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));
- } else if (fms >= 1.0f && fms != (int) fms) {
- throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));
- }
- q = new FuzzyQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);
+ } catch (Exception ignored) { }
+ if(fms < 0.0f){
+ throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));
+ } else if (fms >= 1.0f && fms != (int) fms) {
+ throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));
+ }
+ q = new FuzzyQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);
} else if (regexp) {
String re = term.image.substring(1, term.image.length()-1);
q = new RegexpQueryNode(field, re, 0, re.length());
@@ -471,9 +471,9 @@ QueryNode Term(CharSequence field) : {
}
qLower = new FieldQueryNode(field,
- EscapeQuerySyntaxImpl.discardEscapeChar(goop1.image), goop1.beginColumn, goop1.endColumn);
- qUpper = new FieldQueryNode(field,
- EscapeQuerySyntaxImpl.discardEscapeChar(goop2.image), goop2.beginColumn, goop2.endColumn);
+ EscapeQuerySyntaxImpl.discardEscapeChar(goop1.image), goop1.beginColumn, goop1.endColumn);
+ qUpper = new FieldQueryNode(field,
+ EscapeQuerySyntaxImpl.discardEscapeChar(goop2.image), goop2.beginColumn, goop2.endColumn);
q = new TermRangeQueryNode(qLower, qUpper, startInc ? true : false, endInc ? true : false);
}
| term=<QUOTED> {q = new QuotedFieldQueryNode(field, EscapeQuerySyntaxImpl.discardEscapeChar(term.image.substring(1, term.image.length()-1)), term.beginColumn + 1, term.endColumn - 1);}
@@ -489,28 +489,28 @@ QueryNode Term(CharSequence field) : {
}
catch (Exception ignored) {
/* Should this be handled somehow? (defaults to "no PhraseSlop", if
- * slop number is invalid)
- */
+ * slop number is invalid)
+ */
}
}
}
)
{
- if (boost != null) {
- float f = (float)1.0;
- try {
- f = Float.valueOf(boost.image).floatValue();
- // avoid boosting null queries, such as those caused by stop words
- if (q != null) {
- q = new BoostQueryNode(q, f);
- }
- } catch (Exception ignored) {
- /* Should this be handled somehow? (defaults to "no boost", if
- * boost number is invalid)
- */
- }
- }
+ if (boost != null) {
+ float f = (float)1.0;
+ try {
+ f = Float.valueOf(boost.image).floatValue();
+ // avoid boosting null queries, such as those caused by stop words
+ if (q != null) {
+ q = new BoostQueryNode(q, f);
+ }
+ } catch (Exception ignored) {
+ /* Should this be handled somehow? (defaults to "no boost", if
+ * boost number is invalid)
+ */
+ }
+ }
return q;
}
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java Mon Sep 17 16:01:56 2012
@@ -26,13 +26,13 @@ import java.io.*;
public final class FastCharStream implements CharStream {
char[] buffer = null;
- int bufferLength = 0; // end of valid chars
- int bufferPosition = 0; // next char to read
+ int bufferLength = 0; // end of valid chars
+ int bufferPosition = 0; // next char to read
- int tokenStart = 0; // offset in buffer
- int bufferStart = 0; // position in file of buffer
+ int tokenStart = 0; // offset in buffer
+ int bufferStart = 0; // position in file of buffer
- Reader input; // source of chars
+ Reader input; // source of chars
/** Constructs from a Reader. */
public FastCharStream(Reader r) {
@@ -48,24 +48,24 @@ public final class FastCharStream implem
private final void refill() throws IOException {
int newPosition = bufferLength - tokenStart;
- if (tokenStart == 0) { // token won't fit in buffer
- if (buffer == null) { // first time: alloc buffer
- buffer = new char[2048];
+ if (tokenStart == 0) { // token won't fit in buffer
+ if (buffer == null) { // first time: alloc buffer
+ buffer = new char[2048];
} else if (bufferLength == buffer.length) { // grow buffer
- char[] newBuffer = new char[buffer.length*2];
- System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
- buffer = newBuffer;
+ char[] newBuffer = new char[buffer.length * 2];
+ System.arraycopy(buffer, 0, newBuffer, 0, bufferLength);
+ buffer = newBuffer;
}
- } else { // shift token to front
+ } else { // shift token to front
System.arraycopy(buffer, tokenStart, buffer, 0, newPosition);
}
- bufferLength = newPosition; // update state
+ bufferLength = newPosition; // update state
bufferPosition = newPosition;
bufferStart += tokenStart;
tokenStart = 0;
- int charsRead = // fill space in buffer
+ int charsRead = // fill space in buffer
input.read(buffer, newPosition, buffer.length-newPosition);
if (charsRead == -1)
throw new IOException("read past eof");
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java Mon Sep 17 16:01:56 2012
@@ -47,9 +47,9 @@ public class BasicQueryFactory {
public String toString() {
return getClass().getName()
- + "(maxBasicQueries: " + maxBasicQueries
- + ", queriesMade: " + queriesMade
- + ")";
+ + "(maxBasicQueries: " + maxBasicQueries
+ + ", queriesMade: " + queriesMade
+ + ")";
}
private boolean atMax() {
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java Mon Sep 17 16:01:56 2012
@@ -45,19 +45,19 @@ abstract class RewriteQuery<SQ extends S
@Override
public String toString(String field) {
return getClass().getName()
- + (field == null ? "" : "(unused: " + field + ")")
- + "(" + fieldName
- + ", " + srndQuery.toString()
- + ", " + qf.toString()
- + ")";
+ + (field == null ? "" : "(unused: " + field + ")")
+ + "(" + fieldName
+ + ", " + srndQuery.toString()
+ + ", " + qf.toString()
+ + ")";
}
@Override
public int hashCode() {
return getClass().hashCode()
- ^ fieldName.hashCode()
- ^ qf.hashCode()
- ^ srndQuery.hashCode();
+ ^ fieldName.hashCode()
+ ^ qf.hashCode()
+ ^ srndQuery.hashCode();
}
@Override
@@ -68,8 +68,8 @@ abstract class RewriteQuery<SQ extends S
return false;
RewriteQuery other = (RewriteQuery)obj;
return fieldName.equals(other.fieldName)
- && qf.equals(other.qf)
- && srndQuery.equals(other.srndQuery);
+ && qf.equals(other.qf)
+ && srndQuery.equals(other.srndQuery);
}
/** @throws UnsupportedOperationException */
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java Mon Sep 17 16:01:56 2012
@@ -37,16 +37,16 @@ class SimpleTermRewriteQuery extends Rew
public Query rewrite(IndexReader reader) throws IOException {
final List<Query> luceneSubQueries = new ArrayList<Query>();
srndQuery.visitMatchingTerms(reader, fieldName,
- new SimpleTerm.MatchingTermVisitor() {
- public void visitMatchingTerm(Term term) throws IOException {
- luceneSubQueries.add(qf.newTermQuery(term));
- }
- });
+ new SimpleTerm.MatchingTermVisitor() {
+ public void visitMatchingTerm(Term term) throws IOException {
+ luceneSubQueries.add(qf.newTermQuery(term));
+ }
+ });
return (luceneSubQueries.size() == 0) ? SrndQuery.theEmptyLcnQuery
- : (luceneSubQueries.size() == 1) ? luceneSubQueries.get(0)
- : SrndBooleanQuery.makeBooleanQuery(
- /* luceneSubQueries all have default weight */
- luceneSubQueries, BooleanClause.Occur.SHOULD); /* OR the subquery terms */
+ : (luceneSubQueries.size() == 1) ? luceneSubQueries.get(0)
+ : SrndBooleanQuery.makeBooleanQuery(
+ /* luceneSubQueries all have default weight */
+ luceneSubQueries, BooleanClause.Occur.SHOULD); /* OR the subquery terms */
}
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java Mon Sep 17 16:01:56 2012
@@ -153,5 +153,5 @@ public class CoreParser implements Query
public Query getQuery(Element e) throws ParserException {
return queryFactory.getQuery(e);
- }
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java Mon Sep 17 16:01:56 2012
@@ -58,6 +58,6 @@ public class CorePlusExtensionsParser ex
queryFactory.addBuilder("LikeThisQuery", new LikeThisQueryBuilder(analyzer, fields));
queryFactory.addBuilder("BoostingQuery", new BoostingQueryBuilder(queryFactory));
queryFactory.addBuilder("FuzzyLikeThisQuery", new FuzzyLikeThisQueryBuilder(analyzer));
-
- }
+
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java Mon Sep 17 16:01:56 2012
@@ -212,7 +212,7 @@ public class DOMUtils {
}
return doc;
- }
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java Mon Sep 17 16:01:56 2012
@@ -27,5 +27,5 @@ import org.w3c.dom.Element;
*/
public interface FilterBuilder {
- public Filter getFilter(Element e) throws ParserException;
+ public Filter getFilter(Element e) throws ParserException;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java Mon Sep 17 16:01:56 2012
@@ -25,32 +25,32 @@ package org.apache.lucene.queryparser.xm
*/
public class ParserException extends Exception {
- /**
- *
- */
- public ParserException() {
- super();
- }
+ /**
+ *
+ */
+ public ParserException() {
+ super();
+ }
- /**
- * @param message
- */
- public ParserException(String message) {
- super(message);
- }
+ /**
+ * @param message
+ */
+ public ParserException(String message) {
+ super(message);
+ }
- /**
- * @param message
- * @param cause
- */
- public ParserException(String message, Throwable cause) {
- super(message, cause);
- }
+ /**
+ * @param message
+ * @param cause
+ */
+ public ParserException(String message, Throwable cause) {
+ super(message, cause);
+ }
- /**
- * @param cause
- */
- public ParserException(Throwable cause) {
- super(cause);
- }
+ /**
+ * @param cause
+ */
+ public ParserException(Throwable cause) {
+ super(cause);
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java Mon Sep 17 16:01:56 2012
@@ -23,6 +23,6 @@ import org.w3c.dom.Element;
* expected to be thread-safe so that they can be used to simultaneously parse multiple XML documents.
*/
public interface QueryBuilder {
-
- public Query getQuery(Element e) throws ParserException;
+
+ public Query getQuery(Element e) throws ParserException;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java Mon Sep 17 16:01:56 2012
@@ -199,5 +199,5 @@ public class QueryTemplateManager {
org.w3c.dom.Document xslDoc = builder.parse(xslIs);
DOMSource ds = new DOMSource(xslDoc);
return tFactory.newTemplates(ds);
- }
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/CachedFilterBuilder.java Mon Sep 17 16:01:56 2012
@@ -32,10 +32,10 @@ import java.util.Map;
* Filters are cached in an LRU Cache keyed on the contained query or filter object. Using this will
* speed up overall performance for repeated uses of the same expensive query/filter. The sorts of
* queries/filters likely to benefit from caching need not necessarily be complex - e.g. simple
- * TermQuerys with a large DF (document frequency) can be expensive on large indexes.
- * A good example of this might be a term query on a field with only 2 possible values -
+ * TermQuerys with a large DF (document frequency) can be expensive on large indexes.
+ * A good example of this might be a term query on a field with only 2 possible values -
* "true" or "false". In a large index, querying or filtering on this field requires reading
- * millions of document ids from disk which can more usefully be cached as a filter bitset.
+ * millions of document ids from disk which can more usefully be cached as a filter bitset.
* <p/>
* For Queries/Filters to be cached and reused the object must implement hashcode and
* equals methods correctly so that duplicate queries/filters can be detected in the cache.
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Mon Sep 17 16:01:56 2012
@@ -158,7 +158,7 @@ public class NumericRangeFilterBuilder i
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
return null;
- }
+ }
- }
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java Mon Sep 17 16:01:56 2012
@@ -24,6 +24,6 @@ import org.w3c.dom.Element;
* Interface for retrieving a {@link SpanQuery}.
*/
public interface SpanQueryBuilder extends QueryBuilder {
-
- public SpanQuery getSpanQuery(Element e) throws ParserException;
+
+ public SpanQuery getSpanQuery(Element e) throws ParserException;
}
Modified: lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java Mon Sep 17 16:01:56 2012
@@ -88,6 +88,6 @@ public class UserInputQueryBuilder imple
*/
protected QueryParser createQueryParser(String fieldName, Analyzer analyzer) {
return new QueryParser(Version.LUCENE_CURRENT, fieldName, analyzer);
- }
+ }
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java Mon Sep 17 16:01:56 2012
@@ -89,7 +89,7 @@ public class TestQueryTemplateManager ex
Properties queryFormProperties = getPropsFromString(queryForm);
//Get the required query XSL template for this test
-// Templates template=getTemplate(queryFormProperties.getProperty("template"));
+// Templates template=getTemplate(queryFormProperties.getProperty("template"));
//Transform the queryFormProperties into a Lucene XML query
Document doc = qtm.getQueryAsDOM(queryFormProperties, queryFormProperties.getProperty("template"));
Modified: lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java Mon Sep 17 16:01:56 2012
@@ -121,17 +121,17 @@ public class FuzzyLikeThisQuery extends
class FieldVals
{
- String queryString;
- String fieldName;
- float minSimilarity;
- int prefixLength;
- public FieldVals(String name, float similarity, int length, String queryString)
- {
- fieldName = name;
- minSimilarity = similarity;
- prefixLength = length;
- this.queryString = queryString;
- }
+ String queryString;
+ String fieldName;
+ float minSimilarity;
+ int prefixLength;
+ public FieldVals(String name, float similarity, int length, String queryString)
+ {
+ fieldName = name;
+ minSimilarity = similarity;
+ prefixLength = length;
+ this.queryString = queryString;
+ }
@Override
public int hashCode() {
@@ -174,7 +174,7 @@ public class FuzzyLikeThisQuery extends
}
-
+
}
/**
@@ -186,77 +186,72 @@ public class FuzzyLikeThisQuery extends
*/
public void addTerms(String queryString, String fieldName,float minSimilarity, int prefixLength)
{
- fieldVals.add(new FieldVals(fieldName,minSimilarity,prefixLength,queryString));
+ fieldVals.add(new FieldVals(fieldName,minSimilarity,prefixLength,queryString));
}
-
-
- private void addTerms(IndexReader reader,FieldVals f) throws IOException
- {
- if(f.queryString==null) return;
- TokenStream ts=analyzer.tokenStream(f.fieldName, new StringReader(f.queryString));
- CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
-
- int corpusNumDocs=reader.numDocs();
- HashSet<String> processedTerms=new HashSet<String>();
- ts.reset();
- while (ts.incrementToken())
- {
- String term = termAtt.toString();
- if(!processedTerms.contains(term))
- {
- processedTerms.add(term);
- ScoreTermQueue variantsQ=new ScoreTermQueue(MAX_VARIANTS_PER_TERM); //maxNum variants considered for any one term
- float minScore=0;
- Term startTerm=new Term(f.fieldName, term);
- AttributeSource atts = new AttributeSource();
- MaxNonCompetitiveBoostAttribute maxBoostAtt =
- atts.addAttribute(MaxNonCompetitiveBoostAttribute.class);
- SlowFuzzyTermsEnum fe = new SlowFuzzyTermsEnum(MultiFields.getTerms(reader, startTerm.field()), atts, startTerm, f.minSimilarity, f.prefixLength);
- //store the df so all variants use same idf
- int df = reader.docFreq(startTerm);
- int numVariants=0;
- int totalVariantDocFreqs=0;
- BytesRef possibleMatch;
- BoostAttribute boostAtt =
- fe.attributes().addAttribute(BoostAttribute.class);
- while ((possibleMatch = fe.next()) != null) {
- numVariants++;
- totalVariantDocFreqs+=fe.docFreq();
- float score=boostAtt.getBoost();
- if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore){
- ScoreTerm st=new ScoreTerm(new Term(startTerm.field(), BytesRef.deepCopyOf(possibleMatch)),score,startTerm);
- variantsQ.insertWithOverflow(st);
- minScore = variantsQ.top().score; // maintain minScore
- }
- maxBoostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
- }
-
- if(numVariants>0)
- {
- int avgDf=totalVariantDocFreqs/numVariants;
- if(df==0)//no direct match we can use as df for all variants
- {
- df=avgDf; //use avg df of all variants
- }
-
- // take the top variants (scored by edit distance) and reset the score
- // to include an IDF factor then add to the global queue for ranking
- // overall top query terms
- int size = variantsQ.size();
- for(int i = 0; i < size; i++)
- {
- ScoreTerm st = variantsQ.pop();
- st.score=(st.score*st.score)*sim.idf(df,corpusNumDocs);
- q.insertWithOverflow(st);
- }
- }
- }
+
+
+ private void addTerms(IndexReader reader, FieldVals f) throws IOException {
+ if (f.queryString == null) return;
+ TokenStream ts = analyzer.tokenStream(f.fieldName, new StringReader(f.queryString));
+ CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
+
+ int corpusNumDocs = reader.numDocs();
+ HashSet<String> processedTerms = new HashSet<String>();
+ ts.reset();
+ while (ts.incrementToken()) {
+ String term = termAtt.toString();
+ if (!processedTerms.contains(term)) {
+ processedTerms.add(term);
+ ScoreTermQueue variantsQ = new ScoreTermQueue(MAX_VARIANTS_PER_TERM); //maxNum variants considered for any one term
+ float minScore = 0;
+ Term startTerm = new Term(f.fieldName, term);
+ AttributeSource atts = new AttributeSource();
+ MaxNonCompetitiveBoostAttribute maxBoostAtt =
+ atts.addAttribute(MaxNonCompetitiveBoostAttribute.class);
+ SlowFuzzyTermsEnum fe = new SlowFuzzyTermsEnum(MultiFields.getTerms(reader, startTerm.field()), atts, startTerm, f.minSimilarity, f.prefixLength);
+ //store the df so all variants use same idf
+ int df = reader.docFreq(startTerm);
+ int numVariants = 0;
+ int totalVariantDocFreqs = 0;
+ BytesRef possibleMatch;
+ BoostAttribute boostAtt =
+ fe.attributes().addAttribute(BoostAttribute.class);
+ while ((possibleMatch = fe.next()) != null) {
+ numVariants++;
+ totalVariantDocFreqs += fe.docFreq();
+ float score = boostAtt.getBoost();
+ if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore) {
+ ScoreTerm st = new ScoreTerm(new Term(startTerm.field(), BytesRef.deepCopyOf(possibleMatch)), score, startTerm);
+ variantsQ.insertWithOverflow(st);
+ minScore = variantsQ.top().score; // maintain minScore
+ }
+ maxBoostAtt.setMaxNonCompetitiveBoost(variantsQ.size() >= MAX_VARIANTS_PER_TERM ? minScore : Float.NEGATIVE_INFINITY);
}
- ts.end();
- ts.close();
+
+ if (numVariants > 0) {
+ int avgDf = totalVariantDocFreqs / numVariants;
+ if (df == 0)//no direct match we can use as df for all variants
+ {
+ df = avgDf; //use avg df of all variants
+ }
+
+ // take the top variants (scored by edit distance) and reset the score
+ // to include an IDF factor then add to the global queue for ranking
+ // overall top query terms
+ int size = variantsQ.size();
+ for (int i = 0; i < size; i++) {
+ ScoreTerm st = variantsQ.pop();
+ st.score = (st.score * st.score) * sim.idf(df, corpusNumDocs);
+ q.insertWithOverflow(st);
+ }
+ }
+ }
}
-
- @Override
+ ts.end();
+ ts.close();
+ }
+
+ @Override
public Query rewrite(IndexReader reader) throws IOException
{
if(rewrittenQuery!=null)
@@ -264,12 +259,11 @@ public class FuzzyLikeThisQuery extends
return rewrittenQuery;
}
//load up the list of possible terms
- for (Iterator<FieldVals> iter = fieldVals.iterator(); iter.hasNext();)
- {
- FieldVals f = iter.next();
- addTerms(reader,f);
- }
- //clear the list of fields
+ for (Iterator<FieldVals> iter = fieldVals.iterator(); iter.hasNext(); ) {
+ FieldVals f = iter.next();
+ addTerms(reader, f);
+ }
+ //clear the list of fields
fieldVals.clear();
BooleanQuery bq=new BooleanQuery();
@@ -368,15 +362,15 @@ public class FuzzyLikeThisQuery extends
}
- public boolean isIgnoreTF()
- {
- return ignoreTF;
- }
+ public boolean isIgnoreTF()
+ {
+ return ignoreTF;
+ }
- public void setIgnoreTF(boolean ignoreTF)
- {
- this.ignoreTF = ignoreTF;
- }
+ public void setIgnoreTF(boolean ignoreTF)
+ {
+ this.ignoreTF = ignoreTF;
+ }
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java Mon Sep 17 16:01:56 2012
@@ -105,7 +105,7 @@ public class TestSlowFuzzyQuery extends
}
// not similar enough:
- query = new SlowFuzzyQuery(new Term("field", "xxxxx"), SlowFuzzyQuery.defaultMinSimilarity, 0);
+ query = new SlowFuzzyQuery(new Term("field", "xxxxx"), SlowFuzzyQuery.defaultMinSimilarity, 0);
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(0, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaccc"), SlowFuzzyQuery.defaultMinSimilarity, 0); // edit distance to "aaaaa" = 3
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java Mon Sep 17 16:01:56 2012
@@ -294,7 +294,7 @@ public class DirectSpellChecker {
*/
public SuggestWord[] suggestSimilar(Term term, int numSug, IndexReader ir,
SuggestMode suggestMode) throws IOException {
- return suggestSimilar(term, numSug, ir, suggestMode, this.accuracy);
+ return suggestSimilar(term, numSug, ir, suggestMode, this.accuracy);
}
/**
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Mon Sep 17 16:01:56 2012
@@ -283,7 +283,7 @@ public class SpellChecker implements jav
*/
public String[] suggestSimilar(String word, int numSug, IndexReader ir,
String field, SuggestMode suggestMode) throws IOException {
- return suggestSimilar(word, numSug, ir, field, suggestMode, this.accuracy);
+ return suggestSimilar(word, numSug, ir, field, suggestMode, this.accuracy);
}
/**
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java Mon Sep 17 16:01:56 2012
@@ -23,20 +23,20 @@ package org.apache.lucene.search.suggest
public class TernaryTreeNode {
/** the character stored by a node. */
- char splitchar;
- /** a reference object to the node containing character smaller than this node's character. */
- TernaryTreeNode loKid;
- /**
- * a reference object to the node containing character next to this node's character as
- * occurring in the inserted token.
- */
- TernaryTreeNode eqKid;
- /** a reference object to the node containing character higher than this node's character. */
- TernaryTreeNode hiKid;
- /**
- * used by leaf nodes to store the complete tokens to be added to suggest list while
- * auto-completing the prefix.
- */
- String token;
- Object val;
+ char splitchar;
+ /** a reference object to the node containing character smaller than this node's character. */
+ TernaryTreeNode loKid;
+ /**
+ * a reference object to the node containing character next to this node's character as
+ * occurring in the inserted token.
+ */
+ TernaryTreeNode eqKid;
+ /** a reference object to the node containing character higher than this node's character. */
+ TernaryTreeNode hiKid;
+ /**
+ * used by leaf nodes to store the complete tokens to be added to suggest list while
+ * auto-completing the prefix.
+ */
+ String token;
+ Object val;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java Mon Sep 17 16:01:56 2012
@@ -160,7 +160,7 @@ public class MockTokenizer extends Token
return Character.toCodePoint((char) ch, (char) ch2);
} else {
assert false : "stream ends with unpaired high surrogate: " + Integer.toHexString(ch);
- }
+ }
}
return ch;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Mon Sep 17 16:01:56 2012
@@ -358,7 +358,7 @@ public abstract class LuceneTestCase ext
} else {
Logger.getLogger(LuceneTestCase.class.getSimpleName()).warning(
"Property '" + SYSPROP_MAXFAILURES + "'=" + maxFailures + ", 'failfast' is" +
- " ignored.");
+ " ignored.");
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java Mon Sep 17 16:01:56 2012
@@ -129,7 +129,7 @@ public final class RunListenerPrintRepro
private void reportAdditionalFailureInfo(final String testName) {
if (TEST_LINE_DOCS_FILE.endsWith(JENKINS_LARGE_LINE_DOCS_FILE)) {
System.err.println("NOTE: download the large Jenkins line-docs file by running " +
- "'ant get-jenkins-line-docs' in the lucene directory.");
+ "'ant get-jenkins-line-docs' in the lucene directory.");
}
final StringBuilder b = new StringBuilder();
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java Mon Sep 17 16:01:56 2012
@@ -33,7 +33,7 @@ public class TestRuleAssertionsRequired
try {
assert false;
String msg = "Test class requires enabled assertions, enable globally (-ea)" +
- " or for Solr/Lucene subpackages only: " + description.getClassName();
+ " or for Solr/Lucene subpackages only: " + description.getClassName();
System.err.println(msg);
throw new Exception(msg);
} catch (AssertionError e) {
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java Mon Sep 17 16:01:56 2012
@@ -18,5 +18,5 @@ package org.apache.solr.handler.dataimpo
*/
public enum DIHLogLevels {
- START_ENTITY, END_ENTITY, TRANSFORMED_ROW, ENTITY_META, PRE_TRANSFORMER_ROW, START_DOC, END_DOC, ENTITY_OUT, ROW_END, TRANSFORMER_EXCEPTION, ENTITY_EXCEPTION, DISABLE_LOGGING, ENABLE_LOGGING, NONE
+ START_ENTITY, END_ENTITY, TRANSFORMED_ROW, ENTITY_META, PRE_TRANSFORMER_ROW, START_DOC, END_DOC, ENTITY_OUT, ROW_END, TRANSFORMER_EXCEPTION, ENTITY_EXCEPTION, DISABLE_LOGGING, ENABLE_LOGGING, NONE
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java Mon Sep 17 16:01:56 2012
@@ -25,81 +25,81 @@ import org.apache.solr.common.SolrInputD
*
*/
public interface DIHWriter {
-
- /**
- * <p>
- * If this writer supports transactions or commit points, then commit any changes,
- * optionally optimizing the data for read/write performance
- * </p>
- * @param optimize
- */
- public void commit(boolean optimize);
-
- /**
- * <p>
- * Release resources used by this writer. After calling close, reads & updates will throw exceptions.
- * </p>
- */
- public void close();
-
- /**
- * <p>
- * If this writer supports transactions or commit points, then roll back any uncommitted changes.
- * </p>
- */
- public void rollback();
-
- /**
- * <p>
- * Delete from the writer's underlying data store based the passed-in writer-specific query. (Optional Operation)
- * </p>
- * @param q
- */
- public void deleteByQuery(String q);
-
- /**
- * <p>
- * Delete everything from the writer's underlying data store
- * </p>
- */
- public void doDeleteAll();
-
- /**
- * <p>
- * Delete from the writer's underlying data store based on the passed-in Primary Key
- * </p>
- * @param key
- */
- public void deleteDoc(Object key);
-
-
-
- /**
- * <p>
- * Add a document to this writer's underlying data store.
- * </p>
- * @param doc
- * @return true on success, false on failure
- */
- public boolean upload(SolrInputDocument doc);
-
-
-
- /**
- * <p>
- * Provide context information for this writer. init() should be called before using the writer.
- * </p>
- * @param context
- */
- public void init(Context context) ;
-
-
- /**
- * <p>
- * Specify the keys to be modified by a delta update (required by writers that can store duplicate keys)
- * </p>
- * @param deltaKeys
- */
- public void setDeltaKeys(Set<Map<String, Object>> deltaKeys) ;
+
+ /**
+ * <p>
+ * If this writer supports transactions or commit points, then commit any changes,
+ * optionally optimizing the data for read/write performance
+ * </p>
+ * @param optimize
+ */
+ public void commit(boolean optimize);
+
+ /**
+ * <p>
+ * Release resources used by this writer. After calling close, reads & updates will throw exceptions.
+ * </p>
+ */
+ public void close();
+
+ /**
+ * <p>
+ * If this writer supports transactions or commit points, then roll back any uncommitted changes.
+ * </p>
+ */
+ public void rollback();
+
+ /**
+ * <p>
+ * Delete from the writer's underlying data store based the passed-in writer-specific query. (Optional Operation)
+ * </p>
+ * @param q
+ */
+ public void deleteByQuery(String q);
+
+ /**
+ * <p>
+ * Delete everything from the writer's underlying data store
+ * </p>
+ */
+ public void doDeleteAll();
+
+ /**
+ * <p>
+ * Delete from the writer's underlying data store based on the passed-in Primary Key
+ * </p>
+ * @param key
+ */
+ public void deleteDoc(Object key);
+
+
+
+ /**
+ * <p>
+ * Add a document to this writer's underlying data store.
+ * </p>
+ * @param doc
+ * @return true on success, false on failure
+ */
+ public boolean upload(SolrInputDocument doc);
+
+
+
+ /**
+ * <p>
+ * Provide context information for this writer. init() should be called before using the writer.
+ * </p>
+ * @param context
+ */
+ public void init(Context context) ;
+
+
+ /**
+ * <p>
+ * Specify the keys to be modified by a delta update (required by writers that can store duplicate keys)
+ * </p>
+ * @param deltaKeys
+ */
+ public void setDeltaKeys(Set<Map<String, Object>> deltaKeys) ;
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java Mon Sep 17 16:01:56 2012
@@ -178,7 +178,7 @@ public class DataImportHandler extends R
rsp.add("mode", "debug");
rsp.add("documents", requestParams.getDebugInfo().debugDocuments);
if (requestParams.getDebugInfo().debugVerboseOutput != null) {
- rsp.add("verbose-output", requestParams.getDebugInfo().debugVerboseOutput);
+ rsp.add("verbose-output", requestParams.getDebugInfo().debugVerboseOutput);
}
} else {
message = DataImporter.MSG.DEBUG_NOT_ENABLED;
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java Mon Sep 17 16:01:56 2012
@@ -393,7 +393,7 @@ public class DataImporter {
}
private void checkWritablePersistFile(SolrWriter writer) {
-// File persistFile = propWriter.getPersistFile();
+// File persistFile = propWriter.getPersistFile();
// boolean isWritable = persistFile.exists() ? persistFile.canWrite() : persistFile.getParentFile().canWrite();
if (isDeltaImportSupported && !propWriter.isWritable()) {
throw new DataImportHandlerException(SEVERE,
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java?rev=1386681&r1=1386680&r2=1386681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java Mon Sep 17 16:01:56 2012
@@ -143,7 +143,7 @@ class DebugLogger {
private void popAllTransformers() {
while (true) {
- DIHLogLevels type = debugStack.peek().type;
+ DIHLogLevels type = debugStack.peek().type;
if (type == DIHLogLevels.START_DOC || type == DIHLogLevels.START_ENTITY)
break;
debugStack.pop();