Skip to content

use string to handle timestamp read/write #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CoderZhi merged 2 commits into from
Apr 21, 2025
Merged

use string to handle timestamp read/write #157

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1134d35
use string to handle timestamp read/write
dustinxie Apr 8, 2025
21180fa
skip test due to kovan testnet no longer available
dustinxie Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions committee/timetableoperator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type TimeTableOperator struct {
insertMintTimeQuery string
mintTimeQuery string
tipHeightQuery string
timeLayout string
}

// NewTimeTableOperator returns an operator to time table
Expand All @@ -50,6 +51,7 @@ func NewTimeTableOperator(tableName string, driverName DRIVERTYPE) *TimeTableOpe
heightQuery: fmt.Sprintf("SELECT MAX(height) FROM %s WHERE ? >= time AND EXISTS (SELECT * FROM %s WHERE ? <= time)", tableName, tableName),
mintTimeQuery: fmt.Sprintf("SELECT time FROM %s WHERE height = ?", tableName),
tipHeightQuery: fmt.Sprintf("SELECT MAX(height) FROM %s", tableName),
timeLayout: "2006-01-02 15:04:05-07:00",
Copy link
Copy Markdown
Contributor Author

@dustinxie dustinxie Apr 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the timestamp field layout in the poll.db, use it to correctly read/write/parse timestamp

}
}

Expand Down Expand Up @@ -77,12 +79,14 @@ func (operator *TimeTableOperator) TipHeight(sdb *sql.DB, tx *sql.Tx) (uint64, e

// HeightBefore returns the Height before ts in the time table
func (operator *TimeTableOperator) HeightBefore(ts time.Time, sdb *sql.DB, tx *sql.Tx) (height uint64, err error) {
// convert to timestamp format as stored in DB
tsString := ts.UTC().Format(operator.timeLayout)
if tx != nil {
err = tx.QueryRow(operator.heightQuery, ts, ts).Scan(&height)
err = tx.QueryRow(operator.heightQuery, tsString, tsString).Scan(&height)
} else {
err = sdb.QueryRow(operator.heightQuery, ts, ts).Scan(&height)
err = sdb.QueryRow(operator.heightQuery, tsString, tsString).Scan(&height)
}
return uint64(height), nil
return uint64(height), err
}

// CreateTables prepares the tables for the operator
Expand Down Expand Up @@ -117,7 +121,8 @@ func (operator *TimeTableOperator) Put(height uint64, value interface{}, tx *sql
if !ok {
return errors.Errorf("unexpected type %s", reflect.TypeOf(value))
}
_, err := tx.Exec(operator.insertMintTimeQuery, height, mintTime)

// convert to timestamp format as stored in DB
tsString := mintTime.UTC().Format(operator.timeLayout)
_, err := tx.Exec(operator.insertMintTimeQuery, height, tsString)
return err
}
Loading