Skip to content

Commit

Permalink
review comment addresed
Browse files Browse the repository at this point in the history 
issue fix and go test cases fixes

issue fix and go test cases fixes
  • Loading branch information
@MaheshMadushan
MaheshMadushan committed Nov 9, 2023
1 parent b9b2040 commit 47d100e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
5 changes: 3 additions & 2 deletions src/commands/cmd_json.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,10 @@ class CommandJsonToggle : public Commander {
return Status::OK();
}

*output = redis::MultiLen(results.size());
for (auto it = results.rbegin(); it != results.rend(); ++it) {
if ((*it).has_value()) {
*output += redis::Integer((*it).value());
if (it->has_value()) {
*output += redis::Integer(it->value());
} else {
*output += redis::NilString();
}
Expand Down
32 changes: 16 additions & 16 deletions tests/gocase/unit/type/json/json_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,32 +247,32 @@ func TestJson(t *testing.T) {

t.Run("JSON.TOGGLE basics", func(t *testing.T) {
require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `true`).Err())
require.EqualValues(t, []interface{}{bool(false)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `false`)
require.EqualValues(t, []interface{}{int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `false`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"bool":true}`).Err())
require.EqualValues(t, []interface{}{bool(false)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$.bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `{"bool":false}`)
require.EqualValues(t, []interface{}{int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$.bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `{"bool":false}`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"bool":true,"bools":{"bool":true}}`).Err())
require.EqualValues(t, []interface{}{bool(false)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$.bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `{"bool":false,"bools":{"bool":true}}`)
require.EqualValues(t, []interface{}{int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$.bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `{"bool":false,"bools":{"bool":true}}`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"bool":true,"bools":{"bool":true}}`).Err())
require.EqualValues(t, []interface{}{bool(false), bool(false)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `{"bool":false,"bools":{"bool":false}}`)
require.EqualValues(t, []interface{}{int64(0), int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `{"bool":false,"bools":{"bool":false}}`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"bool":false,"bools":{"bool":true}}`).Err())
require.EqualValues(t, []interface{}{bool(false), bool(true)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `{"bool":true,"bools":{"bool":false}}`)
require.EqualValues(t, []interface{}{int64(1), int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `{"bool":true,"bools":{"bool":false}}`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"bool":false,"bools":{"bool":true},"incorrectbool":{"bool":88}}`).Err())
require.EqualValues(t, []interface{}{nil, bool(false), bool(true)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `{"bool":true,"bools":{"bool":false},"incorrectbool":{"bool":88}}`)
require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `{"incorrectbool":99,"bools":{"bool":true},"bool":{"bool":false}}`).Err())
require.EqualValues(t, []interface{}{nil, int64(1), int64(0)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..bool").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `{"bool":{"bool":true},"bools":{"bool":false},"incorrectbool":99}`)

require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `[true,true,99]`).Err())
require.EqualValues(t, []interface{}{nil, bool(false), bool(false)}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..*").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a", "$").Val(), `[false,false,99]`)
require.NoError(t, rdb.Do(ctx, "JSON.SET", "a", "$", `[99,true,99]`).Err())
require.EqualValues(t, []interface{}{nil, int64(0), nil}, rdb.Do(ctx, "JSON.TOGGLE", "a", "$..*").Val())
require.Equal(t, rdb.Do(ctx, "JSON.GET", "a").Val(), `[99,false,99]`)
})

}

0 comments on commit 47d100e

Please sign in to comment.