Add Xor

pkg/proxy/aggregation.go

@@ -1,14 +1,12 @@
 package proxy
 
 import (
-	"bytes"
 	"strconv"
 
 	"github.com/deepfabric/elasticell/pkg/pb/raftcmdpb"
 )
 
 var (
-	sep    = []byte("#")
 	cmdSet = []byte("SET")
 	cmdGet = []byte("GET")
 )
@@ -45,8 +43,7 @@ func isAggregationPart(id []byte) bool {
 }
 
 func parseAggregationPart(id []byte) ([]byte, int) {
-	data := bytes.Split(id, sep)
-	return data[0], parseStrInt64(data[1])
+	return id[0:16], parseStrInt64(id[16:])
 }
 
 func parseStrInt64(data []byte) int {

pkg/proxy/aggregation_bitmap.go

@@ -26,6 +26,11 @@ func (p *RedisProxy) doBMOr(rs *redisSession, cmd redis.Command) (bool, error) {
 	return p.doBMAggregation(rs, cmd, p.doBMOrMerge)
 }
 
+// bmxor [withbm|start count]  bm1 bm2 [bm3 bm4]
+func (p *RedisProxy) doBMXor(rs *redisSession, cmd redis.Command) (bool, error) {
+	return p.doBMAggregation(rs, cmd, p.doBMXorMerge)
+}
+
 // bmandnot [withbm|start count]  bm1 bm2 [bm3 bm4]
 func (p *RedisProxy) doBMAndNot(rs *redisSession, cmd redis.Command) (bool, error) {
 	return p.doBMAggregation(rs, cmd, p.doBMAndNotMerge)
@@ -35,12 +40,12 @@ func (p *RedisProxy) doBMAggregation(rs *redisSession, cmd redis.Command, mergeF
 	offset := 1
 	n := len(cmd.Args())
 	if n < 3 {
-		return false, nil
+		return false, errInvalidCommand
 	}
 
 	if strings.ToUpper(hack.SliceToString(cmd.Args()[0])) != optionWithBM {
 		if n < 4 {
-			return false, nil
+			return false, errInvalidCommand
 		}
 
 		offset = 2
@@ -51,7 +56,7 @@ func (p *RedisProxy) doBMAggregation(rs *redisSession, cmd redis.Command, mergeF
 
 	for idx, key := range cmd.Args()[offset:] {
 		cmd := redis.Command([][]byte{cmdGet, key})
-		p.addToForward(newReqUUID(bytes.Join([][]byte{id, format.UInt64ToString(uint64(idx))}, sep), cmd, rs))
+		p.addToForward(newReqUUID(append(id, format.UInt64ToString(uint64(idx))...), cmd, rs))
 	}
 
 	return true, nil
@@ -117,7 +122,7 @@ func (p *RedisProxy) doBMOrMerge(args [][]byte, rsps ...*raftcmdpb.Response) *ra
 	return p.buildResult(bm, args)
 }
 
-func (p *RedisProxy) doBMAndNotMerge(args [][]byte, rsps ...*raftcmdpb.Response) *raftcmdpb.Response {
+func (p *RedisProxy) doBMXorMerge(args [][]byte, rsps ...*raftcmdpb.Response) *raftcmdpb.Response {
 	bm := roaring.NewBTreeBitmap()
 	tmp := roaring.NewBTreeBitmap()
 	var target *roaring.Bitmap
@@ -147,6 +152,32 @@ func (p *RedisProxy) doBMAndNotMerge(args [][]byte, rsps ...*raftcmdpb.Response)
 	return p.buildResult(bm, args)
 }
 
+func (p *RedisProxy) doBMAndNotMerge(args [][]byte, rsps ...*raftcmdpb.Response) *raftcmdpb.Response {
+	targets := make([]*roaring.Bitmap, 0, len(rsps))
+	for _, rsp := range rsps {
+		if len(rsp.BulkResult) > 0 {
+			bm := roaring.NewBTreeBitmap()
+			targets = append(targets, bm)
+			_, _, err := bm.ImportRoaringBits(rsp.BulkResult, false, false, 0)
+			if err != nil {
+				return &raftcmdpb.Response{
+					ErrorResult: hack.StringToSlice(err.Error()),
+				}
+			}
+		}
+	}
+
+	union := targets[0]
+	and := targets[0]
+
+	for _, bm := range targets[1:] {
+		union = union.Union(bm)
+		and = and.Intersect(bm)
+	}
+
+	return p.buildResult(union.Xor(and), args)
+}
+
 func (p *RedisProxy) buildResult(bm *roaring.Bitmap, args [][]byte) *raftcmdpb.Response {
 	log.Debugf("bm and args: %+v", args)
 	if len(args) < 2 {

pkg/proxy/aggregation_string.go

@@ -1,26 +1,29 @@
 package proxy
 
 import (
-	"bytes"
-	"fmt"
+	"errors"
 
 	"github.com/deepfabric/elasticell/pkg/pb/raftcmdpb"
 	"github.com/fagongzi/goetty/protocol/redis"
+	"github.com/fagongzi/util/format"
+)
+
+var (
+	errInvalidCommand = errors.New("invalid command")
 )
 
 func (p *RedisProxy) doMGet(rs *redisSession, cmd redis.Command) (bool, error) {
 	n := len(cmd.Args())
-
 	if n < 2 {
-		return false, nil
+		return false, errInvalidCommand
 	}
 
 	id := newID()
 	rs.addAggregation(id, newAggregationReq(n, p.doMGetMerge, nil))
 
 	for idx, key := range cmd.Args() {
 		cmd := redis.Command([][]byte{cmdGet, key})
-		p.addToForward(newReqUUID(bytes.Join([][]byte{id, []byte(fmt.Sprintf("%d", idx))}, sep), cmd, rs))
+		p.addToForward(newReqUUID(append(id, format.UInt64ToString(uint64(idx))...), cmd, rs))
 	}
 
 	return true, nil

pkg/proxy/proxy.go

@@ -313,6 +313,7 @@ func (p *RedisProxy) initSupportCMDs() {
 	// bitmap
 	p.aggregationCmds["bmand"] = p.doBMAnd
 	p.aggregationCmds["bmor"] = p.doBMOr
+	p.aggregationCmds["bmxor"] = p.doBMXor
 	p.aggregationCmds["bmandnot"] = p.doBMAndNot
 }
 

quickstart-cfgs/proxy.json

@@ -88,6 +88,7 @@
         "bmrange",
         "bmand",
         "bmor",
+        "bmxor",
         "bmandnot"
     ]
 }