Skip to content
This repository has been archived by the owner on Jan 11, 2019. It is now read-only.

fix concurrent map write issue by init all regexp when startup #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix concurrent map write issue by init all regexp when startup #21

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
3462c6a
fix concurrent map write issue by init all regexp when startup
Nov 28, 2016
4a6b547
fix interval 60 issue
Dec 5, 2016
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
102 changes: 63 additions & 39 deletions cronexpr_parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"regexp"
"sort"
"strings"
"sync"
)

/******************************************************************************/
Expand Down Expand Up @@ -107,47 +108,49 @@ func atoi(s string) int {
}

type fieldDescriptor struct {
name string
min, max int
defaultList []int
valuePattern string
atoi func(string) int
name string
min, max int
defaultList []int
valuePattern string
atoi func(string) int
layoutInitOnce sync.Once
layoutMap map[string]*regexp.Regexp
}

var (
secondDescriptor = fieldDescriptor{
secondDescriptor = &fieldDescriptor{
name: "second",
min: 0,
max: 59,
defaultList: genericDefaultList[0:60],
valuePattern: `0?[0-9]|[1-5][0-9]`,
atoi: atoi,
}
minuteDescriptor = fieldDescriptor{
minuteDescriptor = &fieldDescriptor{
name: "minute",
min: 0,
max: 59,
defaultList: genericDefaultList[0:60],
valuePattern: `0?[0-9]|[1-5][0-9]`,
atoi: atoi,
}
hourDescriptor = fieldDescriptor{
hourDescriptor = &fieldDescriptor{
name: "hour",
min: 0,
max: 23,
defaultList: genericDefaultList[0:24],
valuePattern: `0?[0-9]|1[0-9]|2[0-3]`,
atoi: atoi,
}
domDescriptor = fieldDescriptor{
domDescriptor = &fieldDescriptor{
name: "day-of-month",
min: 1,
max: 31,
defaultList: genericDefaultList[1:32],
valuePattern: `0?[1-9]|[12][0-9]|3[01]`,
atoi: atoi,
}
monthDescriptor = fieldDescriptor{
monthDescriptor = &fieldDescriptor{
name: "month",
min: 1,
max: 12,
Expand All @@ -157,7 +160,7 @@ var (
return monthTokens[s]
},
}
dowDescriptor = fieldDescriptor{
dowDescriptor = &fieldDescriptor{
name: "day-of-week",
min: 0,
max: 6,
Expand All @@ -167,7 +170,7 @@ var (
return dowTokens[s]
},
}
yearDescriptor = fieldDescriptor{
yearDescriptor = &fieldDescriptor{
name: "year",
min: 1970,
max: 2099,
Expand All @@ -177,6 +180,17 @@ var (
}
)

func (f *fieldDescriptor) makeLayoutRegexp(layout string) *regexp.Regexp {
f.layoutInitOnce.Do(func() {
f.layoutMap = make(map[string]*regexp.Regexp)
for _, l := range allLayouts {
realLayoutString := strings.Replace(l, `%value%`, f.valuePattern, -1)
f.layoutMap[l] = regexp.MustCompile(realLayoutString)
}
})
return f.layoutMap[layout]
}

/******************************************************************************/

var (
Expand All @@ -193,9 +207,22 @@ var (
layoutDowOfSpecificWeek = `^(%value%)#([1-5])$`
fieldFinder = regexp.MustCompile(`\S+`)
entryFinder = regexp.MustCompile(`[^,]+`)
layoutRegexp = make(map[string]*regexp.Regexp)
)

var allLayouts = []string{
layoutWildcard,
layoutValue,
layoutRange,
layoutWildcardAndInterval,
layoutValueAndInterval,
layoutRangeAndInterval,
layoutLastDom,
layoutWorkdom,
layoutLastWorkdom,
layoutDowOfLastWeek,
layoutDowOfSpecificWeek,
}

/******************************************************************************/

var cronNormalizer = strings.NewReplacer(
Expand Down Expand Up @@ -264,7 +291,7 @@ type cronDirective struct {
send int
}

func genericFieldHandler(s string, desc fieldDescriptor) ([]int, error) {
func genericFieldHandler(s string, desc *fieldDescriptor) ([]int, error) {
directives, err := genericFieldParse(s, desc)
if err != nil {
return nil, err
Expand Down Expand Up @@ -302,12 +329,12 @@ func (expr *Expression) dowFieldHandler(s string) error {
sdirective := s[directive.sbeg:directive.send]
snormal := strings.ToLower(sdirective)
// `5L`
pairs := makeLayoutRegexp(layoutDowOfLastWeek, dowDescriptor.valuePattern).FindStringSubmatchIndex(snormal)
pairs := dowDescriptor.makeLayoutRegexp(layoutDowOfLastWeek).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
populateOne(expr.lastWeekDaysOfWeek, dowDescriptor.atoi(snormal[pairs[2]:pairs[3]]))
} else {
// `5#3`
pairs := makeLayoutRegexp(layoutDowOfSpecificWeek, dowDescriptor.valuePattern).FindStringSubmatchIndex(snormal)
pairs := dowDescriptor.makeLayoutRegexp(layoutDowOfSpecificWeek).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
populateOne(expr.specificWeekDaysOfWeek, (dowDescriptor.atoi(snormal[pairs[4]:pairs[5]])-1)*7+(dowDescriptor.atoi(snormal[pairs[2]:pairs[3]])%7))
} else {
Expand Down Expand Up @@ -344,15 +371,15 @@ func (expr *Expression) domFieldHandler(s string) error {
sdirective := s[directive.sbeg:directive.send]
snormal := strings.ToLower(sdirective)
// `L`
if makeLayoutRegexp(layoutLastDom, domDescriptor.valuePattern).MatchString(snormal) {
if domDescriptor.makeLayoutRegexp(layoutLastDom).MatchString(snormal) {
expr.lastDayOfMonth = true
} else {
// `LW`
if makeLayoutRegexp(layoutLastWorkdom, domDescriptor.valuePattern).MatchString(snormal) {
if domDescriptor.makeLayoutRegexp(layoutLastWorkdom).MatchString(snormal) {
expr.lastWorkdayOfMonth = true
} else {
// `15W`
pairs := makeLayoutRegexp(layoutWorkdom, domDescriptor.valuePattern).FindStringSubmatchIndex(snormal)
pairs := domDescriptor.makeLayoutRegexp(layoutWorkdom).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
populateOne(expr.workdaysOfMonth, domDescriptor.atoi(snormal[pairs[2]:pairs[3]]))
} else {
Expand Down Expand Up @@ -397,7 +424,7 @@ func toList(set map[int]bool) []int {

/******************************************************************************/

func genericFieldParse(s string, desc fieldDescriptor) ([]*cronDirective, error) {
func genericFieldParse(s string, desc *fieldDescriptor) ([]*cronDirective, error) {
// At least one entry must be present
indices := entryFinder.FindAllStringIndex(s, -1)
if len(indices) == 0 {
Expand All @@ -414,7 +441,7 @@ func genericFieldParse(s string, desc fieldDescriptor) ([]*cronDirective, error)
snormal := strings.ToLower(s[indices[i][0]:indices[i][1]])

// `*`
if makeLayoutRegexp(layoutWildcard, desc.valuePattern).MatchString(snormal) {
if desc.makeLayoutRegexp(layoutWildcard).MatchString(snormal) {
directive.kind = all
directive.first = desc.min
directive.last = desc.max
Expand All @@ -423,14 +450,14 @@ func genericFieldParse(s string, desc fieldDescriptor) ([]*cronDirective, error)
continue
}
// `5`
if makeLayoutRegexp(layoutValue, desc.valuePattern).MatchString(snormal) {
if desc.makeLayoutRegexp(layoutValue).MatchString(snormal) {
directive.kind = one
directive.first = desc.atoi(snormal)
directives = append(directives, &directive)
continue
}
// `5-20`
pairs := makeLayoutRegexp(layoutRange, desc.valuePattern).FindStringSubmatchIndex(snormal)
pairs := desc.makeLayoutRegexp(layoutRange).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
directive.kind = span
directive.first = desc.atoi(snormal[pairs[2]:pairs[3]])
Expand All @@ -440,32 +467,41 @@ func genericFieldParse(s string, desc fieldDescriptor) ([]*cronDirective, error)
continue
}
// `*/2`
pairs = makeLayoutRegexp(layoutWildcardAndInterval, desc.valuePattern).FindStringSubmatchIndex(snormal)
pairs = desc.makeLayoutRegexp(layoutWildcardAndInterval).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
directive.kind = span
directive.first = desc.min
directive.last = desc.max
directive.step = atoi(snormal[pairs[2]:pairs[3]])
if directive.step < 1 || directive.step > desc.max {
return nil, fmt.Errorf("invalid interval %s", snormal)
}
directives = append(directives, &directive)
continue
}
// `5/2`
pairs = makeLayoutRegexp(layoutValueAndInterval, desc.valuePattern).FindStringSubmatchIndex(snormal)
pairs = desc.makeLayoutRegexp(layoutValueAndInterval).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
directive.kind = span
directive.first = desc.atoi(snormal[pairs[2]:pairs[3]])
directive.last = desc.max
directive.step = atoi(snormal[pairs[4]:pairs[5]])
if directive.step < 1 || directive.step > desc.max {
return nil, fmt.Errorf("invalid interval %s", snormal)
}
directives = append(directives, &directive)
continue
}
// `5-20/2`
pairs = makeLayoutRegexp(layoutRangeAndInterval, desc.valuePattern).FindStringSubmatchIndex(snormal)
pairs = desc.makeLayoutRegexp(layoutRangeAndInterval).FindStringSubmatchIndex(snormal)
if len(pairs) > 0 {
directive.kind = span
directive.first = desc.atoi(snormal[pairs[2]:pairs[3]])
directive.last = desc.atoi(snormal[pairs[4]:pairs[5]])
directive.step = atoi(snormal[pairs[6]:pairs[7]])
if directive.step < 1 || directive.step > desc.max {
return nil, fmt.Errorf("invalid interval %s", snormal)
}
directives = append(directives, &directive)
continue
}
Expand All @@ -474,16 +510,4 @@ func genericFieldParse(s string, desc fieldDescriptor) ([]*cronDirective, error)
directives = append(directives, &directive)
}
return directives, nil
}

/******************************************************************************/

func makeLayoutRegexp(layout, value string) *regexp.Regexp {
layout = strings.Replace(layout, `%value%`, value, -1)
re := layoutRegexp[layout]
if re == nil {
re = regexp.MustCompile(layout)
layoutRegexp[layout] = re
}
return re
}
}
23 changes: 23 additions & 0 deletions cronexpr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,29 @@ func TestNextN_every5min(t *testing.T) {
}
}

// Issue: https://github.com/gorhill/cronexpr/issues/16
func TestInterval_Interval60Issue(t *testing.T){
_, err := cronexpr.Parse("*/60 * * * * *")
if err == nil {
t.Errorf("parsing with interval 60 should return err")
}

_, err = cronexpr.Parse("*/61 * * * * *")
if err == nil {
t.Errorf("parsing with interval 61 should return err")
}

_, err = cronexpr.Parse("2/60 * * * * *")
if err == nil {
t.Errorf("parsing with interval 60 should return err")
}

_, err = cronexpr.Parse("2-20/61 * * * * *")
if err == nil {
t.Errorf("parsing with interval 60 should return err")
}
}

/******************************************************************************/

var benchmarkExpressions = []string{
Expand Down