From fe7c97afa00272cb7e42ca2fbb5ae33b9b18fd87 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Mon, 11 Apr 2022 08:26:00 -0600 Subject: [PATCH] Fix size/PageSize calculation to be int64. --- rbf/db.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rbf/db.go b/rbf/db.go index 9b082d5aa..a03b2652b 100644 --- a/rbf/db.go +++ b/rbf/db.go @@ -237,11 +237,11 @@ func (db *DB) openWAL() (err error) { } if fileSize != int64(pageN*PageSize) { - if err := db.walFile.Truncate(int64(pageN * PageSize)); err != nil { + if err := db.walFile.Truncate(int64(pageN) * PageSize); err != nil { return fmt.Errorf("wal truncate: %w", err) } } - if _, err := db.walFile.Seek(int64(pageN*PageSize), io.SeekStart); err != nil { + if _, err := db.walFile.Seek(int64(pageN)*PageSize, io.SeekStart); err != nil { return fmt.Errorf("wal seek: %w", err) } db.walPageN = pageN @@ -414,7 +414,7 @@ func (db *DB) checkpoint() (err error) { // Truncate data file if it has shrunk. if fi, err := db.file.Stat(); err != nil { db.logger.Errorf("stat db file: %w", err) - } else if sz := int64(pageN * PageSize); sz > 0 && fi.Size() > sz { + } else if sz := int64(pageN) * PageSize; sz > 0 && fi.Size() > sz { if err := db.file.Truncate(sz); err != nil { db.logger.Errorf("truncate db file: %w", err) } @@ -571,7 +571,7 @@ func (db *DB) WALSize() int64 { } func (db *DB) walSize() int64 { - return int64(db.walPageN * PageSize) + return int64(db.walPageN) * PageSize } // init initializes a new database file. @@ -649,7 +649,7 @@ func (db *DB) Begin(writable bool) (_ *Tx, err error) { // Wait for WAL size to be below threshold, if we're going to write. // Reads don't care. if writable { - for int64(db.walPageN*PageSize) > db.cfg.MaxWALCheckpointSize { + for int64(db.walPageN)*PageSize > db.cfg.MaxWALCheckpointSize { if db.isDead != nil { err := db.isDead cleanup()