src/dedo.go: Simple renames - beginRWTx->beginTransaction, beginTx->beginSnapshot

2 files changed, 31 insertions, 31 deletions

diff --git a/src/dedo.go b/src/dedo.go
index dedeaa9..734b384 100644
--- a/src/dedo.go
+++ b/src/dedo.go
@@ -2010,7 +2010,7 @@ func (db *DB) close() error {
 /// IMPORTANT: You must close read-only transactions after you are finished or
 /// else the database will not reclaim old pages.
 
-func (db *DB) beginTx() (*transactionT, error) {
+func (db *DB) beginSnapshot() (*transactionT, error) {
 	// Lock the meta pages while we initialize the transaction.  We obtain
 	// the meta lock before the mmap lock because that's the order that the
 	// write transaction will obtain them.
@@ -2041,7 +2041,7 @@ func (db *DB) beginTx() (*transactionT, error) {
 	return t, nil
 }
 
-func (db *DB) beginRWTx() (*transactionT, error) {
+func (db *DB) beginTransaction() (*transactionT, error) {
 	// Obtain writer lock.  This is released by the transaction when it
 	// closes.  This enforces only one writer transaction at a time.
 	db.rwlock.Lock()
@@ -2108,7 +2108,7 @@ func (db *DB) removeTx(tx *transactionT) {
 /// Attempting to manually commit or rollback within the function will cause a
 /// panic.
 func (db *DB) Update(fn func(TransactionI) error) error {
-	t, err := db.beginRWTx()
+	t, err := db.beginTransaction()
 	if err != nil {
 		return err
 	}
@@ -2137,7 +2137,7 @@ func (db *DB) Update(fn func(TransactionI) error) error {
 ///
 /// Attempting to manually rollback within the function will cause a panic.
 func (db *DB) View(fn func(SnapshotI) error) error {
-	t, err := db.beginTx()
+	t, err := db.beginSnapshot()
 	if err != nil {
 		return err
 	}
diff --git a/tests/dedo.go b/tests/dedo.go
index 63cb64d..0c98217 100644
--- a/tests/dedo.go
+++ b/tests/dedo.go
@@ -845,7 +845,7 @@ func TestBucket_Put_Closed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1221,7 +1221,7 @@ func TestBucket_Delete_Closed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1624,7 +1624,7 @@ func TestBucket_NextSequence_Closed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1770,7 +1770,7 @@ func TestBucket_ForEach_Closed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2580,7 +2580,7 @@ func TestCursor_Iterate_Leaf(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	tx, err := db.beginTx()
+	tx, err := db.beginSnapshot()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2663,7 +2663,7 @@ func TestCursor_LeafRootReverse(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	tx, err := db.beginTx()
+	tx, err := db.beginSnapshot()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2738,7 +2738,7 @@ func TestCursor_Restart(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	tx, err := db.beginTx()
+	tx, err := db.beginSnapshot()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2830,7 +2830,7 @@ func TestCursor_QuickCheck(t *testing.T) {
 		defer os.Remove(db.Path())
 
 		// Bulk insert all values.
-		tx, err := db.beginRWTx()
+		tx, err := db.beginTransaction()
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -2855,7 +2855,7 @@ func TestCursor_QuickCheck(t *testing.T) {
 
 		// Iterate over all items and check consistency.
 		index := 0
-		tx, err = db.beginTx()
+		tx, err = db.beginSnapshot()
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -2903,7 +2903,7 @@ func TestCursor_QuickCheck_Reverse(t *testing.T) {
 		defer os.Remove(db.Path())
 
 		// Bulk insert all values.
-		tx, err := db.beginRWTx()
+		tx, err := db.beginTransaction()
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -2930,7 +2930,7 @@ func TestCursor_QuickCheck_Reverse(t *testing.T) {
 
 		// Iterate over all items and check consistency.
 		index := 0
-		tx, err = db.beginTx()
+		tx, err = db.beginSnapshot()
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -3579,13 +3579,13 @@ func TestDB_Open_InitialMmapSize(t *testing.T) {
 
 	// create a long-running read transaction
 	// that never gets closed while writing
-	rtx, err := db.beginTx()
+	rtx, err := db.beginSnapshot()
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// create a write transaction
-	wtx, err := db.beginRWTx()
+	wtx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -3627,7 +3627,7 @@ func TestDB_Open_InitialMmapSize(t *testing.T) {
 // Ensure that a database cannot open a transaction when it's not open.
 func TestDB_Begin_ErrDatabaseNotOpen(t *testing.T) {
 	var db DB
-	_, err := db.beginTx()
+	_, err := db.beginSnapshot()
 	if err != ErrDatabaseNotOpen {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -3639,7 +3639,7 @@ func TestDB_BeginRW(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	} else if tx == nil {
@@ -3661,7 +3661,7 @@ func TestDB_BeginRW(t *testing.T) {
 // Ensure that opening a transaction while the DB is closed returns an error.
 func TestDB_BeginRW_Closed(t *testing.T) {
 	var db DB
-	_, err := db.beginRWTx()
+	_, err := db.beginTransaction()
 	if err != ErrDatabaseNotOpen {
 		t.Fatalf("unexpected error: %s", err)
 	}
@@ -3685,7 +3685,7 @@ func testDB_Close_PendingTx(t *testing.T, writable bool) {
 	defer os.Remove(db.Path())
 
 	// Start transaction.
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -4329,7 +4329,7 @@ func ExampleDB_Begin_ReadOnly() {
 	}
 
 	// Create several keys in a transaction.
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -4356,7 +4356,7 @@ func ExampleDB_Begin_ReadOnly() {
 	}
 
 	// Iterate over the values in sorted key order.
-	tx, err = db.beginTx()
+	tx, err = db.beginSnapshot()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -5518,9 +5518,9 @@ func testSimulate(t *testing.T, threadCount, parallelism int) {
 			var tx *transactionT
 			var err error
 			if writable {
-				tx, err = db.beginRWTx()
+				tx, err = db.beginTransaction()
 			} else {
-				tx, err = db.beginTx()
+				tx, err = db.beginSnapshot()
 			}
 			if err != nil {
 				t.Fatal("tx begin: ", err)
@@ -5806,7 +5806,7 @@ func TestTx_Commit_ErrTxClosed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -5833,7 +5833,7 @@ func TestTx_Rollback_ErrTxClosed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -5855,7 +5855,7 @@ func TestTx_Commit_ErrTxNotWritable(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginTx()
+	tx, err := db.beginSnapshot()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -5938,7 +5938,7 @@ func TestTx_CreateBucket_ErrTxClosed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -6224,7 +6224,7 @@ func TestTx_DeleteBucket_ErrTxClosed(t *testing.T) {
 	defer db.MustClose()
 	defer os.Remove(db.Path())
 
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -6517,7 +6517,7 @@ func ExampleTx_Rollback() {
 	}
 
 	// Update the key but rollback the transaction so it never saves.
-	tx, err := db.beginRWTx()
+	tx, err := db.beginTransaction()
 	if err != nil {
 		log.Fatal(err)
 	}