feat(GODT-2201): RFC5322 Rewrite DateTime parser in Go

ProtonMail · Feb 21, 2023 · 37bb6dc · 37bb6dc
1 parent 0259255
commit 37bb6dc
Show file tree

Hide file tree

Showing 5 changed files with 646 additions and 4 deletions.
diff --git a/internal/parser/rfc5322_date_time_test.go b/internal/parser/rfc5322_date_time_test.go
@@ -1,6 +1,7 @@
 package parser
 
 import (
+	"github.com/ProtonMail/gluon/rfc5322"
 	"net/mail"
 	"testing"
 	"time"
@@ -247,6 +248,14 @@ func TestParseDateTimeRejected(t *testing.T) {
 }
 
 func BenchmarkParseDateTimeGo(B *testing.B) {
+	input := `Mon, 02 Jan 06 15:04 -0700`
+	for i := 0; i < B.N; i++ {
+		_, err := rfc5322.ParseDateTime(input)
+		require.NoError(B, err)
+	}
+}
+
+func BenchmarkParseDateTimeGoSTD(B *testing.B) {
 	input := `Mon, 02 Jan 06 15:04 -0700`
 	for i := 0; i < B.N; i++ {
 		_, err := mail.ParseDate(input)

diff --git a/internal/state/mailbox_search.go b/internal/state/mailbox_search.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/ProtonMail/gluon/rfc5322"
 	"runtime"
 	"strings"
 	"sync/atomic"
@@ -14,7 +15,6 @@ import (
 	"github.com/ProtonMail/gluon/internal/contexts"
 	"github.com/ProtonMail/gluon/internal/db"
 	"github.com/ProtonMail/gluon/internal/db/ent"
-	"github.com/ProtonMail/gluon/internal/parser"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
@@ -575,7 +575,7 @@ func buildSearchOpSentBefore(key *command.SearchKeySentBefore) (*buildSearchOpRe
 	op := func(s *searchData) (bool, error) {
 		value := s.header.Get("Date")
 
-		date, err := parser.ParseRFC5322DateTime(value)
+		date, err := rfc5322.ParseDateTime(value)
 		if err != nil {
 			return false, err
 		}
@@ -594,7 +594,7 @@ func buildSearchOpSentOn(key *command.SearchKeySentOn) (*buildSearchOpResult, er
 	op := func(s *searchData) (bool, error) {
 		value := s.header.Get("Date")
 
-		date, err := parser.ParseRFC5322DateTime(value)
+		date, err := rfc5322.ParseDateTime(value)
 		if err != nil {
 			return false, err
 		}
@@ -614,7 +614,7 @@ func buildSearchOpSentSince(key *command.SearchKeySentSince) (*buildSearchOpResu
 	op := func(s *searchData) (bool, error) {
 		value := s.header.Get("Date")
 
-		date, err := parser.ParseRFC5322DateTime(value)
+		date, err := rfc5322.ParseDateTime(value)
 		if err != nil {
 			return false, err
 		}