Skip to content
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

chore: optimizes time variables. #1242

Merged
merged 2 commits into from
Dec 9, 2024
Merged

chore: optimizes time variables. #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f46132
chore: optimizes time variables.
jcchavezs Dec 9, 2024
959ccfe
fix: test.
jcchavezs Dec 9, 2024
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
19 changes: 12 additions & 7 deletions internal/corazawaf/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,15 +1612,20 @@ func (tx *Transaction) generateResponseBodyError(err error) {
// setTimeVariables sets all the time variables
func (tx *Transaction) setTimeVariables() {
timestamp := time.Unix(0, tx.Timestamp)
tx.variables.time.Set(timestamp.Format(time.TimeOnly))
tx.variables.timeDay.Set(strconv.Itoa(timestamp.Day()))
tx.variables.timeEpoch.Set(strconv.FormatInt(timestamp.Unix(), 10))
tx.variables.timeHour.Set(strconv.Itoa(timestamp.Hour()))
tx.variables.timeMin.Set(strconv.Itoa(timestamp.Minute()))
tx.variables.timeSec.Set(strconv.Itoa(timestamp.Second()))

timeOnly := timestamp.Format(time.TimeOnly)
tx.variables.time.Set(timeOnly)
tx.variables.timeHour.Set(timeOnly[0:2])
Copy link
Member Author

Choose a reason for hiding this comment

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

👅

tx.variables.timeMin.Set(timeOnly[3:5])
tx.variables.timeSec.Set(timeOnly[6:8])

y, m, d := timestamp.Date()
Copy link
Member Author

Choose a reason for hiding this comment

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

timestamp.[Day|Month|Year]() calls t.date(true) and ignores pieces of output, hence using timestamp.Date() uses all values and saves time.

tx.variables.timeDay.Set(strconv.Itoa(d))
tx.variables.timeMon.Set(strconv.Itoa(int(m)))
tx.variables.timeYear.Set(strconv.Itoa(y))
Comment on lines +1624 to +1626
Copy link
Member

Choose a reason for hiding this comment

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

Do we save some cycles by converting at read time instead? Or the optimization it is negligible?

Copy link
Member Author

Choose a reason for hiding this comment

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

We cannot convert at read time unless lazy collections.

Copy link
Member

Choose a reason for hiding this comment

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

You can. Instead of doing strconv.Itoa(y), you just store y.

Then, when reading, you return strconv.Itoa(y).

Copy link
Member Author

Choose a reason for hiding this comment

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

timeYear is a Single variable so you store strings.


tx.variables.timeWday.Set(strconv.Itoa(int(timestamp.Weekday())))
tx.variables.timeMon.Set(strconv.Itoa(int(timestamp.Month())))
tx.variables.timeYear.Set(strconv.Itoa(timestamp.Year()))
}

// TransactionVariables has pointers to all the variables of the transaction
Expand Down
9 changes: 9 additions & 0 deletions internal/corazawaf/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,6 +1390,15 @@ func makeTransactionTimestamped(t testing.TB) *Transaction {
return tx
}

func BenchmarkTransactionTimestamped(b *testing.B) {
tx := NewWAF().NewTransaction()
tx.Timestamp = time.Now().Unix()
b.ResetTimer()
for i := 0; i < b.N; i++ {
tx.setTimeVariables()
}
}

func makeTransactionMultipart(t *testing.T) *Transaction {
if t != nil {
t.Helper()
Expand Down
Loading