From f67f1d8d52eb7e01fee77af67609873002b125a5 Mon Sep 17 00:00:00 2001 From: Bernd Verst <4535280+berndverst@users.noreply.github.com> Date: Tue, 15 Feb 2022 18:31:10 -0800 Subject: [PATCH 1/2] Update examples for new state store query syntax Signed-off-by: Bernd Verst <4535280+berndverst@users.noreply.github.com> --- dapr/clients/grpc/client.py | 4 ++-- daprdocs/content/en/python-sdk-docs/python-client.md | 4 ++-- examples/state_store_query/query-token.json | 10 +++++----- examples/state_store_query/query.json | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dapr/clients/grpc/client.py b/dapr/clients/grpc/client.py index a55b4a4c0..45482af0e 100644 --- a/dapr/clients/grpc/client.py +++ b/dapr/clients/grpc/client.py @@ -475,11 +475,11 @@ def query_state( query = ''' { "filter": { - "EQ": { "value.state": "CA" } + "EQ": { "state": "CA" } }, "sort": [ { - "key": "value.person.id", + "key": "person.id", "order": "DESC" } ] diff --git a/daprdocs/content/en/python-sdk-docs/python-client.md b/daprdocs/content/en/python-sdk-docs/python-client.md index 3837f1243..ead913390 100644 --- a/daprdocs/content/en/python-sdk-docs/python-client.md +++ b/daprdocs/content/en/python-sdk-docs/python-client.md @@ -71,11 +71,11 @@ with DaprClient() as d: query = ''' { "filter": { - "EQ": { "value.state": "CA" } + "EQ": { "state": "CA" } }, "sort": [ { - "key": "value.person.id", + "key": "person.id", "order": "DESC" } ] diff --git a/examples/state_store_query/query-token.json b/examples/state_store_query/query-token.json index 87a2e5582..61c21c3de 100644 --- a/examples/state_store_query/query-token.json +++ b/examples/state_store_query/query-token.json @@ -2,15 +2,15 @@ "filter": { "OR": [ { - "EQ": { "value.person.org": "Dev Ops" } + "EQ": { "person.org": "Dev Ops" } }, { "AND": [ { - "EQ": { "value.person.org": "Finance" } + "EQ": { "person.org": "Finance" } }, { - "IN": { "value.state": [ "CA", "WA" ] } + "IN": { "state": [ "CA", "WA" ] } } ] } @@ -18,11 +18,11 @@ }, "sort": [ { - "key": "value.state", + "key": "state", "order": "DESC" }, { - "key": "value.person.id" + "key": "person.id" } ], "page": { diff --git a/examples/state_store_query/query.json b/examples/state_store_query/query.json index 5a8b7ff1c..e93f5bfdd 100644 --- a/examples/state_store_query/query.json +++ b/examples/state_store_query/query.json @@ -2,15 +2,15 @@ "filter": { "OR": [ { - "EQ": { "value.person.org": "Dev Ops" } + "EQ": { "person.org": "Dev Ops" } }, { "AND": [ { - "EQ": { "value.person.org": "Finance" } + "EQ": { "person.org": "Finance" } }, { - "IN": { "value.state": [ "CA", "WA" ] } + "IN": { "state": [ "CA", "WA" ] } } ] } @@ -18,11 +18,11 @@ }, "sort": [ { - "key": "value.state", + "key": "state", "order": "DESC" }, { - "key": "value.person.id" + "key": "person.id" } ], "page": { From 7f1b3e2b9a4830b61da8e4631008878916904201 Mon Sep 17 00:00:00 2001 From: Bernd Verst <4535280+berndverst@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:03:17 -0700 Subject: [PATCH 2/2] Update query example output Signed-off-by: Bernd Verst <4535280+berndverst@users.noreply.github.com> --- examples/state_store_query/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/state_store_query/README.md b/examples/state_store_query/README.md index b1708da2f..a15657bc1 100644 --- a/examples/state_store_query/README.md +++ b/examples/state_store_query/README.md @@ -56,13 +56,13 @@ Now run the app @@ -74,13 +74,13 @@ dapr run --app-id queryexample --components-path components/ -- python3 state_st You should be able to see the following output: ``` -== APP == 1 {"city": "Seattle", "person": {"id": {"$numberDouble": "1036.0"}, "org": "Dev Ops"}, "state": "WA"} -== APP == 4 {"city": "Spokane", "person": {"id": {"$numberDouble": "1042.0"}, "org": "Dev Ops"}, "state": "WA"} -== APP == 10 {"city": "New York", "person": {"id": {"$numberDouble": "1054.0"}, "org": "Dev Ops"}, "state": "NY"} +== APP == 1 {"city": "Seattle", "person": {"id": 1036.0, "org": "Dev Ops"}, "state": "WA"} +== APP == 4 {"city": "Spokane", "person": {"id": 1042.0, "org": "Dev Ops"}, "state": "WA"} +== APP == 10 {"city": "New York", "person": {"id": 1054.0, "org": "Dev Ops"}, "state": "NY"} == APP == Token: 3 -== APP == 9 {"city": "San Diego", "person": {"id": {"$numberDouble": "1002.0"}, "org": "Finance"}, "state": "CA"} -== APP == 7 {"city": "San Francisco", "person": {"id": {"$numberDouble": "1015.0"}, "org": "Dev Ops"}, "state": "CA"} -== APP == 3 {"city": "Sacramento", "person": {"id": {"$numberDouble": "1071.0"}, "org": "Finance"}, "state": "CA"} +== APP == 9 {"city": "San Diego", "person": {"id": 1002.0, "org": "Finance"}, "state": "CA"} +== APP == 7 {"city": "San Francisco", "person": {"id": 1015.0, "org": "Dev Ops"}, "state": "CA"} +== APP == 3 {"city": "Sacramento", "person": {"id": 1071.0, "org": "Finance"}, "state": "CA"} == APP == Token: 6 ```