11 Commits

Author SHA1 Message Date
ea73b4a9b9 添加简单的test 2018-12-24 21:10:17 +08:00
98ff746add 改了gjson匹配规则. 2018-12-24 21:08:43 +08:00
ab583cb85c fix: src code error. 2018-12-24 20:03:07 +08:00
862cbc6b80 delete log rpv 2018-12-23 22:27:33 +08:00
013383b188 添加正则表达式的方法 2018-12-23 21:36:09 +08:00
fdedd9ddb2 改进正则的方法 2018-12-23 05:38:59 +08:00
8ca66dad60 改匹配模式为正则表达式 2018-12-23 05:04:37 +08:00
Josh Baker
081192fa2e Merge pull request #98 from thirstycoda/master
Added not like operator support to query
2018-10-28 08:46:04 -07:00
Josh Baker
1bd06b6ad9 Merge pull request #97 from dustinblackman/fix/getmanybytes
Fix GetManyBytes to use byte related methods
2018-10-28 08:42:31 -07:00
thirstycoda
cced0fa719 Added not like operator support to query 2018-10-28 00:20:01 +01:00
Dustin Blackman
4c7d6ff4a9 fix GetManyBytes to use byte related methods 2018-10-25 16:34:28 -04:00
3 changed files with 74 additions and 28 deletions

View File

@@ -88,13 +88,14 @@ The dot and wildcard characters can be escaped with '\\'.
```
You can also query an array for the first match by using `#[...]`, or find all matches with `#[...]#`.
Queries support the `==`, `!=`, `<`, `<=`, `>`, `>=` comparison operators and the simple pattern matching `%` operator.
Queries support the `==`, `!=`, `<`, `<=`, `>`, `>=` comparison operators and the simple pattern matching `%` (like) and `!%` (not like) operators.
```
friends.#[last=="Murphy"].first >> "Dale"
friends.#[last=="Murphy"]#.first >> ["Dale","Jane"]
friends.#[age>45]#.last >> ["Craig","Murphy"]
friends.#[first%"D*"].last >> "Murphy"
friends.#[first!%"D*"].last >> "Craig"
```
## JSON Lines

View File

