mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Add tx buffer test case of unordered key writes.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
This commit is contained in:
parent
4346a43cee
commit
7be3606841
@ -243,24 +243,118 @@ func TestRangeAfterDeleteMatch(t *testing.T) {
|
||||
tx.Unlock()
|
||||
tx.Commit()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), []byte("foo"), nil, 0)
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), nil, 0)
|
||||
checkForEach(t, b.BatchTx(), b.ReadTx(), [][]byte{[]byte("foo")}, [][]byte{[]byte("bar")})
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafeDelete(schema.Test, []byte("foo"))
|
||||
tx.Unlock()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), []byte("foo"), nil, 0)
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), nil, 0)
|
||||
checkForEach(t, b.BatchTx(), b.ReadTx(), nil, nil)
|
||||
}
|
||||
|
||||
func checkRangeResponseMatch(t *testing.T, tx backend.BatchTx, rtx backend.ReadTx, key, endKey []byte, limit int64) {
|
||||
func TestRangeAfterUnorderedKeyWriteMatch(t *testing.T) {
|
||||
b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
|
||||
defer betesting.Close(t, b)
|
||||
|
||||
tx := b.BatchTx()
|
||||
|
||||
tx.Lock()
|
||||
ks1, vs1 := tx.UnsafeRange(schema.Test, key, endKey, limit)
|
||||
tx.UnsafeCreateBucket(schema.Test)
|
||||
tx.UnsafePut(schema.Test, []byte("foo5"), []byte("bar5"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo2"), []byte("bar2"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo1"), []byte("bar1"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo3"), []byte("bar3"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo4"), []byte("bar4"))
|
||||
tx.Unlock()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), nil, 1)
|
||||
}
|
||||
|
||||
func TestRangeAfterAlternatingBucketWriteMatch(t *testing.T) {
|
||||
b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
|
||||
defer betesting.Close(t, b)
|
||||
|
||||
tx := b.BatchTx()
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafeCreateBucket(schema.Key)
|
||||
tx.UnsafeCreateBucket(schema.Test)
|
||||
tx.UnsafeSeqPut(schema.Key, []byte("key1"), []byte("val1"))
|
||||
tx.Unlock()
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafeSeqPut(schema.Key, []byte("key2"), []byte("val2"))
|
||||
tx.Unlock()
|
||||
tx.Commit()
|
||||
// only in the 2nd commit the schema.Key key is removed from the readBuffer.buckets.
|
||||
// This makes sure to test the case when an empty writeBuffer.bucket
|
||||
// is used to replace the read buffer bucket.
|
||||
tx.Commit()
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar"))
|
||||
tx.Unlock()
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Key, []byte("key"), []byte("key5"), 100)
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), []byte("foo3"), 1)
|
||||
}
|
||||
|
||||
func TestRangeAfterOverwriteMatch(t *testing.T) {
|
||||
b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
|
||||
defer betesting.Close(t, b)
|
||||
|
||||
tx := b.BatchTx()
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafeCreateBucket(schema.Test)
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar2"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar0"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo1"), []byte("bar10"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar1"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo1"), []byte("bar11"))
|
||||
tx.Unlock()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), []byte("foo3"), 1)
|
||||
checkForEach(t, b.BatchTx(), b.ReadTx(), [][]byte{[]byte("foo"), []byte("foo1")}, [][]byte{[]byte("bar1"), []byte("bar11")})
|
||||
}
|
||||
|
||||
func TestRangeAfterOverwriteAndDeleteMatch(t *testing.T) {
|
||||
b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
|
||||
defer betesting.Close(t, b)
|
||||
|
||||
tx := b.BatchTx()
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafeCreateBucket(schema.Test)
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar2"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar0"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo1"), []byte("bar10"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar1"))
|
||||
tx.UnsafePut(schema.Test, []byte("foo1"), []byte("bar11"))
|
||||
tx.Unlock()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), nil, 0)
|
||||
checkForEach(t, b.BatchTx(), b.ReadTx(), [][]byte{[]byte("foo"), []byte("foo1")}, [][]byte{[]byte("bar1"), []byte("bar11")})
|
||||
|
||||
tx.Lock()
|
||||
tx.UnsafePut(schema.Test, []byte("foo"), []byte("bar3"))
|
||||
tx.UnsafeDelete(schema.Test, []byte("foo1"))
|
||||
tx.Unlock()
|
||||
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo"), nil, 0)
|
||||
checkRangeResponseMatch(t, b.BatchTx(), b.ReadTx(), schema.Test, []byte("foo1"), nil, 0)
|
||||
checkForEach(t, b.BatchTx(), b.ReadTx(), [][]byte{[]byte("foo")}, [][]byte{[]byte("bar3")})
|
||||
}
|
||||
|
||||
func checkRangeResponseMatch(t *testing.T, tx backend.BatchTx, rtx backend.ReadTx, bucket backend.Bucket, key, endKey []byte, limit int64) {
|
||||
tx.Lock()
|
||||
ks1, vs1 := tx.UnsafeRange(bucket, key, endKey, limit)
|
||||
tx.Unlock()
|
||||
|
||||
rtx.RLock()
|
||||
ks2, vs2 := rtx.UnsafeRange(schema.Test, key, endKey, limit)
|
||||
ks2, vs2 := rtx.UnsafeRange(bucket, key, endKey, limit)
|
||||
rtx.RUnlock()
|
||||
|
||||
if diff := cmp.Diff(ks1, ks2); diff != "" {
|
||||
|
Loading…
x
Reference in New Issue
Block a user