From c2cfc60cf80a710466166f8a36602e75713c0674 Mon Sep 17 00:00:00 2001
From: silentsai <cenqichao@gmail.com>
Date: Fri, 27 Jun 2014 11:54:04 +0800
Subject: [PATCH] solve bitop problem while inexisting srckeys occours

---
 ledis/t_bin.go      | 51 +++++++++++++++++++++++++++++----------------
 ledis/t_bin_test.go | 16 +++++++-------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/ledis/t_bin.go b/ledis/t_bin.go
index 228c882..0071e68 100644
--- a/ledis/t_bin.go
+++ b/ledis/t_bin.go
@@ -455,28 +455,40 @@ func (db *DB) BOperation(op uint8, dstkey []byte, srckeys ...[]byte) (blen int32
 		return
 	}
 
+	blen = -1
+
 	t := db.binTx
 	t.Lock()
 	defer t.Unlock()
 
-	var seq, off uint32
-	var segments = make([][]byte, maxSegCount) // todo : init count also can be optimize while 'and' / 'or'
-
 	// init - meta info
 	var maxDstSeq, maxDstOff uint32
 	var nowSeq, nowOff int32
 
-	if nowSeq, nowOff, err = db.bGetMeta(srckeys[0]); err != nil { // todo : if key not exists ....
+	var keyNum int = len(srckeys)
+	var iniIdx int = 0
+	for ; iniIdx < keyNum; iniIdx++ {
+		if nowSeq, nowOff, err = db.bGetMeta(srckeys[iniIdx]); err != nil { // todo : if key not exists ....
+			return
+		}
+
+		if nowSeq >= 0 {
+			maxDstSeq = uint32(nowSeq)
+			maxDstOff = uint32(nowOff)
+			break
+		}
+	}
+
+	if iniIdx+1 >= keyNum { //	todo ... while operation is 'not'
+		//	msg("lack of arguments")
 		return
-	} else if nowSeq < 0 {
-		return // incorrect ...
-	} else {
-		maxDstSeq = uint32(nowSeq)
-		maxDstOff = uint32(nowOff)
 	}
 
 	// init - data
-	it := db.bIterator(srckeys[0])
+	var seq, off uint32
+	var segments = make([][]byte, maxSegCount) // todo : init count also can be optimize while 'and' / 'or'
+
+	it := db.bIterator(srckeys[iniIdx])
 	for ; it.Valid(); it.Next() {
 		if _, seq, err = db.bDecodeBinKey(it.Key()); err != nil {
 			// to do ...
@@ -488,8 +500,7 @@ func (db *DB) BOperation(op uint8, dstkey []byte, srckeys ...[]byte) (blen int32
 	it.Close()
 
 	//	operation with following keys
-	var keyNum int = len(srckeys)
-	for i := 1; i < keyNum; i++ {
+	for i := iniIdx + 1; i < keyNum; i++ {
 		if nowSeq, nowOff, err = db.bGetMeta(srckeys[i]); err != nil {
 			return
 		}
@@ -546,12 +557,12 @@ func (db *DB) BOperation(op uint8, dstkey []byte, srckeys ...[]byte) (blen int32
 	db.rmExpire(t, bExpType, dstkey)
 
 	//	set data and meta
-	if op == OPand || op == OPor {
-		// for i := maxDstSeq; i >= 0; i-- {
-		//
-		// }
-		db.bSetMeta(t, dstkey, maxDstSeq, maxDstOff)
-	}
+	// if op == OPand || op == OPor {
+	//	for i := maxDstSeq; i >= 0; i-- {
+	//
+	//	}
+	// }
+	db.bSetMeta(t, dstkey, maxDstSeq, maxDstOff)
 
 	var bk []byte
 	for seq, seg := range segments {
@@ -565,6 +576,10 @@ func (db *DB) BOperation(op uint8, dstkey []byte, srckeys ...[]byte) (blen int32
 	}
 
 	err = t.Commit()
+	if err != nil {
+		blen = int32(maxDstSeq<<segBitWidth | maxDstOff)
+	}
+
 	return
 }
 
diff --git a/ledis/t_bin_test.go b/ledis/t_bin_test.go
index ee34312..7d93676 100644
--- a/ledis/t_bin_test.go
+++ b/ledis/t_bin_test.go
@@ -11,10 +11,6 @@ func cmpBytes(a []byte, b []byte) bool {
 
 	for i, n := range a {
 		if n != b[i] {
-			println("diff !")
-			println(i)
-			println(n)
-			println(b[i])
 			return true
 		}
 	}
@@ -82,7 +78,9 @@ func testSimple(t *testing.T) {
 
 func testSimpleII(t *testing.T) {
 	db := getTestDB()
-	key := []byte("test_bin_2")
+	db.FlushAll()
+
+	key := []byte("test_bin")
 
 	pos := int32(1234567)
 	if ori, _ := db.BSetBit(key, pos, 1); ori != 0 {
@@ -124,13 +122,15 @@ func testSimpleII(t *testing.T) {
 
 func testOp(t *testing.T) {
 	db := getTestDB()
+	db.FlushAll()
 
 	dstKey := []byte("test_bin_op")
 
 	k0 := []byte("op_0")
-	k1 := []byte("op_10")
-	//k2 := []byte("op_11")
-	srcKeys := [][]byte{k0, k1}
+	k1 := []byte("op_01")
+	k2 := []byte("op_10")
+	k3 := []byte("op_11")
+	srcKeys := [][]byte{k2, k0, k1, k3}
 
 	/*
 		<k0>