@@ -6,6 +6,7 @@ import (
"encoding/json"
"errors"
"reflect"
"regexp"
"strconv"
"strings"
"sync"
@@ -706,6 +707,8 @@ type arrayPathResult struct {
value string
all bool
}
re *regexp.Regexp
}
func parseArrayPath(path string) (r arrayPathResult) {
@@ -741,6 +744,7 @@ func parseArrayPath(path string) (r arrayPathResult) {
path[i] == '<' ||
path[i] == '>' ||
path[i] == '%' ||
path[i] == '~' ||
path[i] == ']' {
break
}
@@ -755,7 +759,7 @@ func parseArrayPath(path string) (r arrayPathResult) {
if i < len(path) {
s = i
if path[i] == '!' {
if i < len(path)-1 && path[i+1] == '=' {
if i < len(path)-1 && (path[i+1] == '=' || path[i+1] == '%') {
i++
}
} else if path[i] == '<' || path[i] == '>' {
@@ -776,39 +780,32 @@ func parseArrayPath(path string) (r arrayPathResult) {
break
}
}
s = i
s = i + 1
pair := path[i]
i++
GETREGEXPSTR:
for ; i < len(path); i++ {
if path[i] == '"' {
i++
s2 := i
for ; i < len(path); i++ {
if path[i] > '\\' {
if path[i] == pair {
for iend := i + 1; iend < len(path); iend++ {
if path[iend] == ' ' {
continue
}
if path[i] == '"' {
// look for an escaped slash
if path[i-1] == '\\' {
n := 0
for j := i - 2; j > s2-1; j-- {
if path[j] != '\\' {
break
}
n++
}
if n%2 == 0 {
continue
}
if path[iend] == ']' {
if iend+1 < len(path) && path[iend+1] == '#' {
r.query.all = true
}
break GETREGEXPSTR
} else {
break
}
}
} else if path[i] == ']' {
if i+1 < len(path) && path[i+1] == '#' {
r.query.all = true
}
break
}
}
if i > len(path) {
i = len(path)
}
@@ -1077,6 +1074,22 @@ func parseObject(c *parseContext, i int, path string) (int, bool) {
}
return i, false
}
func escapeRegexpString(rpv string) string {
var content []byte
lrpv := len(rpv)
for i := 0; i < lrpv; i++ {
rpvChar := rpv[i]
if rpvChar == '\\' {
content = append(content, rpv[i+1])
i++
} else {
content = append(content, rpvChar)
}
}
return string(content)
}
func queryMatches(rp *arrayPathResult, value Result) bool {
rpv := rp.query.value
if len(rpv) > 2 && rpv[0] == '"' && rpv[len(rpv)-1] == '"' {
@@ -1099,6 +1112,13 @@ func queryMatches(rp *arrayPathResult, value Result) bool {
return value.Str >= rpv
case "%":
return match.Match(value.Str, rpv)
case "!%":
return !match.Match(value.Str, rpv)
case "~":
if rp.re == nil {
rp.re = regexp.MustCompile(rpv)
}
return rp.re.MatchString(value.Str)
}
case Number:
rpvn, _ := strconv.ParseFloat(rpv, 64)
@@ -1626,7 +1646,11 @@ func GetMany(json string, path ...string) []Result {
// The return value is a Result array where the number of items
// will be equal to the number of input paths.
func GetManyBytes(json []byte, path ...string) []Result {
return GetMany(string(json), path...)
res := make([]Result, len(path))
for i, path := range path {
res[i] = GetBytes(json, path)
}
return res
}
var fieldsmu sync.RWMutex

View File

@@ -390,6 +390,7 @@ func TestBasic1(t *testing.T) {
t.Fatalf("expected %v, got %v", 3, count)
}
}
func TestBasic2(t *testing.T) {
mtok := get(basicJSON, `loggy.programmers.#[age=101].firstName`)
if mtok.String() != "1002.3" {
@@ -399,10 +400,15 @@ func TestBasic2(t *testing.T) {
if mtok.String() != "Jason" {
t.Fatalf("expected %v, got %v", "Jason", mtok.String())
}
mtok = get(basicJSON, `loggy.programmers.#[firstName % "Bre*"].email`)
mtok = get(basicJSON, `loggy.programmers.#[firstName % "Bre.*"].email`)
if mtok.String() != "aaaa" {
t.Fatalf("expected %v, got %v", "aaaa", mtok.String())
}
mtok = get(basicJSON, `loggy.programmers.#[firstName !% "Bre.*"].email`)
if mtok.String() != "bbbb" {
t.Fatalf("expected %v, got %v", "bbbb", mtok.String())
}
mtok = get(basicJSON, `loggy.programmers.#[firstName == "Brett"].email`)
if mtok.String() != "aaaa" {
t.Fatalf("expected %v, got %v", "aaaa", mtok.String())
@@ -1427,3 +1433,18 @@ func TestArrayValues(t *testing.T) {
}
}
func TestRegexp(t *testing.T) {
mtok := get(`{"data": [ {"dat": "123\"", "next": [{"a": "\"32"}, {"a": "32"}]}, {"dat": "234"} ] }`, `data.#[dat ~ "3\""].next.#[a ~ @\"32@]#.a`)
if mtok.String() != `["\"32"]` {
t.Fatalf("expected %v, got %v", `"32`, mtok.String())
}
}
func TestChinese(t *testing.T) {
js := `{"data": [{"f":"\"广告"}, {"f": "广告"}]}`
mtok := get(js, `data.#[f=""广告"]#`)
if mtok.Array()[0].String() != `{"f":"\"广告"}` {
t.Error("error", mtok.Array())
}
}