merge Key() and Value() methods into Node() method.

Author: XiXi-2024

iterator.go

@@ -8,6 +8,12 @@ import (
 	"github.com/rosedblabs/rosedb/v2/index"
 )
 
+// Item represents a key-value pair in the database.
+type Item struct {
+	Key   []byte
+	Value []byte
+}
+
 // Iterator represents a database-level iterator that provides methods to traverse over the key/value pairs in the database.
 // It wraps the index iterator and adds functionality to retrieve the actual values from the database.
 type Iterator struct {
@@ -37,7 +43,6 @@ func (it *Iterator) Rewind() {
 		return
 	}
 	it.indexIter.Rewind()
-	_ = it.skipToNext()
 }
 
 // Seek positions the iterator at a specific key in the database.
@@ -47,7 +52,6 @@ func (it *Iterator) Seek(key []byte) {
 		return
 	}
 	it.indexIter.Seek(key)
-	_ = it.skipToNext()
 }
 
 // Next advances the iterator to the next valid entry in the database.
@@ -67,28 +71,19 @@ func (it *Iterator) Valid() bool {
 	return it.indexIter.Valid()
 }
 
-// Key retrieves the key at the current iterator position.
-func (it *Iterator) Key() []byte {
+// Item retrieves the current key-value pair as an Item.
+func (it *Iterator) Item() *Item {
 	if it.db == nil || it.indexIter == nil || !it.Valid() {
 		return nil
 	}
 	record := it.skipToNext()
 	if record == nil {
 		return nil
 	}
-	return record.Key
-}
-
-// Value retrieves the value associated with the current key in the iterator.
-func (it *Iterator) Value() []byte {
-	if it.db == nil || it.indexIter == nil || !it.Valid() {
-		return nil
-	}
-	record := it.skipToNext()
-	if record == nil {
-		return nil
+	return &Item{
+		Key:   record.Key,
+		Value: record.Value,
 	}
-	return record.Value
 }
 
 // Close releases all resources associated with the iterator.

iterator_test.go

@@ -47,12 +47,10 @@ func TestIterator_Basic(t *testing.T) {
 	iter = db.NewIterator(iteratorOptions)
 	i := 0
 	for iter.Rewind(); iter.Valid(); iter.Next() {
-		key := iter.Key()
-		assert.NotNil(t, key)
-		assert.True(t, bytes.Equal(key, keys[i]))
-		val := iter.Value()
-		assert.NotNil(t, val)
-		assert.True(t, bytes.Equal(val, values[i]))
+		item := iter.Item()
+		assert.NotNil(t, item)
+		assert.True(t, bytes.Equal(item.Key, keys[i]))
+		assert.True(t, bytes.Equal(item.Value, values[i]))
 		i++
 	}
 	assert.Equal(t, len(keys), i)
@@ -64,12 +62,10 @@ func TestIterator_Basic(t *testing.T) {
 
 	i = len(keys) - 1
 	for iter.Rewind(); iter.Valid(); iter.Next() {
-		key := iter.Key()
-		assert.NotNil(t, key)
-		assert.True(t, bytes.Equal(key, keys[i]))
-		val := iter.Value()
-		assert.Nil(t, err)
-		assert.True(t, bytes.Equal(val, values[i]))
+		item := iter.Item()
+		assert.NotNil(t, item)
+		assert.True(t, bytes.Equal(item.Key, keys[i]))
+		assert.True(t, bytes.Equal(item.Value, values[i]))
 		i--
 	}
 	assert.Equal(t, -1, i)
@@ -109,12 +105,10 @@ func TestIterator_Seek(t *testing.T) {
 
 	iter.Seek([]byte("key3"))
 	assert.True(t, iter.Valid())
-	key := iter.Key()
-	assert.NotNil(t, key)
-	assert.True(t, bytes.Equal(key, []byte("key3")))
-	val := iter.Value()
-	assert.NotNil(t, val)
-	assert.True(t, bytes.Equal(val, []byte("value3")))
+	item := iter.Item()
+	assert.NotNil(t, item)
+	assert.True(t, bytes.Equal(item.Key, []byte("key3")))
+	assert.True(t, bytes.Equal(item.Value, []byte("value3")))
 	iter.Close()
 
 	// Test seek in descending order
@@ -123,12 +117,10 @@ func TestIterator_Seek(t *testing.T) {
 
 	iter.Seek([]byte("key3"))
 	assert.True(t, iter.Valid())
-	key = iter.Key()
-	assert.NotNil(t, key)
-	assert.True(t, bytes.Equal(key, []byte("key3")))
-	val = iter.Value()
-	assert.NotNil(t, val)
-	assert.True(t, bytes.Equal(val, []byte("value3")))
+	item = iter.Item()
+	assert.NotNil(t, item)
+	assert.True(t, bytes.Equal(item.Key, []byte("key3")))
+	assert.True(t, bytes.Equal(item.Value, []byte("value3")))
 	iter.Close()
 }
 
@@ -168,12 +160,10 @@ func TestIterator_Prefix(t *testing.T) {
 	expectedValues := [][]byte{[]byte("value3"), []byte("value4")}
 	i := 0
 	for iter.Rewind(); iter.Valid(); iter.Next() {
-		key := iter.Key()
-		assert.NotNil(t, key)
-		assert.True(t, bytes.Equal(key, expectedKeys[i]))
-		val := iter.Value()
-		assert.NotNil(t, val)
-		assert.True(t, bytes.Equal(val, expectedValues[i]))
+		item := iter.Item()
+		assert.NotNil(t, item)
+		assert.True(t, bytes.Equal(item.Key, expectedKeys[i]))
+		assert.True(t, bytes.Equal(item.Value, expectedValues[i]))
 		i++
 	}
 	assert.Equal(t, len(expectedKeys), i)
@@ -201,12 +191,10 @@ func TestIterator_Expired(t *testing.T) {
 
 	iter.Rewind()
 	assert.True(t, iter.Valid())
-	key := iter.Key()
-	assert.NotNil(t, key)
-	assert.True(t, bytes.Equal(key, []byte("key2")))
-	val := iter.Value()
-	assert.NotNil(t, val)
-	assert.True(t, bytes.Equal(val, []byte("value2")))
+	item := iter.Item()
+	assert.NotNil(t, item)
+	assert.True(t, bytes.Equal(item.Key, []byte("key2")))
+	assert.True(t, bytes.Equal(item.Value, []byte("value2")))
 	iter.Next()
 	assert.False(t, iter.Valid())
 	iter.Close()