dapr
/
components-contrib
mirror of https://github.com/dapr/components-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

state store query API: remove preceding '.' in key names (#1500) 

Signed-off-by: Dmitry Shmulevich <dmitry.shmulevich@gmail.com>
This commit is contained in:
Dmitry Shmulevich 2022-02-11 15:00:43 -08:00 committed by GitHub
parent 1cb659c0b8
commit 7fdebda09b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
state/azure/cosmosdb/cosmosdb_query.go
View File

@ -40,7 +40,7 @@ func (q *Query) VisitEQ(f *query.EQ) (string, error) {
}
name := q.setNextParameter(val)
return fmt.Sprintf("%s = %s", replaceKeywords("c.value"+f.Key), name), nil
return fmt.Sprintf("%s = %s", replaceKeywords("c.value."+f.Key), name), nil
}
func (q *Query) VisitIN(f *query.IN) (string, error) {
@ -57,7 +57,7 @@ func (q *Query) VisitIN(f *query.IN) (string, error) {
names[i] = q.setNextParameter(val)
}
return fmt.Sprintf("%s IN (%s)", replaceKeywords("c.value"+f.Key), strings.Join(names, ", ")), nil
return fmt.Sprintf("%s IN (%s)", replaceKeywords("c.value."+f.Key), strings.Join(names, ", ")), nil
}
func (q *Query) visitFilters(op string, filters []query.Filter) (string, error) {
@ -115,9 +115,9 @@ func (q *Query) Finalize(filters string, qq *query.Query) error {
order := make([]string, sz)
for i, item := range qq.Sort {
if item.Order == query.DESC {
order[i] = fmt.Sprintf("%s DESC", replaceKeywords("c.value"+item.Key))
order[i] = fmt.Sprintf("%s DESC", replaceKeywords("c.value."+item.Key))
} else {
order[i] = fmt.Sprintf("%s ASC", replaceKeywords("c.value"+item.Key))
order[i] = fmt.Sprintf("%s ASC", replaceKeywords("c.value."+item.Key))
}
}
orderBy = fmt.Sprintf(" ORDER BY %s", strings.Join(order, ", "))

6
state/mongodb/mongodb_query.go
View File

@ -37,7 +37,7 @@ type Query struct {
func (q *Query) VisitEQ(f *query.EQ) (string, error) {
// { <key>: <val> }
return fmt.Sprintf(`{ "value%s": %q }`, f.Key, f.Val), nil
return fmt.Sprintf(`{ "value.%s": %q }`, f.Key, f.Val), nil
}
func (q *Query) VisitIN(f *query.IN) (string, error) {
@ -45,7 +45,7 @@ func (q *Query) VisitIN(f *query.IN) (string, error) {
if len(f.Vals) == 0 {
return "", fmt.Errorf("empty IN operator for key %q", f.Key)
}
str := fmt.Sprintf(`{ "value%s": { "$in": [ %q`, f.Key, f.Vals[0])
str := fmt.Sprintf(`{ "value.%s": { "$in": [ %q`, f.Key, f.Vals[0])
for _, v := range f.Vals[1:] {
str += fmt.Sprintf(", %q", v)
}
@ -117,7 +117,7 @@ func (q *Query) Finalize(filters string, qq *query.Query) error {
if s.Order == query.DESC {
order = -1
}
sort = append(sort, bson.E{Key: "value" + s.Key, Value: order})
sort = append(sort, bson.E{Key: "value." + s.Key, Value: order})
}
q.opts.SetSort(sort)
}

2
state/postgresql/postgresql_query.go
View File

@ -185,7 +185,7 @@ func (q *Query) addParamValueAndReturnPosition(value interface{}) int {
func translateFieldToFilter(key string) string {
// add preceding "value"
key = "value" + key
key = "value." + key
fieldParts := strings.Split(key, ".")
filterField := fieldParts[0]

20
state/query/query_test.go
View File

@ -41,7 +41,7 @@ func TestQuery(t *testing.T) {
Filters: nil,
Sort: nil,
Page: Pagination{Limit: 2, Token: ""},
Filter: &EQ{Key: ".state", Val: "CA"},
Filter: &EQ{Key: "state", Val: "CA"},
},
},
{
@ -49,14 +49,14 @@ func TestQuery(t *testing.T) {
query: Query{
Filters: nil,
Sort: []Sorting{
{Key: ".state", Order: "DESC"},
{Key: ".person.name", Order: ""},
{Key: "state", Order: "DESC"},
{Key: "person.name", Order: ""},
},
Page: Pagination{Limit: 0, Token: ""},
Filter: &AND{
Filters: []Filter{
&EQ{Key: ".person.org", Val: "A"},
&IN{Key: ".state", Vals: []interface{}{"CA", "WA"}},
&EQ{Key: "person.org", Val: "A"},
&IN{Key: "state", Vals: []interface{}{"CA", "WA"}},
},
},
},
@ -66,17 +66,17 @@ func TestQuery(t *testing.T) {
query: Query{
Filters: nil,
Sort: []Sorting{
{Key: ".state", Order: "DESC"},
{Key: ".person.name", Order: ""},
{Key: "state", Order: "DESC"},
{Key: "person.name", Order: ""},
},
Page: Pagination{Limit: 2, Token: ""},
Filter: &OR{
Filters: []Filter{
&EQ{Key: ".person.org", Val: "A"},
&EQ{Key: "person.org", Val: "A"},
&AND{
Filters: []Filter{
&EQ{Key: ".person.org", Val: "B"},
&IN{Key: ".state", Vals: []interface{}{"CA", "WA"}},
&EQ{Key: "person.org", Val: "B"},
&IN{Key: "state", Vals: []interface{}{"CA", "WA"}},
},
},
},

4
tests/conformance/state/state.go
View File

@ -188,10 +188,10 @@ func ConformanceTests(t *testing.T, props map[string]string, statestore state.St
"filter": {
"OR": [
{
"EQ": {".message": "dummy"}
"EQ": {"message": "dummy"}
},
{
"IN": {".message": ["` + key + `-test", "dummy"]}
"IN": {"message": ["` + key + `-test", "dummy"]}
}
]
}

2
tests/state/query/q2-token.json
View File

@ -2,7 +2,7 @@
{
"filter": {
"EQ": {
".state": "CA"
"state": "CA"
}
},
"page": {

2
tests/state/query/q2.json
View File

@ -2,7 +2,7 @@
{
"filter": {
"EQ": {
".state": "CA"
"state": "CA"
}
},
"page": {

8
tests/state/query/q3.json
View File

@ -3,23 +3,23 @@
"AND": [
{
"EQ": {
".person.org": "A"
"person.org": "A"
}
},
{
"IN": {
".state":["CA", "WA"]
"state":["CA", "WA"]
}
}
]
},
"sort": [
{
"key": ".state",
"key": "state",
"order": "DESC"
},
{
"key": ".person.name"
"key": "person.name"
}
]
}

10
tests/state/query/q4.json
View File

@ -3,19 +3,19 @@
"OR": [
{
"EQ": {
".person.org": "A"
"person.org": "A"
}
},
{
"AND": [
{
"EQ": {
".person.org": "B"
"person.org": "B"
}
},
{
"IN": {
".state": ["CA", "WA"]
"state": ["CA", "WA"]
}
}
]
@ -24,11 +24,11 @@
},
"sort": [
{
"key": ".state",
"key": "state",
"order": "DESC"
},
{
"key": ".person.name"
"key": "person.name"
}
],
"page": {

10
tests/state/query/q5.json
View File

@ -3,19 +3,19 @@
"AND": [
{
"EQ": {
".person.org": "A"
"person.org": "A"
}
},
{
"OR": [
{
"EQ": {
".person.name": "B"
"person.name": "B"
}
},
{
"IN": {
".state": ["CA", "WA"]
"state": ["CA", "WA"]
}
}
]
@ -24,11 +24,11 @@
},
"sort": [
{
"key": ".state",
"key": "state",
"order": "DESC"
},
{
"key": ".person.name"
"key": "person.name"
}
],
"page": {