From aebcd2976fc39f43829b8f5432de23d2c52c902d Mon Sep 17 00:00:00 2001 From: vialeon Date: Sun, 18 Jul 2021 11:01:36 -0500 Subject: [PATCH 1/4] add hlen function --- internal/redis/hlen/hlen.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 internal/redis/hlen/hlen.go diff --git a/internal/redis/hlen/hlen.go b/internal/redis/hlen/hlen.go new file mode 100644 index 0000000..af9b1fd --- /dev/null +++ b/internal/redis/hlen/hlen.go @@ -0,0 +1,35 @@ +package hlen + +import ( + "context" + "fmt" + + "github.com/go-redis/redis/v8" + "go.riyazali.net/sqlite" +) + +type hlen struct { + rdb *redis.Client +} + +func (f *hlen) Args() int { return -1 } +func (f *hlen) Deterministic() bool { return false } +func (f *hlen) Apply(ctx *sqlite.Context, values ...sqlite.Value) { + var key string + + if len(values) >= 1 { + key = values[0].Text() + } else { + ctx.ResultError(fmt.Errorf("must supply argument to redis hlen command")) + return + } + + result := f.rdb.HLen(context.TODO(), key) + + ctx.ResultInt64(result.Val()) +} + +// New returns a sqlite function for reading the contents of a file +func New(rdb *redis.Client) sqlite.Function { + return &hlen{rdb} +} From b92f70efc59e57475828529188f74f13d3d5517a Mon Sep 17 00:00:00 2001 From: vialeon Date: Sun, 18 Jul 2021 11:01:42 -0500 Subject: [PATCH 2/4] add testing --- internal/redis/hlen/hlen_test.go | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 internal/redis/hlen/hlen_test.go diff --git a/internal/redis/hlen/hlen_test.go b/internal/redis/hlen/hlen_test.go new file mode 100644 index 0000000..f96e864 --- /dev/null +++ b/internal/redis/hlen/hlen_test.go @@ -0,0 +1,46 @@ +package hlen_test + +import ( + "testing" + + "github.com/augmentable-dev/reqlite/internal/redis/hlen" + _ "github.com/augmentable-dev/reqlite/internal/sqlite" + "github.com/go-redis/redismock/v8" + "github.com/jmoiron/sqlx" + _ "github.com/mattn/go-sqlite3" + "go.riyazali.net/sqlite" +) + +func TestHLen(t *testing.T) { + rdb, mock := redismock.NewClientMock() + + sqlite.Register(func(api *sqlite.ExtensionApi) (sqlite.ErrorCode, error) { + if err := api.CreateFunction("hlen", hlen.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } + return sqlite.SQLITE_OK, nil + }) + + mock.ExpectHLen("mykey").SetVal(1024) + db, err := sqlx.Open("sqlite3", ":memory:") + if err != nil { + t.Fatal(err) + } + defer db.Close() + + row := db.QueryRow("SELECT hlen('mykey')") + err = row.Err() + if err != nil { + t.Fatal(err) + } + + var s string + err = row.Scan(&s) + if err != nil { + t.Fatal(err) + } + + if err := mock.ExpectationsWereMet(); err != nil { + t.Error(err) + } +} From 4fe022fb9a2afa29dc779da460418163a4104bb9 Mon Sep 17 00:00:00 2001 From: vialeon Date: Sun, 18 Jul 2021 11:01:48 -0500 Subject: [PATCH 3/4] add to ext.go --- pkg/ext/ext.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/ext/ext.go b/pkg/ext/ext.go index 77850c5..82d6568 100644 --- a/pkg/ext/ext.go +++ b/pkg/ext/ext.go @@ -17,6 +17,7 @@ import ( "github.com/augmentable-dev/reqlite/internal/redis/dump" "github.com/augmentable-dev/reqlite/internal/redis/echo" "github.com/augmentable-dev/reqlite/internal/redis/hgetall" + "github.com/augmentable-dev/reqlite/internal/redis/hlen" "github.com/augmentable-dev/reqlite/internal/redis/llen" "github.com/augmentable-dev/reqlite/internal/redis/lrange" "github.com/go-redis/redis/v8" @@ -98,6 +99,10 @@ func init() { return sqlite.SQLITE_ERROR, err } + if err := api.CreateFunction("hlen", hlen.New(rdb)); err != nil { + return sqlite.SQLITE_ERROR, err + } + if err := api.CreateFunction("llen", llen.New(rdb)); err != nil { return sqlite.SQLITE_ERROR, err } From 12af79cce66dd549f5c8966cb4b3b4f7a97a9425 Mon Sep 17 00:00:00 2001 From: vialeon Date: Sun, 18 Jul 2021 11:01:58 -0500 Subject: [PATCH 4/4] add hlen to commands and readme --- README.md | 6 ++++++ commands.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d3d419..0c859f1 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,12 @@ SELECT CLUSTER_COUNTKEYSINSLOT() SELECT DBSIZE() ``` +### HLEN + +```sql +SELECT HLEN('some-key') +``` + ### LLEN ```sql diff --git a/commands.md b/commands.md index 03d1a3b..3730d44 100644 --- a/commands.md +++ b/commands.md @@ -114,7 +114,7 @@ | HINCRBY | 🚧 | HINCRBYFLOAT | 🚧 | HKEYS | 🚧 -| HLEN | 🚧 +| HLEN | ✅ [`HLEN`](https://github.com/augmentable-dev/reqlite/tree/main/internal/redis/hlen) | HMGET | 🚧 | HMSET | 🚧 | HSET | 🚧