save (#2197)

erigontech · Jun 19, 2021 · 4736bac · 4736bac
1 parent a9baf37
commit 4736bac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 56 deletions.
diff --git a/cmd/integration/commands/refetence_db.go b/cmd/integration/commands/refetence_db.go
@@ -300,7 +300,6 @@ MainLoop:
 			return err
 		}
 
-		var prevK []byte
 		for {
 			if !fileScanner.Scan() {
 				break MainLoop
@@ -317,16 +316,9 @@ MainLoop:
 			v = common.FromHex(string(v[1:]))
 
 			if casted, ok := c.(ethdb.RwCursorDupSort); ok {
-				if bytes.Equal(k, prevK) {
-					if err = casted.AppendDup(k, v); err != nil {
-						panic(err)
-					}
-				} else {
-					if err = casted.Append(k, v); err != nil {
-						panic(err)
-					}
+				if err = casted.AppendDup(k, v); err != nil {
+					panic(err)
 				}
-				prevK = k
 			} else {
 				if err = c.Append(k, v); err != nil {
 					panic(err)
@@ -340,7 +332,6 @@ MainLoop:
 				log.Info("Progress", "bucket", bucket, "key", fmt.Sprintf("%x", k))
 			}
 		}
-		prevK = nil
 		err = fileScanner.Err()
 		if err != nil {
 			panic(err)
@@ -399,7 +390,6 @@ func kv2kv(ctx context.Context, src, dst ethdb.RwKV) error {
 		if err != nil {
 			return err
 		}
-		var prevK []byte
 		casted, isDupsort := c.(ethdb.RwCursorDupSort)
 
 		for k, v, err := srcC.First(); k != nil; k, v, err = srcC.Next() {
@@ -408,16 +398,9 @@ func kv2kv(ctx context.Context, src, dst ethdb.RwKV) error {
 			}
 
 			if isDupsort {
-				if bytes.Equal(k, prevK) {
-					if err = casted.AppendDup(k, v); err != nil {
-						panic(err)
-					}
-				} else {
-					if err = casted.Append(k, v); err != nil {
-						panic(err)
-					}
+				if err = casted.AppendDup(k, v); err != nil {
+					panic(err)
 				}
-				prevK = k
 			} else {
 				if err = c.Append(k, v); err != nil {
 					panic(err)
@@ -444,7 +427,6 @@ func kv2kv(ctx context.Context, src, dst ethdb.RwKV) error {
 			default:
 			}
 		}
-		prevK = nil
 
 		// migrate bucket sequences to native mdbx implementation
 		//currentID, err := srcTx.Sequence(name, 0)

diff --git a/common/etl/collector.go b/common/etl/collector.go
@@ -165,7 +165,6 @@ func loadFilesIntoBucket(logPrefix string, db ethdb.RwTx, bucket string, provide
 
 	logEvery := time.NewTicker(30 * time.Second)
 	defer logEvery.Stop()
-	var pervK, pervV []byte
 
 	i := 0
 	loadNextFunc := func(originalK, k, v []byte) error {
@@ -201,22 +200,13 @@ func loadFilesIntoBucket(logPrefix string, db ethdb.RwTx, bucket string, provide
 		}
 		if canUseAppend {
 			if isDupSort {
-				if bytes.Equal(k, pervK) {
-					if err := c.(ethdb.RwCursorDupSort).AppendDup(k, v); err != nil {
-						return fmt.Errorf("%s: bucket: %s, appendDup: k=%x, pervK=%x %w", logPrefix, bucket, k, pervK, err)
-					}
-				} else {
-					if err := c.Append(k, v); err != nil {
-						return fmt.Errorf("%s: bucket: %s, append: k=%x, pervK=%x, %w", logPrefix, bucket, k, pervK, err)
-					}
+				if err := c.(ethdb.RwCursorDupSort).AppendDup(k, v); err != nil {
+					return fmt.Errorf("%s: bucket: %s, appendDup: k=%x, %w", logPrefix, bucket, k, err)
 				}
-				pervK = k
 			} else {
 				if err := c.Append(k, v); err != nil {
-					return fmt.Errorf("%s: bucket: %s, append: k=%x, v=%x,prevK=%x, prevV=%x, %w", logPrefix, bucket, k, v, pervK, pervV, err)
+					return fmt.Errorf("%s: bucket: %s, append: k=%x, v=%x, %w", logPrefix, bucket, k, v, err)
 				}
-				pervK = k
-				pervV = v
 			}
 
 			return nil

diff --git a/core/state/change_set_writer.go b/core/state/change_set_writer.go
@@ -1,7 +1,6 @@
 package state
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 
@@ -123,23 +122,14 @@ func (w *ChangeSetWriter) WriteChangeSets() error {
 	if err != nil {
 		return err
 	}
-	var prevK []byte
 	if err = changeset.Mapper[dbutils.AccountChangeSetBucket].Encode(w.blockNumber, accountChanges, func(k, v []byte) error {
-		if bytes.Equal(k, prevK) {
-			if err = w.db.AppendDup(dbutils.AccountChangeSetBucket, k, v); err != nil {
-				return err
-			}
-		} else {
-			if err = w.db.Append(dbutils.AccountChangeSetBucket, k, v); err != nil {
-				return err
-			}
+		if err = w.db.AppendDup(dbutils.AccountChangeSetBucket, k, v); err != nil {
+			return err
 		}
-		prevK = k
 		return nil
 	}); err != nil {
 		return err
 	}
-	prevK = nil
 
 	storageChanges, err := w.GetStorageChanges()
 	if err != nil {
@@ -149,16 +139,9 @@ func (w *ChangeSetWriter) WriteChangeSets() error {
 		return nil
 	}
 	if err = changeset.Mapper[dbutils.StorageChangeSetBucket].Encode(w.blockNumber, storageChanges, func(k, v []byte) error {
-		if bytes.Equal(k, prevK) {
-			if err = w.db.AppendDup(dbutils.StorageChangeSetBucket, k, v); err != nil {
-				return err
-			}
-		} else {
-			if err = w.db.Append(dbutils.StorageChangeSetBucket, k, v); err != nil {
-				return err
-			}
+		if err = w.db.AppendDup(dbutils.StorageChangeSetBucket, k, v); err != nil {
+			return err
 		}
-		prevK = k
 		return nil
 	}); err != nil {
 		return err