add support for wildcard and regexp queries to query string
you can now use terms like: test?string* and similar text in query strings to perform wildcard searches. also if you use: /aregexp/ it will perform a regexp search as well
This commit is contained in:
Marty Schoch
parent
2f59b75ce4
commit
7ec37d6533
|
|
@ -1,7 +1,12 @@
|
|||
/\"((\\\")|(\\\\)|(\\\/)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])|[^\"])*\"/ {
|
||||
/\"((\\\")|(\\\\)|(\\\/)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])|[^\"])*\"/ {
|
||||
lval.s = yylex.Text()[1:len(yylex.Text())-1]
|
||||
logDebugTokens("PHRASE - %s", lval.s);
|
||||
return tPHRASE
|
||||
return tPHRASE
|
||||
}
|
||||
/\/((\\\")|(\\\\)|(\\\/)|(\\b)|(\\f)|(\\n)|(\\r)|(\\t)|(\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])|[^\/])*\// {
|
||||
lval.s = yylex.Text()[1:len(yylex.Text())-1]
|
||||
logDebugTokens("REGEXP - %s", lval.s);
|
||||
return tREGEXP
|
||||
}
|
||||
/\+/ { logDebugTokens("PLUS"); return tPLUS }
|
||||
/-/ { logDebugTokens("MINUS"); return tMINUS }
|
||||
|
|
@ -20,16 +25,21 @@
|
|||
}
|
||||
/~/ { logDebugTokens("TILDE"); return tTILDE }
|
||||
/-?([0-9]|[1-9][0-9]*)(\.[0-9][0-9]*)?/
|
||||
{
|
||||
{
|
||||
lval.s = yylex.Text()
|
||||
logDebugTokens("NUMBER - %s", lval.s);
|
||||
return tNUMBER
|
||||
}
|
||||
/[ \t\n]+/ { logDebugTokens("WHITESPACE (count=%d)", len(yylex.Text())) /* eat up whitespace */ }
|
||||
/[^\t\n\f\r :^\+><=~-][^\t\n\f\r :^~]*/ {
|
||||
/[^\t\n\f\r :^\+\*\?><=~-][^\t\n\f\r :^~\*\?]*/ {
|
||||
lval.s = yylex.Text()
|
||||
logDebugTokens("STRING - %s", lval.s);
|
||||
return tSTRING
|
||||
return tSTRING
|
||||
}
|
||||
/[^\t\n\f\r :^\+\*\?><=~-][^\t\n\f\r :^~]*/ {
|
||||
lval.s = yylex.Text()
|
||||
logDebugTokens("WILD - %s", lval.s);
|
||||
return tWILD
|
||||
}
|
||||
//
|
||||
package bleve
|
||||
|
|
@ -38,4 +48,4 @@ func logDebugTokens(format string, v ...interface{}) {
|
|||
if debugLexer {
|
||||
logger.Printf(format, v...)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1161
query_string.nn.go
1161
query_string.nn.go
File diff suppressed because it is too large
Load Diff
|
|
@ -9,16 +9,18 @@ func logDebugGrammar(format string, v ...interface{}) {
|
|||
}
|
||||
%}
|
||||
|
||||
%union {
|
||||
s string
|
||||
%union {
|
||||
s string
|
||||
n int
|
||||
f float64
|
||||
q Query}
|
||||
|
||||
%token tSTRING tPHRASE tPLUS tMINUS tCOLON tBOOST tLPAREN tRPAREN tNUMBER tSTRING tGREATER tLESS
|
||||
tEQUAL tTILDE tTILDENUMBER
|
||||
tEQUAL tTILDE tTILDENUMBER tREGEXP tWILD
|
||||
|
||||
%type <s> tSTRING
|
||||
%type <s> tWILD
|
||||
%type <s> tREGEXP
|
||||
%type <s> tPHRASE
|
||||
%type <s> tNUMBER
|
||||
%type <s> tTILDENUMBER
|
||||
|
|
@ -30,7 +32,7 @@ tEQUAL tTILDE tTILDENUMBER
|
|||
|
||||
%%
|
||||
|
||||
input:
|
||||
input:
|
||||
searchParts {
|
||||
logDebugGrammar("INPUT")
|
||||
};
|
||||
|
|
@ -88,6 +90,20 @@ tSTRING {
|
|||
$$ = q
|
||||
}
|
||||
|
|
||||
tREGEXP {
|
||||
str := $1
|
||||
logDebugGrammar("REGEXP - %s", str)
|
||||
q := NewRegexpQuery(str)
|
||||
$$ = q
|
||||
}
|
||||
|
|
||||
tWILD {
|
||||
str := $1
|
||||
logDebugGrammar("WILDCARD - %s", str)
|
||||
q := NewWildcardQuery(str)
|
||||
$$ = q
|
||||
}
|
||||
|
|
||||
tSTRING tTILDE {
|
||||
str := $1
|
||||
logDebugGrammar("FUZZY STRING - %s", str)
|
||||
|
|
@ -126,6 +142,24 @@ tSTRING tCOLON tSTRING tTILDENUMBER {
|
|||
$$ = q
|
||||
}
|
||||
|
|
||||
tSTRING tCOLON tREGEXP {
|
||||
field := $1
|
||||
str := $3
|
||||
logDebugGrammar("FIELD - %s REGEXP - %s", field, str)
|
||||
q := NewRegexpQuery(str)
|
||||
q.SetField(field)
|
||||
$$ = q
|
||||
}
|
||||
|
|
||||
tSTRING tCOLON tWILD {
|
||||
field := $1
|
||||
str := $3
|
||||
logDebugGrammar("FIELD - %s WILD - %s", field, str)
|
||||
q := NewWildcardQuery(str)
|
||||
q.SetField(field)
|
||||
$$ = q
|
||||
}
|
||||
|
|
||||
tNUMBER {
|
||||
str := $1
|
||||
logDebugGrammar("STRING - %s", str)
|
||||
|
|
@ -213,5 +247,5 @@ searchSuffix:
|
|||
}
|
||||
|
|
||||
searchBoost {
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -34,8 +34,13 @@ const tLESS = 57356
|
|||
const tEQUAL = 57357
|
||||
const tTILDE = 57358
|
||||
const tTILDENUMBER = 57359
|
||||
const tREGEXP = 57360
|
||||
const tWILD = 57361
|
||||
|
||||
var yyToknames = []string{
|
||||
var yyToknames = [...]string{
|
||||
"$end",
|
||||
"error",
|
||||
"$unk",
|
||||
"tSTRING",
|
||||
"tPHRASE",
|
||||
"tPLUS",
|
||||
|
|
@ -50,15 +55,17 @@ var yyToknames = []string{
|
|||
"tEQUAL",
|
||||
"tTILDE",
|
||||
"tTILDENUMBER",
|
||||
"tREGEXP",
|
||||
"tWILD",
|
||||
}
|
||||
var yyStatenames = []string{}
|
||||
var yyStatenames = [...]string{}
|
||||
|
||||
const yyEofCode = 1
|
||||
const yyErrCode = 2
|
||||
const yyMaxDepth = 200
|
||||
const yyInitialStackSize = 16
|
||||
|
||||
//line yacctab:1
|
||||
var yyExca = []int{
|
||||
var yyExca = [...]int{
|
||||
-1, 1,
|
||||
1, -1,
|
||||
-2, 0,
|
||||
|
|
@ -67,89 +74,116 @@ var yyExca = []int{
|
|||
-2, 5,
|
||||
}
|
||||
|
||||
const yyNprod = 26
|
||||
const yyNprod = 30
|
||||
const yyPrivate = 57344
|
||||
|
||||
var yyTokenNames []string
|
||||
var yyStates []string
|
||||
|
||||
const yyLast = 32
|
||||
const yyLast = 36
|
||||
|
||||
var yyAct = []int{
|
||||
var yyAct = [...]int{
|
||||
|
||||
17, 25, 26, 20, 22, 32, 31, 29, 16, 18,
|
||||
30, 21, 23, 24, 27, 10, 12, 28, 19, 15,
|
||||
6, 7, 2, 11, 3, 1, 8, 14, 5, 4,
|
||||
13, 9,
|
||||
22, 26, 36, 10, 14, 29, 30, 35, 25, 27,
|
||||
28, 13, 19, 33, 23, 24, 34, 11, 12, 31,
|
||||
18, 20, 32, 21, 17, 6, 7, 2, 3, 1,
|
||||
16, 8, 5, 4, 15, 9,
|
||||
}
|
||||
var yyPact = []int{
|
||||
var yyPact = [...]int{
|
||||
|
||||
14, -1000, -1000, 14, 11, -1000, -1000, -1000, -1000, 10,
|
||||
-8, -1000, -1000, -1000, -1000, 6, -1000, -1, -1000, -1000,
|
||||
-15, -1000, -1000, 2, -5, -1000, -1000, -1000, -6, -1000,
|
||||
-7, -1000, -1000,
|
||||
19, -1000, -1000, 19, -1, -1000, -1000, -1000, -1000, 15,
|
||||
4, -1000, -1000, -1000, -1000, -1000, -1000, 11, -1000, -4,
|
||||
-1000, -1000, -11, -1000, -1000, -1000, -1000, 7, 1, -1000,
|
||||
-1000, -1000, -5, -1000, -10, -1000, -1000,
|
||||
}
|
||||
var yyPgo = []int{
|
||||
var yyPgo = [...]int{
|
||||
|
||||
0, 31, 30, 29, 28, 27, 25, 22, 24,
|
||||
0, 35, 34, 33, 32, 30, 29, 27, 28,
|
||||
}
|
||||
var yyR1 = []int{
|
||||
var yyR1 = [...]int{
|
||||
|
||||
0, 6, 7, 7, 8, 3, 3, 4, 4, 1,
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
||||
1, 1, 1, 5, 2, 2,
|
||||
1, 1, 1, 1, 1, 1, 1, 5, 2, 2,
|
||||
}
|
||||
var yyR2 = []int{
|
||||
var yyR2 = [...]int{
|
||||
|
||||
0, 1, 2, 1, 3, 0, 1, 1, 1, 1,
|
||||
2, 4, 2, 4, 1, 1, 3, 3, 3, 4,
|
||||
5, 4, 5, 2, 0, 1,
|
||||
1, 1, 2, 4, 2, 4, 3, 3, 1, 1,
|
||||
3, 3, 3, 4, 5, 4, 5, 2, 0, 1,
|
||||
}
|
||||
var yyChk = []int{
|
||||
var yyChk = [...]int{
|
||||
|
||||
-1000, -6, -7, -8, -3, -4, 6, 7, -7, -1,
|
||||
4, 12, 5, -2, -5, 9, 16, 8, 17, 12,
|
||||
4, 12, 5, 13, 14, 16, 17, 12, 15, 12,
|
||||
15, 12, 12,
|
||||
4, 18, 19, 12, 5, -2, -5, 9, 16, 8,
|
||||
17, 12, 4, 18, 19, 12, 5, 13, 14, 16,
|
||||
17, 12, 15, 12, 15, 12, 12,
|
||||
}
|
||||
var yyDef = []int{
|
||||
var yyDef = [...]int{
|
||||
|
||||
5, -2, 1, -2, 0, 6, 7, 8, 2, 24,
|
||||
9, 14, 15, 4, 25, 0, 10, 0, 12, 23,
|
||||
16, 17, 18, 0, 0, 11, 13, 19, 0, 21,
|
||||
0, 20, 22,
|
||||
5, -2, 1, -2, 0, 6, 7, 8, 2, 28,
|
||||
9, 10, 11, 18, 19, 4, 29, 0, 12, 0,
|
||||
14, 27, 20, 16, 17, 21, 22, 0, 0, 13,
|
||||
15, 23, 0, 25, 0, 24, 26,
|
||||
}
|
||||
var yyTok1 = []int{
|
||||
var yyTok1 = [...]int{
|
||||
|
||||
1,
|
||||
}
|
||||
var yyTok2 = []int{
|
||||
var yyTok2 = [...]int{
|
||||
|
||||
2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
|
||||
12, 13, 14, 15, 16, 17,
|
||||
12, 13, 14, 15, 16, 17, 18, 19,
|
||||
}
|
||||
var yyTok3 = []int{
|
||||
var yyTok3 = [...]int{
|
||||
0,
|
||||
}
|
||||
|
||||
var yyErrorMessages = [...]struct {
|
||||
state int
|
||||
token int
|
||||
msg string
|
||||
}{}
|
||||
|
||||
//line yaccpar:1
|
||||
|
||||
/* parser for yacc output */
|
||||
|
||||
var yyDebug = 0
|
||||
var (
|
||||
yyDebug = 0
|
||||
yyErrorVerbose = false
|
||||
)
|
||||
|
||||
type yyLexer interface {
|
||||
Lex(lval *yySymType) int
|
||||
Error(s string)
|
||||
}
|
||||
|
||||
type yyParser interface {
|
||||
Parse(yyLexer) int
|
||||
Lookahead() int
|
||||
}
|
||||
|
||||
type yyParserImpl struct {
|
||||
lval yySymType
|
||||
stack [yyInitialStackSize]yySymType
|
||||
char int
|
||||
}
|
||||
|
||||
func (p *yyParserImpl) Lookahead() int {
|
||||
return p.char
|
||||
}
|
||||
|
||||
func yyNewParser() yyParser {
|
||||
return &yyParserImpl{}
|
||||
}
|
||||
|
||||
const yyFlag = -1000
|
||||
|
||||
func yyTokname(c int) string {
|
||||
// 4 is TOKSTART above
|
||||
if c >= 4 && c-4 < len(yyToknames) {
|
||||
if yyToknames[c-4] != "" {
|
||||
return yyToknames[c-4]
|
||||
if c >= 1 && c-1 < len(yyToknames) {
|
||||
if yyToknames[c-1] != "" {
|
||||
return yyToknames[c-1]
|
||||
}
|
||||
}
|
||||
return __yyfmt__.Sprintf("tok-%v", c)
|
||||
|
|
@ -164,51 +198,127 @@ func yyStatname(s int) string {
|
|||
return __yyfmt__.Sprintf("state-%v", s)
|
||||
}
|
||||
|
||||
func yylex1(lex yyLexer, lval *yySymType) int {
|
||||
c := 0
|
||||
char := lex.Lex(lval)
|
||||
func yyErrorMessage(state, lookAhead int) string {
|
||||
const TOKSTART = 4
|
||||
|
||||
if !yyErrorVerbose {
|
||||
return "syntax error"
|
||||
}
|
||||
|
||||
for _, e := range yyErrorMessages {
|
||||
if e.state == state && e.token == lookAhead {
|
||||
return "syntax error: " + e.msg
|
||||
}
|
||||
}
|
||||
|
||||
res := "syntax error: unexpected " + yyTokname(lookAhead)
|
||||
|
||||
// To match Bison, suggest at most four expected tokens.
|
||||
expected := make([]int, 0, 4)
|
||||
|
||||
// Look for shiftable tokens.
|
||||
base := yyPact[state]
|
||||
for tok := TOKSTART; tok-1 < len(yyToknames); tok++ {
|
||||
if n := base + tok; n >= 0 && n < yyLast && yyChk[yyAct[n]] == tok {
|
||||
if len(expected) == cap(expected) {
|
||||
return res
|
||||
}
|
||||
expected = append(expected, tok)
|
||||
}
|
||||
}
|
||||
|
||||
if yyDef[state] == -2 {
|
||||
i := 0
|
||||
for yyExca[i] != -1 || yyExca[i+1] != state {
|
||||
i += 2
|
||||
}
|
||||
|
||||
// Look for tokens that we accept or reduce.
|
||||
for i += 2; yyExca[i] >= 0; i += 2 {
|
||||
tok := yyExca[i]
|
||||
if tok < TOKSTART || yyExca[i+1] == 0 {
|
||||
continue
|
||||
}
|
||||
if len(expected) == cap(expected) {
|
||||
return res
|
||||
}
|
||||
expected = append(expected, tok)
|
||||
}
|
||||
|
||||
// If the default action is to accept or reduce, give up.
|
||||
if yyExca[i+1] != 0 {
|
||||
return res
|
||||
}
|
||||
}
|
||||
|
||||
for i, tok := range expected {
|
||||
if i == 0 {
|
||||
res += ", expecting "
|
||||
} else {
|
||||
res += " or "
|
||||
}
|
||||
res += yyTokname(tok)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
func yylex1(lex yyLexer, lval *yySymType) (char, token int) {
|
||||
token = 0
|
||||
char = lex.Lex(lval)
|
||||
if char <= 0 {
|
||||
c = yyTok1[0]
|
||||
token = yyTok1[0]
|
||||
goto out
|
||||
}
|
||||
if char < len(yyTok1) {
|
||||
c = yyTok1[char]
|
||||
token = yyTok1[char]
|
||||
goto out
|
||||
}
|
||||
if char >= yyPrivate {
|
||||
if char < yyPrivate+len(yyTok2) {
|
||||
c = yyTok2[char-yyPrivate]
|
||||
token = yyTok2[char-yyPrivate]
|
||||
goto out
|
||||
}
|
||||
}
|
||||
for i := 0; i < len(yyTok3); i += 2 {
|
||||
c = yyTok3[i+0]
|
||||
if c == char {
|
||||
c = yyTok3[i+1]
|
||||
token = yyTok3[i+0]
|
||||
if token == char {
|
||||
token = yyTok3[i+1]
|
||||
goto out
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
if c == 0 {
|
||||
c = yyTok2[1] /* unknown char */
|
||||
if token == 0 {
|
||||
token = yyTok2[1] /* unknown char */
|
||||
}
|
||||
if yyDebug >= 3 {
|
||||
__yyfmt__.Printf("lex %s(%d)\n", yyTokname(c), uint(char))
|
||||
__yyfmt__.Printf("lex %s(%d)\n", yyTokname(token), uint(char))
|
||||
}
|
||||
return c
|
||||
return char, token
|
||||
}
|
||||
|
||||
func yyParse(yylex yyLexer) int {
|
||||
return yyNewParser().Parse(yylex)
|
||||
}
|
||||
|
||||
func (yyrcvr *yyParserImpl) Parse(yylex yyLexer) int {
|
||||
var yyn int
|
||||
var yylval yySymType
|
||||
var yyVAL yySymType
|
||||
yyS := make([]yySymType, yyMaxDepth)
|
||||
var yyDollar []yySymType
|
||||
_ = yyDollar // silence set and not used
|
||||
yyS := yyrcvr.stack[:]
|
||||
|
||||
Nerrs := 0 /* number of errors */
|
||||
Errflag := 0 /* error recovery flag */
|
||||
yystate := 0
|
||||
yychar := -1
|
||||
yyrcvr.char = -1
|
||||
yytoken := -1 // yyrcvr.char translated into internal numbering
|
||||
defer func() {
|
||||
// Make sure we report no lookahead when not parsing.
|
||||
yystate = -1
|
||||
yyrcvr.char = -1
|
||||
yytoken = -1
|
||||
}()
|
||||
yyp := -1
|
||||
goto yystack
|
||||
|
||||
|
|
@ -221,7 +331,7 @@ ret1:
|
|||
yystack:
|
||||
/* put a state and value onto the stack */
|
||||
if yyDebug >= 4 {
|
||||
__yyfmt__.Printf("char %v in %v\n", yyTokname(yychar), yyStatname(yystate))
|
||||
__yyfmt__.Printf("char %v in %v\n", yyTokname(yytoken), yyStatname(yystate))
|
||||
}
|
||||
|
||||
yyp++
|
||||
|
|
@ -238,17 +348,18 @@ yynewstate:
|
|||
if yyn <= yyFlag {
|
||||
goto yydefault /* simple state */
|
||||
}
|
||||
if yychar < 0 {
|
||||
yychar = yylex1(yylex, &yylval)
|
||||
if yyrcvr.char < 0 {
|
||||
yyrcvr.char, yytoken = yylex1(yylex, &yyrcvr.lval)
|
||||
}
|
||||
yyn += yychar
|
||||
yyn += yytoken
|
||||
if yyn < 0 || yyn >= yyLast {
|
||||
goto yydefault
|
||||
}
|
||||
yyn = yyAct[yyn]
|
||||
if yyChk[yyn] == yychar { /* valid shift */
|
||||
yychar = -1
|
||||
yyVAL = yylval
|
||||
if yyChk[yyn] == yytoken { /* valid shift */
|
||||
yyrcvr.char = -1
|
||||
yytoken = -1
|
||||
yyVAL = yyrcvr.lval
|
||||
yystate = yyn
|
||||
if Errflag > 0 {
|
||||
Errflag--
|
||||
|
|
@ -260,8 +371,8 @@ yydefault:
|
|||
/* default state action */
|
||||
yyn = yyDef[yystate]
|
||||
if yyn == -2 {
|
||||
if yychar < 0 {
|
||||
yychar = yylex1(yylex, &yylval)
|
||||
if yyrcvr.char < 0 {
|
||||
yyrcvr.char, yytoken = yylex1(yylex, &yyrcvr.lval)
|
||||
}
|
||||
|
||||
/* look through exception table */
|
||||
|
|
@ -274,7 +385,7 @@ yydefault:
|
|||
}
|
||||
for xi += 2; ; xi += 2 {
|
||||
yyn = yyExca[xi+0]
|
||||
if yyn < 0 || yyn == yychar {
|
||||
if yyn < 0 || yyn == yytoken {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -287,11 +398,11 @@ yydefault:
|
|||
/* error ... attempt to resume parsing */
|
||||
switch Errflag {
|
||||
case 0: /* brand new error */
|
||||
yylex.Error("syntax error")
|
||||
yylex.Error(yyErrorMessage(yystate, yytoken))
|
||||
Nerrs++
|
||||
if yyDebug >= 1 {
|
||||
__yyfmt__.Printf("%s", yyStatname(yystate))
|
||||
__yyfmt__.Printf(" saw %s\n", yyTokname(yychar))
|
||||
__yyfmt__.Printf(" saw %s\n", yyTokname(yytoken))
|
||||
}
|
||||
fallthrough
|
||||
|
||||
|
|
@ -319,12 +430,13 @@ yydefault:
|
|||
|
||||
case 3: /* no shift yet; clobber input char */
|
||||
if yyDebug >= 2 {
|
||||
__yyfmt__.Printf("error recovery discards %s\n", yyTokname(yychar))
|
||||
__yyfmt__.Printf("error recovery discards %s\n", yyTokname(yytoken))
|
||||
}
|
||||
if yychar == yyEofCode {
|
||||
if yytoken == yyEofCode {
|
||||
goto ret1
|
||||
}
|
||||
yychar = -1
|
||||
yyrcvr.char = -1
|
||||
yytoken = -1
|
||||
goto yynewstate /* try again in the same state */
|
||||
}
|
||||
}
|
||||
|
|
@ -339,6 +451,13 @@ yydefault:
|
|||
_ = yypt // guard against "declared and not used"
|
||||
|
||||
yyp -= yyR2[yyn]
|
||||
// yyp is now the index of $0. Perform the default action. Iff the
|
||||
// reduced production is ε, $1 is possibly out of range.
|
||||
if yyp+1 >= len(yyS) {
|
||||
nyys := make([]yySymType, len(yyS)*2)
|
||||
copy(nyys, yyS)
|
||||
yyS = nyys
|
||||
}
|
||||
yyVAL = yyS[yyp+1]
|
||||
|
||||
/* consult goto table to find next state */
|
||||
|
|
@ -358,26 +477,30 @@ yydefault:
|
|||
switch yynt {
|
||||
|
||||
case 1:
|
||||
//line query_string.y:34
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:36
|
||||
{
|
||||
logDebugGrammar("INPUT")
|
||||
}
|
||||
case 2:
|
||||
//line query_string.y:39
|
||||
yyDollar = yyS[yypt-2 : yypt+1]
|
||||
//line query_string.y:41
|
||||
{
|
||||
logDebugGrammar("SEARCH PARTS")
|
||||
}
|
||||
case 3:
|
||||
//line query_string.y:43
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:45
|
||||
{
|
||||
logDebugGrammar("SEARCH PART")
|
||||
}
|
||||
case 4:
|
||||
//line query_string.y:48
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:50
|
||||
{
|
||||
query := yyS[yypt-1].q
|
||||
query.SetBoost(yyS[yypt-0].f)
|
||||
switch yyS[yypt-2].n {
|
||||
query := yyDollar[2].q
|
||||
query.SetBoost(yyDollar[3].f)
|
||||
switch yyDollar[1].n {
|
||||
case queryShould:
|
||||
yylex.(*lexerWrapper).query.AddShould(query)
|
||||
case queryMust:
|
||||
|
|
@ -387,174 +510,235 @@ yydefault:
|
|||
}
|
||||
}
|
||||
case 5:
|
||||
//line query_string.y:63
|
||||
yyDollar = yyS[yypt-0 : yypt+1]
|
||||
//line query_string.y:65
|
||||
{
|
||||
yyVAL.n = queryShould
|
||||
}
|
||||
case 6:
|
||||
//line query_string.y:67
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:69
|
||||
{
|
||||
yyVAL.n = yyS[yypt-0].n
|
||||
yyVAL.n = yyDollar[1].n
|
||||
}
|
||||
case 7:
|
||||
//line query_string.y:73
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:75
|
||||
{
|
||||
logDebugGrammar("PLUS")
|
||||
yyVAL.n = queryMust
|
||||
}
|
||||
case 8:
|
||||
//line query_string.y:78
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:80
|
||||
{
|
||||
logDebugGrammar("MINUS")
|
||||
yyVAL.n = queryMustNot
|
||||
}
|
||||
case 9:
|
||||
//line query_string.y:84
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:86
|
||||
{
|
||||
str := yyS[yypt-0].s
|
||||
str := yyDollar[1].s
|
||||
logDebugGrammar("STRING - %s", str)
|
||||
q := NewMatchQuery(str)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 10:
|
||||
//line query_string.y:91
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:93
|
||||
{
|
||||
str := yyS[yypt-1].s
|
||||
str := yyDollar[1].s
|
||||
logDebugGrammar("REGEXP - %s", str)
|
||||
q := NewRegexpQuery(str)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 11:
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:100
|
||||
{
|
||||
str := yyDollar[1].s
|
||||
logDebugGrammar("WILDCARD - %s", str)
|
||||
q := NewWildcardQuery(str)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 12:
|
||||
yyDollar = yyS[yypt-2 : yypt+1]
|
||||
//line query_string.y:107
|
||||
{
|
||||
str := yyDollar[1].s
|
||||
logDebugGrammar("FUZZY STRING - %s", str)
|
||||
q := NewMatchQuery(str)
|
||||
q.SetFuzziness(1)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 11:
|
||||
//line query_string.y:99
|
||||
case 13:
|
||||
yyDollar = yyS[yypt-4 : yypt+1]
|
||||
//line query_string.y:115
|
||||
{
|
||||
field := yyS[yypt-3].s
|
||||
str := yyS[yypt-1].s
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s FUZZY STRING - %s", field, str)
|
||||
q := NewMatchQuery(str)
|
||||
q.SetFuzziness(1)
|
||||
q.SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 12:
|
||||
//line query_string.y:109
|
||||
case 14:
|
||||
yyDollar = yyS[yypt-2 : yypt+1]
|
||||
//line query_string.y:125
|
||||
{
|
||||
str := yyS[yypt-1].s
|
||||
fuzziness, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
str := yyDollar[1].s
|
||||
fuzziness, _ := strconv.ParseFloat(yyDollar[2].s, 64)
|
||||
logDebugGrammar("FUZZY STRING - %s", str)
|
||||
q := NewMatchQuery(str)
|
||||
q.SetFuzziness(int(fuzziness))
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 13:
|
||||
//line query_string.y:118
|
||||
case 15:
|
||||
yyDollar = yyS[yypt-4 : yypt+1]
|
||||
//line query_string.y:134
|
||||
{
|
||||
field := yyS[yypt-3].s
|
||||
str := yyS[yypt-1].s
|
||||
fuzziness, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
fuzziness, _ := strconv.ParseFloat(yyDollar[4].s, 64)
|
||||
logDebugGrammar("FIELD - %s FUZZY-%f STRING - %s", field, fuzziness, str)
|
||||
q := NewMatchQuery(str)
|
||||
q.SetFuzziness(int(fuzziness))
|
||||
q.SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 14:
|
||||
//line query_string.y:129
|
||||
case 16:
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:145
|
||||
{
|
||||
str := yyS[yypt-0].s
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s REGEXP - %s", field, str)
|
||||
q := NewRegexpQuery(str)
|
||||
q.SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 17:
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:154
|
||||
{
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s WILD - %s", field, str)
|
||||
q := NewWildcardQuery(str)
|
||||
q.SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 18:
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:163
|
||||
{
|
||||
str := yyDollar[1].s
|
||||
logDebugGrammar("STRING - %s", str)
|
||||
q := NewMatchQuery(str)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 15:
|
||||
//line query_string.y:136
|
||||
case 19:
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:170
|
||||
{
|
||||
phrase := yyS[yypt-0].s
|
||||
phrase := yyDollar[1].s
|
||||
logDebugGrammar("PHRASE - %s", phrase)
|
||||
q := NewMatchPhraseQuery(phrase)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 16:
|
||||
//line query_string.y:143
|
||||
case 20:
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:177
|
||||
{
|
||||
field := yyS[yypt-2].s
|
||||
str := yyS[yypt-0].s
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s STRING - %s", field, str)
|
||||
q := NewMatchQuery(str).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 17:
|
||||
//line query_string.y:151
|
||||
case 21:
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:185
|
||||
{
|
||||
field := yyS[yypt-2].s
|
||||
str := yyS[yypt-0].s
|
||||
field := yyDollar[1].s
|
||||
str := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s STRING - %s", field, str)
|
||||
q := NewMatchQuery(str).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 18:
|
||||
//line query_string.y:159
|
||||
case 22:
|
||||
yyDollar = yyS[yypt-3 : yypt+1]
|
||||
//line query_string.y:193
|
||||
{
|
||||
field := yyS[yypt-2].s
|
||||
phrase := yyS[yypt-0].s
|
||||
field := yyDollar[1].s
|
||||
phrase := yyDollar[3].s
|
||||
logDebugGrammar("FIELD - %s PHRASE - %s", field, phrase)
|
||||
q := NewMatchPhraseQuery(phrase).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 19:
|
||||
//line query_string.y:167
|
||||
case 23:
|
||||
yyDollar = yyS[yypt-4 : yypt+1]
|
||||
//line query_string.y:201
|
||||
{
|
||||
field := yyS[yypt-3].s
|
||||
min, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
field := yyDollar[1].s
|
||||
min, _ := strconv.ParseFloat(yyDollar[4].s, 64)
|
||||
minInclusive := false
|
||||
logDebugGrammar("FIELD - GREATER THAN %f", min)
|
||||
q := NewNumericRangeInclusiveQuery(&min, nil, &minInclusive, nil).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 20:
|
||||
//line query_string.y:176
|
||||
case 24:
|
||||
yyDollar = yyS[yypt-5 : yypt+1]
|
||||
//line query_string.y:210
|
||||
{
|
||||
field := yyS[yypt-4].s
|
||||
min, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
field := yyDollar[1].s
|
||||
min, _ := strconv.ParseFloat(yyDollar[5].s, 64)
|
||||
minInclusive := true
|
||||
logDebugGrammar("FIELD - GREATER THAN OR EQUAL %f", min)
|
||||
q := NewNumericRangeInclusiveQuery(&min, nil, &minInclusive, nil).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 21:
|
||||
//line query_string.y:185
|
||||
case 25:
|
||||
yyDollar = yyS[yypt-4 : yypt+1]
|
||||
//line query_string.y:219
|
||||
{
|
||||
field := yyS[yypt-3].s
|
||||
max, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
field := yyDollar[1].s
|
||||
max, _ := strconv.ParseFloat(yyDollar[4].s, 64)
|
||||
maxInclusive := false
|
||||
logDebugGrammar("FIELD - LESS THAN %f", max)
|
||||
q := NewNumericRangeInclusiveQuery(nil, &max, nil, &maxInclusive).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 22:
|
||||
//line query_string.y:194
|
||||
case 26:
|
||||
yyDollar = yyS[yypt-5 : yypt+1]
|
||||
//line query_string.y:228
|
||||
{
|
||||
field := yyS[yypt-4].s
|
||||
max, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
field := yyDollar[1].s
|
||||
max, _ := strconv.ParseFloat(yyDollar[5].s, 64)
|
||||
maxInclusive := true
|
||||
logDebugGrammar("FIELD - LESS THAN OR EQUAL %f", max)
|
||||
q := NewNumericRangeInclusiveQuery(nil, &max, nil, &maxInclusive).SetField(field)
|
||||
yyVAL.q = q
|
||||
}
|
||||
case 23:
|
||||
//line query_string.y:204
|
||||
case 27:
|
||||
yyDollar = yyS[yypt-2 : yypt+1]
|
||||
//line query_string.y:238
|
||||
{
|
||||
boost, _ := strconv.ParseFloat(yyS[yypt-0].s, 64)
|
||||
boost, _ := strconv.ParseFloat(yyDollar[2].s, 64)
|
||||
yyVAL.f = boost
|
||||
logDebugGrammar("BOOST %f", boost)
|
||||
}
|
||||
case 24:
|
||||
//line query_string.y:211
|
||||
case 28:
|
||||
yyDollar = yyS[yypt-0 : yypt+1]
|
||||
//line query_string.y:245
|
||||
{
|
||||
yyVAL.f = 1.0
|
||||
}
|
||||
case 25:
|
||||
//line query_string.y:215
|
||||
case 29:
|
||||
yyDollar = yyS[yypt-1 : yypt+1]
|
||||
//line query_string.y:249
|
||||
{
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -765,5 +765,41 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"comment": "test wildcard inside query string",
|
||||
"search": {
|
||||
"from": 0,
|
||||
"size": 10,
|
||||
"query": {
|
||||
"query": "name:mar*"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"total_hits": 1,
|
||||
"hits": [
|
||||
{
|
||||
"id": "a"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"comment": "test regexp inside query string",
|
||||
"search": {
|
||||
"from": 0,
|
||||
"size": 10,
|
||||
"query": {
|
||||
"query": "name:/mar.*/"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"total_hits": 1,
|
||||
"hits": [
|
||||
{
|
||||
"id": "a"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in New Issue