Skip to content

add support for scan op #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 23, 2023
Merged

add support for scan op #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
945a02c
add support for scan op
May 23, 2023
6d16306
improve error message
May 23, 2023
e276706
fmt to t.Log
May 23, 2023
a540fe6
better map iteration
May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 43 additions & 3 deletions jsonpath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (c *Compiled) String() string {
func (c *Compiled) Lookup(obj interface{}) (interface{}, error) {
var err error
for _, s := range c.steps {
// "key", "idx"
// "key", "idx", "range", "filter", "scan"
switch s.op {
case "key":
obj, err = get_key(obj, s.key)
Expand Down Expand Up @@ -138,8 +138,13 @@ func (c *Compiled) Lookup(obj interface{}) (interface{}, error) {
if err != nil {
return nil, err
}
case "scan":
obj, err = get_scan(obj)
if err != nil {
return nil, err
}
default:
return nil, fmt.Errorf("expression don't support in filter")
return nil, fmt.Errorf("unsupported jsonpath operation: %s", s.op)
}
}
return obj, nil
Expand Down Expand Up @@ -354,7 +359,7 @@ func filter_get_from_explicit_path(obj interface{}, path string) (interface{}, e
return nil, err
}
default:
return nil, fmt.Errorf("expression don't support in filter")
return nil, fmt.Errorf("unsupported jsonpath operation %s in filter", op)
}
}
return xobj, nil
Expand Down Expand Up @@ -550,6 +555,41 @@ func get_filtered(obj, root interface{}, filter string) ([]interface{}, error) {
return res, nil
}

func get_scan(obj interface{}) (interface{}, error) {
if reflect.TypeOf(obj) == nil {
return nil, ErrGetFromNullObj
}
switch reflect.TypeOf(obj).Kind() {
case reflect.Map:
var res []interface{}
if jsonMap, ok := obj.(map[string]interface{}); ok {
for _, v := range jsonMap {
res = append(res, v)
}
return res, nil
}
iter := reflect.ValueOf(obj).MapRange()
for iter.Next() {
res = append(res, iter.Value().Interface())
}
return res, nil
case reflect.Slice:
// slice we should get from all objects in it.
var res []interface{}
for i := 0; i < reflect.ValueOf(obj).Len(); i++ {
tmp := reflect.ValueOf(obj).Index(i).Interface()
newObj, err := get_scan(tmp)
if err != nil {
return nil, err
}
res = append(res, newObj.([]interface{})...)
}
return res, nil
default:
return nil, fmt.Errorf("object is not scanable: %v", reflect.TypeOf(obj).Kind())
}
}

// @.isbn => @.isbn, exists, nil
// @.price < 10 => @.price, <, 10
// @.price <= $.expensive => @.price, <=, $.expensive
Expand Down
128 changes: 107 additions & 21 deletions jsonpath_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ func Test_jsonpath_parse_token(t *testing.T) {

if op == "range" {
if args_v, ok := args.([2]interface{}); ok == true {
fmt.Println(args_v)
t.Logf("%v", args_v)
exp_from := exp_args.([2]interface{})[0]
exp_to := exp_args.([2]interface{})[1]
if args_v[0] != exp_from {
Expand All @@ -356,7 +356,7 @@ func Test_jsonpath_parse_token(t *testing.T) {

if op == "filter" {
if args_v, ok := args.(string); ok == true {
fmt.Println(args_v)
t.Logf(args_v)
if exp_args.(string) != args_v {
t.Errorf("len(args) not expected: (got)%v != (exp)%v", len(args_v), len(exp_args.([]string)))
return
Expand All @@ -374,7 +374,7 @@ func Test_jsonpath_get_key(t *testing.T) {
"key": 1,
}
res, err := get_key(obj, "key")
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get key: %v", err)
return
Expand All @@ -385,7 +385,7 @@ func Test_jsonpath_get_key(t *testing.T) {
}

res, err = get_key(obj, "hah")
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err == nil {
t.Errorf("key error not raised")
return
Expand All @@ -397,7 +397,7 @@ func Test_jsonpath_get_key(t *testing.T) {

obj2 := 1
res, err = get_key(obj2, "key")
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err == nil {

t.Errorf("object is not map error not raised")
Expand All @@ -406,7 +406,7 @@ func Test_jsonpath_get_key(t *testing.T) {
obj3 := map[string]string{"key": "hah"}
res, err = get_key(obj3, "key")
if res_v, ok := res.(string); ok != true || res_v != "hah" {
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
t.Errorf("map[string]string support failed")
}

Expand All @@ -419,13 +419,13 @@ func Test_jsonpath_get_key(t *testing.T) {
},
}
res, err = get_key(obj4, "a")
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
}

func Test_jsonpath_get_idx(t *testing.T) {
obj := []interface{}{1, 2, 3, 4}
res, err := get_idx(obj, 0)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get_idx(obj,0): %v", err)
return
Expand All @@ -435,19 +435,19 @@ func Test_jsonpath_get_idx(t *testing.T) {
}

res, err = get_idx(obj, 2)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if v, ok := res.(int); ok != true || v != 3 {
t.Errorf("failed to get int 3")
}
res, err = get_idx(obj, 4)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err == nil {
t.Errorf("index out of range error not raised")
return
}

res, err = get_idx(obj, -1)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get_idx(obj, -1): %v", err)
return
Expand All @@ -457,13 +457,13 @@ func Test_jsonpath_get_idx(t *testing.T) {
}

res, err = get_idx(obj, -4)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if v, ok := res.(int); ok != true || v != 1 {
t.Errorf("failed to get int 1")
}

res, err = get_idx(obj, -5)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err == nil {
t.Errorf("index out of range error not raised")
return
Expand All @@ -478,7 +478,7 @@ func Test_jsonpath_get_idx(t *testing.T) {

obj2 := []int{1, 2, 3, 4}
res, err = get_idx(obj2, 0)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get_idx(obj2,0): %v", err)
return
Expand All @@ -492,7 +492,7 @@ func Test_jsonpath_get_range(t *testing.T) {
obj := []int{1, 2, 3, 4, 5}

res, err := get_range(obj, 0, 2)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get_range: %v", err)
}
Expand All @@ -502,11 +502,11 @@ func Test_jsonpath_get_range(t *testing.T) {

obj1 := []interface{}{1, 2, 3, 4, 5}
res, err = get_range(obj1, 3, -1)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to get_range: %v", err)
}
fmt.Println(res.([]interface{}))
t.Logf("%v", res.([]interface{}))
if res.([]interface{})[0] != 4 || res.([]interface{})[1] != 5 {
t.Errorf("failed get_range: %v, expect: [4,5]", res)
}
Expand All @@ -531,16 +531,102 @@ func Test_jsonpath_get_range(t *testing.T) {

obj2 := 2
res, err = get_range(obj2, 0, 1)
fmt.Println(err, res)
t.Logf("err: %v, res: %v", err, res)
if err == nil {
t.Errorf("object is Slice error not raised")
}
}

func Test_jsonpath_get_scan(t *testing.T) {
obj := map[string]interface{}{
"key": 1,
}
res, err := get_scan(obj)
t.Logf("err: %v, res: %v", err, res)
if err != nil {
t.Errorf("failed to scan: %v", err)
return
}
if res.([]interface{})[0] != 1 {
t.Errorf("scanned value is not 1: %v", res)
return
}

obj2 := 1
res, err = get_scan(obj2)
t.Logf("err: %v, res: %v", err, res)
if err == nil {
t.Errorf("object is not scanable error not raised")
return
}

obj3 := map[string]string{"key1": "hah1", "key2": "hah2", "key3": "hah3"}
res, err = get_scan(obj3)
if err != nil {
t.Errorf("failed to scan: %v", err)
return
}
res_v, ok := res.([]interface{})
if !ok {
t.Errorf("scanned result is not a slice")
}
if len(res_v) != 3 {
t.Errorf("scanned result is of wrong length")
}
// order of items in maps can't be guaranteed
for _, v := range res_v {
val, _ := v.(string)
if val != "hah1" && val != "hah2" && val != "hah3" {
t.Errorf("scanned result contains unexpected value: %v", val)
}
}

obj4 := map[string]interface{}{
"key1" : "abc",
"key2" : 123,
"key3" : map[string]interface{}{
"a": 1,
"b": 2,
"c": 3,
},
"key4" : []interface{}{1,2,3},
}
res, err = get_scan(obj4)
res_v, ok = res.([]interface{})
if !ok {
t.Errorf("scanned result is not a slice")
}
if len(res_v) != 4 {
t.Errorf("scanned result is of wrong length")
}
// order of items in maps can't be guaranteed
for _, v := range res_v {
switch v.(type) {
case string:
if v_str, ok := v.(string); ok && v_str == "abc" {
continue
}
case int:
if v_int, ok := v.(int); ok && v_int == 123 {
continue
}
case map[string]interface{}:
if v_map, ok := v.(map[string]interface{}); ok && v_map["a"].(int) == 1 && v_map["b"].(int) == 2 && v_map["c"].(int) == 3 {
continue
}
case []interface{}:
if v_slice, ok := v.([]interface{}); ok && v_slice[0].(int) == 1 && v_slice[1].(int) == 2 && v_slice[2].(int) == 3 {
continue
}
}
t.Errorf("scanned result contains unexpected value: %v", v)
}
}

func Test_jsonpath_types_eval(t *testing.T) {
fset := token.NewFileSet()
res, err := types.Eval(fset, nil, 0, "1 < 2")
fmt.Println(err, res, res.Type, res.Value, res.IsValue())
t.Logf("err: %v, res: %v, res.Type: %v, res.Value: %v, res.IsValue: %v", err, res, res.Type, res.Value, res.IsValue())
}

var tcase_parse_filter = []map[string]interface{}{
Expand Down Expand Up @@ -747,7 +833,7 @@ var tcase_eval_filter = []map[string]interface{}{

func Test_jsonpath_eval_filter(t *testing.T) {
for idx, tcase := range tcase_eval_filter[1:] {
fmt.Println("------------------------------")
t.Logf("------------------------------")
obj := tcase["obj"].(map[string]interface{})
root := tcase["root"].(map[string]interface{})
lp := tcase["lp"].(string)
Expand Down Expand Up @@ -1074,7 +1160,7 @@ var tcases_reg_op = []struct {

func TestRegOp(t *testing.T) {
for idx, tcase := range tcases_reg_op {
fmt.Println("idx: ", idx, "tcase: ", tcase)
t.Logf("idx: %v, tcase: %v", idx, tcase)
res, err := regFilterCompile(tcase.Line)
if tcase.Err == true {
if err == nil {
Expand Down