Skip to content
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

Jump to bottom

Support MBbloom module better #688

Merged
merged 3 commits into from
Oct 11, 2023
Merged

Support MBbloom module better #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b52c83e
config mbbloom version
fengyoulin Oct 6, 2023
e101675
Config target MBbloom module version
fengyoulin Oct 7, 2023
9845037
Add bloom filter key-specs
fengyoulin Oct 7, 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
180 changes: 180 additions & 0 deletions internal/commands/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4559,4 +4559,184 @@ var redisCommands = map[string]redisCommand{
},
},
},
"BF.ADD": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.CARD": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.EXISTS": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.INFO": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.INSERT": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.LOADCHUNK": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.MADD": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.MEXISTS": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.RESERVE": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
"BF.SCANDUMP": {
"BLOOM FILTER",
[]keySpec{
{
"index",
1,
"",
0,
"range",
0,
1,
0,
0,
0,
0,
},
},
},
}
5 changes: 5 additions & 0 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ type AdvancedOptions struct {
AwsPSync string `mapstructure:"aws_psync" default:""` // 10.0.0.1:6379@nmfu2sl5osync,10.0.0.1:6379@xhma21xfkssync
}

type ModuleOptions struct {
TargetMBbloomVersion int `mapstructure:"target_mbbloom_version" default:"0"` // v1.0.0 <=> 10000
}

func (opt *AdvancedOptions) GetPSyncCommand(address string) string {
items := strings.Split(opt.AwsPSync, ",")
for _, item := range items {
Expand All @@ -53,6 +57,7 @@ func (opt *AdvancedOptions) GetPSyncCommand(address string) string {
type ShakeOptions struct {
Function string `mapstructure:"function" default:""`
Advanced AdvancedOptions
Module ModuleOptions
}

var Opt ShakeOptions
Expand Down
78 changes: 31 additions & 47 deletions internal/rdb/types/mbbloom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package types

import (
"RedisShake/internal/config"
"RedisShake/internal/rdb/structure"
"io"
"strconv"
"unsafe"
)

// BloomObject for MBbloom--
// BloomObject for MBbloom-- at https://github.com/RedisBloom/RedisBloom
type BloomObject struct {
encver int
key string
Expand Down Expand Up @@ -56,23 +57,6 @@ type dumpedChainLink struct {
n2 uint8
}

type dumpedChainHeaderV3 struct {
size uint64
nfilters uint32
options uint32
}

type dumpedChainLinkV3 struct {
bytes uint64
bits uint64
size uint64
err float64
bpe float64
hashes uint32
entries uint32
n2 uint8
}

const (
BF_MIN_OPTIONS_ENC = 2
BF_MIN_GROWTH_ENC = 4
Expand Down Expand Up @@ -143,10 +127,16 @@ func readDouble(rd io.Reader) float64 {
func (o *BloomObject) Rewrite() []RedisCmd {
var cs []RedisCmd
var h string
if o.encver < BF_MIN_GROWTH_ENC {
h = getEncodedHeaderV3(&o.sb)
if ver := config.Opt.Module.TargetMBbloomVersion; ver > 20200 {
h = getEncodedHeader(&o.sb, true, true)
} else if ver == 20200 {
h = getEncodedHeader(&o.sb, true, false)
} else if ver >= 10000 {
h = getEncodedHeader(&o.sb, false, false)
} else if o.encver < BF_MIN_GROWTH_ENC {
h = getEncodedHeader(&o.sb, false, false)
} else {
h = getEncodedHeader(&o.sb)
h = getEncodedHeader(&o.sb, true, true)
}
cmd := RedisCmd{"BF.LOADCHUNK", o.key, "1", h}
cs = append(cs, cmd)
Expand All @@ -162,45 +152,39 @@ func (o *BloomObject) Rewrite() []RedisCmd {
return cs
}

func getEncodedHeader(sb *chain) string {
h := make([]byte, DUMPED_CHAIN_LINK_SIZE*sb.nfilters+DUMPED_CHAIN_HEADER_SIZE)
func getEncodedHeader(sb *chain, withGrowth, bigEntries bool) string {
var hs uint64 = DUMPED_CHAIN_HEADER_SIZE_V3
if withGrowth {
hs = DUMPED_CHAIN_HEADER_SIZE
}
var ls uint64 = DUMPED_CHAIN_LINK_SIZE_V3
if bigEntries {
ls = DUMPED_CHAIN_LINK_SIZE
}
h := make([]byte, hs+ls*sb.nfilters)
ph := (*dumpedChainHeader)(unsafe.Pointer(&h[0]))
ph.size = sb.size
ph.nfilters = uint32(sb.nfilters)
ph.options = uint32(sb.options)
ph.growth = uint32(sb.growth)
for i := uint64(0); i < sb.nfilters; i++ {
pl := (*dumpedChainLink)(unsafe.Add(unsafe.Pointer(&h[0]), DUMPED_CHAIN_HEADER_SIZE+DUMPED_CHAIN_LINK_SIZE*i))
sl := sb.filters[i]
pl.bytes = uint64(len(sl.inner.bf))
pl.bits = sl.inner.bits
pl.size = sl.size
pl.err = sl.inner.err
pl.hashes = uint32(sl.inner.hashes)
pl.bpe = sl.inner.bpe
*(*uint64)(unsafe.Pointer(&pl.entries)) = sl.inner.entries
pl.n2 = uint8(sl.inner.n2)
if withGrowth {
ph.growth = uint32(sb.growth)
}
return *(*string)(unsafe.Pointer(&h))
}

func getEncodedHeaderV3(sb *chain) string {
h := make([]byte, DUMPED_CHAIN_LINK_SIZE_V3*sb.nfilters+DUMPED_CHAIN_HEADER_SIZE_V3)
ph := (*dumpedChainHeaderV3)(unsafe.Pointer(&h[0]))
ph.size = sb.size
ph.nfilters = uint32(sb.nfilters)
ph.options = uint32(sb.options)
for i := uint64(0); i < sb.nfilters; i++ {
pl := (*dumpedChainLinkV3)(unsafe.Add(unsafe.Pointer(&h[0]), DUMPED_CHAIN_HEADER_SIZE_V3+DUMPED_CHAIN_LINK_SIZE_V3*i))
pl := (*dumpedChainLink)(unsafe.Add(unsafe.Pointer(&h[0]), hs+ls*i))
sl := sb.filters[i]
pl.bytes = uint64(len(sl.inner.bf))
pl.bits = sl.inner.bits
pl.size = sl.size
pl.err = sl.inner.err
pl.hashes = uint32(sl.inner.hashes)
pl.bpe = sl.inner.bpe
pl.entries = uint32(sl.inner.entries)
pl.n2 = uint8(sl.inner.n2)
if bigEntries {
*(*uint64)(unsafe.Pointer(&pl.entries)) = sl.inner.entries
pl.n2 = uint8(sl.inner.n2)
} else {
pl.entries = uint32(sl.inner.entries)
*(*uint8)(unsafe.Pointer(&pl.enthigh)) = uint8(sl.inner.n2)
}
}
return *(*string)(unsafe.Pointer(&h))
}
Expand Down
4 changes: 4 additions & 0 deletions shake.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@ target_redis_proto_max_bulk_len = 512_000_000

# If the source is Elasticache or MemoryDB, you can set this item.
aws_psync = "" # example: aws_psync = "10.0.0.1:6379@nmfu2sl5osync,10.0.0.1:6379@xhma21xfkssync"

[module]
# The data format for BF.LOADCHUNK is not compatible in different versions. v2.6.3 <=> 20603
target_mbbloom_version = 20603
Loading