-
Notifications
You must be signed in to change notification settings - Fork 689
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MB-58134: Skip parsing date time fields with timestamps (#1870)
A user can set one of four values as the DateFormat for a DatetimeFieldMapping - "unix_micro" - "unix_sec" - "unix_milli" - "unix_nano" This indicates that the field has a UNIX epoch timestamp in microseconds/seconds/milliseconds/nanoseconds. Such fields should not be parsed with a date time parser since they already contain the timestamp. User can perform date range queries on these fields like normal.
- Loading branch information
1 parent
2267798
commit d1cd873
Showing
9 changed files
with
454 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright (c) 2023 Couchbase, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package microseconds | ||
|
||
import ( | ||
"math" | ||
"strconv" | ||
"time" | ||
|
||
"github.com/blevesearch/bleve/v2/analysis" | ||
"github.com/blevesearch/bleve/v2/registry" | ||
) | ||
|
||
const Name = "unix_micro" | ||
|
||
type DateTimeParser struct { | ||
} | ||
|
||
var minBound int64 = math.MinInt64 / 1000 | ||
var maxBound int64 = math.MaxInt64 / 1000 | ||
|
||
func (p *DateTimeParser) ParseDateTime(input string) (time.Time, string, error) { | ||
// unix timestamp is milliseconds since UNIX epoch | ||
timestamp, err := strconv.ParseInt(input, 10, 64) | ||
if err != nil { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampString | ||
} | ||
if timestamp < minBound || timestamp > maxBound { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampRange | ||
} | ||
return time.UnixMicro(timestamp), "", nil | ||
} | ||
|
||
func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { | ||
return &DateTimeParser{}, nil | ||
} | ||
|
||
func init() { | ||
registry.RegisterDateTimeParser(Name, DateTimeParserConstructor) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright (c) 2023 Couchbase, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package milliseconds | ||
|
||
import ( | ||
"math" | ||
"strconv" | ||
"time" | ||
|
||
"github.com/blevesearch/bleve/v2/analysis" | ||
"github.com/blevesearch/bleve/v2/registry" | ||
) | ||
|
||
const Name = "unix_milli" | ||
|
||
type DateTimeParser struct { | ||
} | ||
|
||
var minBound int64 = math.MinInt64 / 1000000 | ||
var maxBound int64 = math.MaxInt64 / 1000000 | ||
|
||
func (p *DateTimeParser) ParseDateTime(input string) (time.Time, string, error) { | ||
// unix timestamp is milliseconds since UNIX epoch | ||
timestamp, err := strconv.ParseInt(input, 10, 64) | ||
if err != nil { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampString | ||
} | ||
if timestamp < minBound || timestamp > maxBound { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampRange | ||
} | ||
return time.UnixMilli(timestamp), "", nil | ||
} | ||
|
||
func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { | ||
return &DateTimeParser{}, nil | ||
} | ||
|
||
func init() { | ||
registry.RegisterDateTimeParser(Name, DateTimeParserConstructor) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright (c) 2023 Couchbase, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package nanoseconds | ||
|
||
import ( | ||
"math" | ||
"strconv" | ||
"time" | ||
|
||
"github.com/blevesearch/bleve/v2/analysis" | ||
"github.com/blevesearch/bleve/v2/registry" | ||
) | ||
|
||
const Name = "unix_nano" | ||
|
||
type DateTimeParser struct { | ||
} | ||
|
||
var minBound int64 = math.MinInt64 | ||
var maxBound int64 = math.MaxInt64 | ||
|
||
func (p *DateTimeParser) ParseDateTime(input string) (time.Time, string, error) { | ||
// unix timestamp is milliseconds since UNIX epoch | ||
timestamp, err := strconv.ParseInt(input, 10, 64) | ||
if err != nil { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampString | ||
} | ||
if timestamp < minBound || timestamp > maxBound { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampRange | ||
} | ||
return time.Unix(0, timestamp), "", nil | ||
} | ||
|
||
func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { | ||
return &DateTimeParser{}, nil | ||
} | ||
|
||
func init() { | ||
registry.RegisterDateTimeParser(Name, DateTimeParserConstructor) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
// Copyright (c) 2014 Couchbase, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package seconds | ||
|
||
import ( | ||
"math" | ||
"strconv" | ||
"time" | ||
|
||
"github.com/blevesearch/bleve/v2/analysis" | ||
"github.com/blevesearch/bleve/v2/registry" | ||
) | ||
|
||
const Name = "unix_sec" | ||
|
||
type DateTimeParser struct { | ||
} | ||
|
||
var minBound int64 = math.MinInt64 / 1000000000 | ||
var maxBound int64 = math.MaxInt64 / 1000000000 | ||
|
||
func (p *DateTimeParser) ParseDateTime(input string) (time.Time, string, error) { | ||
// unix timestamp is seconds since UNIX epoch | ||
timestamp, err := strconv.ParseInt(input, 10, 64) | ||
if err != nil { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampString | ||
} | ||
if timestamp < minBound || timestamp > maxBound { | ||
return time.Time{}, "", analysis.ErrInvalidTimestampRange | ||
} | ||
return time.Unix(timestamp, 0), "", nil | ||
} | ||
|
||
func DateTimeParserConstructor(config map[string]interface{}, cache *registry.Cache) (analysis.DateTimeParser, error) { | ||
return &DateTimeParser{}, nil | ||
} | ||
|
||
func init() { | ||
registry.RegisterDateTimeParser(Name, DateTimeParserConstructor) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.