honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lucene4: fixed SimpleIndexQueryParserTests

This commit is contained in:
Igor Motov 2012-11-02 21:24:16 -04:00 committed by Shay Banon
parent db639e5c2e
commit bf13f3f81e
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
View File

@ -47,9 +47,10 @@ public class StringFieldMapper extends AbstractFieldMapper<String> implements Al
public static final String CONTENT_TYPE = "string";
public static class Defaults extends AbstractFieldMapper.Defaults {
public static final FieldType STRING_FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.NUMBER_FIELD_TYPE);
public static final FieldType STRING_FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
static {
STRING_FIELD_TYPE.setIndexOptions(IndexOptions.DOCS_ONLY);
STRING_FIELD_TYPE.freeze();
}

60
src/main/java/org/elasticsearch/index/search/MatchQuery.java
View File

@ -180,57 +180,59 @@ public class MatchQuery {
}
// Logic similar to QueryParser#getFieldQuery
final TokenStream source;
TokenStream source = null;
CachingTokenFilter buffer = null;
CharTermAttribute termAtt = null;
PositionIncrementAttribute posIncrAtt = null;
boolean success = false;
try {
source = analyzer.tokenStream(field, new FastStringReader(text));
source.reset();
success = true;
} catch(IOException ex) {
//LUCENE 4 UPGRADE not sure what todo here really lucene 3.6 had a tokenStream that didn't throw an exc.
throw new ElasticSearchParseException("failed to process query", ex);
// success==false if we hit an exception
}
CachingTokenFilter buffer = new CachingTokenFilter(source);
CharTermAttribute termAtt = null;
PositionIncrementAttribute posIncrAtt = null;
int numTokens = 0;
int positionCount = 0;
boolean severalTokensAtSamePosition = false;
boolean success = false;
buffer.reset();
if (success) {
buffer = new CachingTokenFilter(source);
buffer.reset();
if (buffer.hasAttribute(CharTermAttribute.class)) {
termAtt = buffer.getAttribute(CharTermAttribute.class);
}
if (buffer.hasAttribute(PositionIncrementAttribute.class)) {
posIncrAtt = buffer.getAttribute(PositionIncrementAttribute.class);
}
}
int positionCount = 0;
boolean severalTokensAtSamePosition = false;
boolean hasMoreTokens = false;
if (termAtt != null) {
try {
hasMoreTokens = buffer.incrementToken();
while (hasMoreTokens) {
numTokens++;
int positionIncrement = (posIncrAtt != null) ? posIncrAtt.getPositionIncrement() : 1;
if (positionIncrement != 0) {
positionCount += positionIncrement;
} else {
severalTokensAtSamePosition = true;
}
boolean hasMoreTokens = false;
if (termAtt != null) {
try {
hasMoreTokens = buffer.incrementToken();
while (hasMoreTokens) {
numTokens++;
int positionIncrement = (posIncrAtt != null) ? posIncrAtt.getPositionIncrement() : 1;
if (positionIncrement != 0) {
positionCount += positionIncrement;
} else {
severalTokensAtSamePosition = true;
}
hasMoreTokens = buffer.incrementToken();
}
} catch (IOException e) {
// ignore
}
} catch (IOException e) {
// ignore
}
}
try {
// rewind the buffer stream
buffer.reset();
}
try {
// close original stream - all tokens buffered
source.close();
if (source != null) {
source.close();
}
} catch (IOException e) {
// ignore
}

2
src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java
View File

@ -127,7 +127,7 @@ public class SimpleIndexQueryParserTests {
private BytesRef longToPrefixCoded(long val) {
BytesRef bytesRef = new BytesRef();
NumericUtils.longToPrefixCoded(val, 0, bytesRef);
NumericUtils.longToPrefixCoded(val, NumericUtils.PRECISION_STEP_DEFAULT, bytesRef);
return bytesRef;
}