2018-10-29 01:49:45 +03:00
|
|
|
package server
|
2016-03-05 02:08:16 +03:00
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2018-02-15 22:08:27 +03:00
|
|
|
"errors"
|
2016-03-05 02:08:16 +03:00
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
"time"
|
|
|
|
|
2018-10-11 00:25:40 +03:00
|
|
|
"github.com/mmcloughlin/geohash"
|
|
|
|
"github.com/tidwall/geojson"
|
|
|
|
"github.com/tidwall/geojson/geometry"
|
2016-03-29 00:16:21 +03:00
|
|
|
"github.com/tidwall/resp"
|
2018-10-11 00:25:40 +03:00
|
|
|
"github.com/tidwall/tile38/internal/bing"
|
2021-07-11 20:09:51 +03:00
|
|
|
"github.com/tidwall/tile38/internal/clip"
|
2018-10-11 00:25:40 +03:00
|
|
|
"github.com/tidwall/tile38/internal/glob"
|
2016-03-05 02:08:16 +03:00
|
|
|
)
|
|
|
|
|
2018-10-11 00:25:40 +03:00
|
|
|
const defaultCircleSteps = 64
|
|
|
|
|
2016-03-05 02:08:16 +03:00
|
|
|
type liveFenceSwitches struct {
|
|
|
|
searchScanBaseTokens
|
2018-10-11 00:25:40 +03:00
|
|
|
obj geojson.Object
|
|
|
|
cmd string
|
|
|
|
roam roamSwitches
|
|
|
|
groups map[string]string
|
2016-05-23 23:01:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
type roamSwitches struct {
|
|
|
|
on bool
|
|
|
|
key string
|
|
|
|
id string
|
|
|
|
pattern bool
|
|
|
|
meters float64
|
2016-12-15 21:37:38 +03:00
|
|
|
scan string
|
2018-08-14 20:48:28 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
type roamMatch struct {
|
|
|
|
id string
|
|
|
|
obj geojson.Object
|
|
|
|
meters float64
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
func (s liveFenceSwitches) Error() string {
|
2018-08-14 03:05:30 +03:00
|
|
|
return goingLive
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
|
2018-02-15 22:08:27 +03:00
|
|
|
func (s liveFenceSwitches) Close() {
|
2018-03-05 21:10:40 +03:00
|
|
|
for _, whereeval := range s.whereevals {
|
2018-02-15 22:08:27 +03:00
|
|
|
whereeval.Close()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-05 21:10:40 +03:00
|
|
|
func (s liveFenceSwitches) usingLua() bool {
|
|
|
|
return len(s.whereevals) > 0
|
|
|
|
}
|
|
|
|
|
2020-03-20 08:09:24 +03:00
|
|
|
func parseRectArea(ltyp string, vs []string) (nvs []string, rect *geojson.Rect, err error) {
|
|
|
|
|
|
|
|
var ok bool
|
|
|
|
|
|
|
|
switch ltyp {
|
|
|
|
default:
|
|
|
|
err = errNotRectangle
|
|
|
|
return
|
|
|
|
case "bounds":
|
|
|
|
var sminLat, sminLon, smaxlat, smaxlon string
|
|
|
|
if vs, sminLat, ok = tokenval(vs); !ok || sminLat == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, sminLon, ok = tokenval(vs); !ok || sminLon == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, smaxlat, ok = tokenval(vs); !ok || smaxlat == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, smaxlon, ok = tokenval(vs); !ok || smaxlon == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var minLat, minLon, maxLat, maxLon float64
|
|
|
|
if minLat, err = strconv.ParseFloat(sminLat, 64); err != nil {
|
|
|
|
err = errInvalidArgument(sminLat)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if minLon, err = strconv.ParseFloat(sminLon, 64); err != nil {
|
|
|
|
err = errInvalidArgument(sminLon)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if maxLat, err = strconv.ParseFloat(smaxlat, 64); err != nil {
|
|
|
|
err = errInvalidArgument(smaxlat)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if maxLon, err = strconv.ParseFloat(smaxlon, 64); err != nil {
|
|
|
|
err = errInvalidArgument(smaxlon)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
rect = geojson.NewRect(geometry.Rect{
|
|
|
|
Min: geometry.Point{X: minLon, Y: minLat},
|
|
|
|
Max: geometry.Point{X: maxLon, Y: maxLat},
|
|
|
|
})
|
|
|
|
case "hash":
|
|
|
|
var hash string
|
|
|
|
if vs, hash, ok = tokenval(vs); !ok || hash == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
box := geohash.BoundingBox(hash)
|
|
|
|
rect = geojson.NewRect(geometry.Rect{
|
|
|
|
Min: geometry.Point{X: box.MinLng, Y: box.MinLat},
|
|
|
|
Max: geometry.Point{X: box.MaxLng, Y: box.MaxLat},
|
|
|
|
})
|
|
|
|
case "quadkey":
|
|
|
|
var key string
|
|
|
|
if vs, key, ok = tokenval(vs); !ok || key == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var minLat, minLon, maxLat, maxLon float64
|
|
|
|
minLat, minLon, maxLat, maxLon, err = bing.QuadKeyToBounds(key)
|
|
|
|
if err != nil {
|
|
|
|
err = errInvalidArgument(key)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
rect = geojson.NewRect(geometry.Rect{
|
|
|
|
Min: geometry.Point{X: minLon, Y: minLat},
|
|
|
|
Max: geometry.Point{X: maxLon, Y: maxLat},
|
|
|
|
})
|
|
|
|
case "tile":
|
|
|
|
var sx, sy, sz string
|
|
|
|
if vs, sx, ok = tokenval(vs); !ok || sx == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, sy, ok = tokenval(vs); !ok || sy == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, sz, ok = tokenval(vs); !ok || sz == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var x, y int64
|
|
|
|
var z uint64
|
|
|
|
if x, err = strconv.ParseInt(sx, 10, 64); err != nil {
|
|
|
|
err = errInvalidArgument(sx)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if y, err = strconv.ParseInt(sy, 10, 64); err != nil {
|
|
|
|
err = errInvalidArgument(sy)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if z, err = strconv.ParseUint(sz, 10, 64); err != nil {
|
|
|
|
err = errInvalidArgument(sz)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
var minLat, minLon, maxLat, maxLon float64
|
|
|
|
minLat, minLon, maxLat, maxLon = bing.TileXYToBounds(x, y, z)
|
|
|
|
rect = geojson.NewRect(geometry.Rect{
|
|
|
|
Min: geometry.Point{X: minLon, Y: minLat},
|
|
|
|
Max: geometry.Point{X: maxLon, Y: maxLat},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
nvs = vs
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdSearchArgs(
|
|
|
|
fromFenceCmd bool, cmd string, vs []string, types []string,
|
2018-08-14 03:05:30 +03:00
|
|
|
) (s liveFenceSwitches, err error) {
|
|
|
|
var t searchScanBaseTokens
|
|
|
|
if fromFenceCmd {
|
|
|
|
t.fence = true
|
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
vs, t, err = server.parseSearchScanBaseTokens(cmd, t, vs)
|
2018-08-14 03:05:30 +03:00
|
|
|
if err != nil {
|
2016-03-05 02:08:16 +03:00
|
|
|
return
|
|
|
|
}
|
2018-08-14 03:05:30 +03:00
|
|
|
s.searchScanBaseTokens = t
|
2016-03-05 02:08:16 +03:00
|
|
|
var typ string
|
2016-03-29 00:16:21 +03:00
|
|
|
var ok bool
|
|
|
|
if vs, typ, ok = tokenval(vs); !ok || typ == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if s.searchScanBaseTokens.output == outputBounds {
|
|
|
|
if cmd == "within" || cmd == "intersects" {
|
|
|
|
if _, err := strconv.ParseFloat(typ, 64); err == nil {
|
|
|
|
// It's likely that the output was not specified, but rather the search bounds.
|
|
|
|
s.searchScanBaseTokens.output = defaultSearchOutput
|
2018-10-29 01:49:45 +03:00
|
|
|
vs = append([]string{typ}, vs...)
|
2016-03-05 02:08:16 +03:00
|
|
|
typ = "BOUNDS"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-23 23:01:42 +03:00
|
|
|
ltyp := strings.ToLower(typ)
|
2016-03-05 02:08:16 +03:00
|
|
|
var found bool
|
|
|
|
for _, t := range types {
|
2016-05-23 23:01:42 +03:00
|
|
|
if ltyp == t {
|
2016-03-05 02:08:16 +03:00
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2016-05-23 23:01:42 +03:00
|
|
|
if !found && s.searchScanBaseTokens.fence && ltyp == "roam" && cmd == "nearby" {
|
|
|
|
// allow roaming for nearby fence searches.
|
|
|
|
found = true
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
if !found {
|
|
|
|
err = errInvalidArgument(typ)
|
|
|
|
return
|
|
|
|
}
|
2016-05-23 23:01:42 +03:00
|
|
|
switch ltyp {
|
2016-03-05 02:08:16 +03:00
|
|
|
case "point":
|
2018-10-11 00:25:40 +03:00
|
|
|
fallthrough
|
|
|
|
case "circle":
|
|
|
|
if s.clip {
|
2019-02-09 00:56:07 +03:00
|
|
|
err = errInvalidArgument("cannot clip with " + ltyp)
|
2018-10-11 00:25:40 +03:00
|
|
|
return
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
var slat, slon, smeters string
|
2016-03-29 00:16:21 +03:00
|
|
|
if vs, slat, ok = tokenval(vs); !ok || slat == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2016-03-29 00:16:21 +03:00
|
|
|
if vs, slon, ok = tokenval(vs); !ok || slon == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2018-10-11 00:25:40 +03:00
|
|
|
var lat, lon, meters float64
|
|
|
|
if lat, err = strconv.ParseFloat(slat, 64); err != nil {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidArgument(slat)
|
|
|
|
return
|
|
|
|
}
|
2018-10-11 00:25:40 +03:00
|
|
|
if lon, err = strconv.ParseFloat(slon, 64); err != nil {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidArgument(slon)
|
|
|
|
return
|
|
|
|
}
|
2018-10-26 02:37:06 +03:00
|
|
|
// radius is optional for nearby, but mandatory for others
|
|
|
|
if cmd == "nearby" {
|
|
|
|
if vs, smeters, ok = tokenval(vs); ok && smeters != "" {
|
|
|
|
if meters, err = strconv.ParseFloat(smeters, 64); err != nil {
|
|
|
|
err = errInvalidArgument(smeters)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if meters < 0 {
|
|
|
|
err = errInvalidArgument(smeters)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
meters = -1
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if vs, smeters, ok = tokenval(vs); !ok || smeters == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2018-10-11 00:25:40 +03:00
|
|
|
if meters, err = strconv.ParseFloat(smeters, 64); err != nil {
|
2017-01-31 02:41:12 +03:00
|
|
|
err = errInvalidArgument(smeters)
|
|
|
|
return
|
|
|
|
}
|
2018-10-11 00:25:40 +03:00
|
|
|
if meters < 0 {
|
2018-06-08 19:52:26 +03:00
|
|
|
err = errInvalidArgument(smeters)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
2018-10-26 02:37:06 +03:00
|
|
|
s.obj = geojson.NewCircle(geometry.Point{X: lon, Y: lat}, meters, defaultCircleSteps)
|
2016-03-05 02:08:16 +03:00
|
|
|
case "object":
|
2018-05-08 02:18:18 +03:00
|
|
|
if s.clip {
|
2019-02-09 00:56:07 +03:00
|
|
|
err = errInvalidArgument("cannot clip with object")
|
2018-10-11 00:25:40 +03:00
|
|
|
return
|
2018-05-08 02:18:18 +03:00
|
|
|
}
|
2016-03-29 00:16:21 +03:00
|
|
|
var obj string
|
|
|
|
if vs, obj, ok = tokenval(vs); !ok || obj == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2019-01-10 19:36:58 +03:00
|
|
|
s.obj, err = geojson.Parse(obj, &server.geomParseOpts)
|
2016-03-05 02:08:16 +03:00
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
2020-03-20 08:09:24 +03:00
|
|
|
case "bounds", "hash", "tile", "quadkey":
|
|
|
|
vs, s.obj, err = parseRectArea(ltyp, vs)
|
2018-10-11 00:25:40 +03:00
|
|
|
if err != nil {
|
2016-03-05 02:08:16 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
case "get":
|
2018-05-08 02:18:18 +03:00
|
|
|
if s.clip {
|
2019-02-09 00:56:07 +03:00
|
|
|
err = errInvalidArgument("cannot clip with get")
|
2018-05-08 02:18:18 +03:00
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
var key, id string
|
2016-03-29 00:16:21 +03:00
|
|
|
if vs, key, ok = tokenval(vs); !ok || key == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2016-03-29 00:16:21 +03:00
|
|
|
if vs, id, ok = tokenval(vs); !ok || id == "" {
|
2016-03-05 02:08:16 +03:00
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
col := server.getCol(key)
|
2016-03-05 02:08:16 +03:00
|
|
|
if col == nil {
|
|
|
|
err = errKeyNotFound
|
|
|
|
return
|
|
|
|
}
|
Update expiration logic
This commit changes the logic for managing the expiration of
objects in the database.
Before: There was a server-wide hashmap that stored the
collection key, id, and expiration timestamp for all objects
that had a TTL. The hashmap was occasionally probed at 20
random positions, looking for objects that have expired. Those
expired objects were immediately deleted, and if there was 5
or more objects deleted, then the probe happened again, with
no delay. If the number of objects was less than 5 then the
there was a 1/10th of a second delay before the next probe.
Now: Rather than a server-wide hashmap, each collection has
its own ordered priority queue that stores objects with TTLs.
Rather than probing, there is a background routine that
executes every 1/10th of a second, which pops the expired
objects from the collection queues, and deletes them.
The collection/queue method is a more stable approach than
the hashmap/probing method. With probing, we can run into
major cache misses for some cases where there is wide
TTL duration, such as in the hours or days. This may cause
the system to occasionally fall behind, leaving should-be
expired objects in memory. Using a queue, there is no
cache misses, all objects that should be expired will be
right away, regardless of the TTL durations.
Fixes #616
2021-07-12 23:37:50 +03:00
|
|
|
s.obj, _, _, ok = col.Get(id)
|
2016-03-05 02:08:16 +03:00
|
|
|
if !ok {
|
|
|
|
err = errIDNotFound
|
|
|
|
return
|
|
|
|
}
|
2016-05-23 23:01:42 +03:00
|
|
|
case "roam":
|
|
|
|
s.roam.on = true
|
|
|
|
if vs, s.roam.key, ok = tokenval(vs); !ok || s.roam.key == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, s.roam.id, ok = tokenval(vs); !ok || s.roam.id == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
2016-07-12 22:18:16 +03:00
|
|
|
s.roam.pattern = glob.IsGlob(s.roam.id)
|
2016-05-23 23:01:42 +03:00
|
|
|
var smeters string
|
|
|
|
if vs, smeters, ok = tokenval(vs); !ok || smeters == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if s.roam.meters, err = strconv.ParseFloat(smeters, 64); err != nil {
|
|
|
|
err = errInvalidArgument(smeters)
|
|
|
|
return
|
|
|
|
}
|
2016-12-15 21:37:38 +03:00
|
|
|
var scan string
|
|
|
|
if vs, scan, ok = tokenval(vs); ok {
|
|
|
|
if strings.ToLower(scan) != "scan" {
|
|
|
|
err = errInvalidArgument(scan)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, scan, ok = tokenval(vs); !ok || scan == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
s.roam.scan = scan
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2020-03-20 08:09:24 +03:00
|
|
|
|
|
|
|
var clip_rect *geojson.Rect
|
|
|
|
var tok, ltok string
|
|
|
|
for len(vs) > 0 {
|
|
|
|
if vs, tok, ok = tokenval(vs); !ok || tok == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if strings.ToLower(tok) != "clipby" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vs, tok, ok = tokenval(vs); !ok || tok == "" {
|
|
|
|
err = errInvalidNumberOfArguments
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ltok = strings.ToLower(tok)
|
|
|
|
switch ltok {
|
|
|
|
case "bounds", "hash", "tile", "quadkey":
|
|
|
|
vs, clip_rect, err = parseRectArea(ltok, vs)
|
|
|
|
if err == errNotRectangle {
|
|
|
|
err = errInvalidArgument("cannot clipby " + ltok)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
s.obj = clip.Clip(s.obj, clip_rect, &server.geomIndexOpts)
|
|
|
|
default:
|
|
|
|
err = errInvalidArgument("cannot clipby " + ltok)
|
|
|
|
return
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-03-19 17:16:19 +03:00
|
|
|
var nearbyTypes = []string{"point"}
|
2018-06-08 19:52:26 +03:00
|
|
|
var withinOrIntersectsTypes = []string{
|
|
|
|
"geo", "bounds", "hash", "tile", "quadkey", "get", "object", "circle"}
|
2016-03-19 17:16:19 +03:00
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdNearby(msg *Message) (res resp.Value, err error) {
|
2016-03-05 02:08:16 +03:00
|
|
|
start := time.Now()
|
2018-10-29 01:49:45 +03:00
|
|
|
vs := msg.Args[1:]
|
2016-03-05 02:08:16 +03:00
|
|
|
wr := &bytes.Buffer{}
|
2018-10-29 01:49:45 +03:00
|
|
|
s, err := server.cmdSearchArgs(false, "nearby", vs, nearbyTypes)
|
2018-03-05 21:10:40 +03:00
|
|
|
if s.usingLua() {
|
|
|
|
defer s.Close()
|
|
|
|
defer func() {
|
|
|
|
if r := recover(); r != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
res = NOMessage
|
2018-03-05 21:10:40 +03:00
|
|
|
err = errors.New(r.(string))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
s.cmd = "nearby"
|
|
|
|
if s.fence {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, s
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
sw, err := server.newScanWriter(
|
2018-02-15 22:08:27 +03:00
|
|
|
wr, msg, s.key, s.output, s.precision, s.glob, false,
|
|
|
|
s.cursor, s.limit, s.wheres, s.whereins, s.whereevals, s.nofields)
|
2016-03-05 02:08:16 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-03-29 00:16:21 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2016-03-29 00:16:21 +03:00
|
|
|
wr.WriteString(`{"ok":true`)
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
sw.writeHead()
|
|
|
|
if sw.col != nil {
|
2020-04-08 06:10:58 +03:00
|
|
|
maxDist := s.obj.(*geojson.Circle).Meters()
|
2018-11-02 15:09:51 +03:00
|
|
|
iter := func(id string, o geojson.Object, fields []float64, dist float64) bool {
|
2020-04-08 06:10:58 +03:00
|
|
|
if maxDist > 0 && dist > maxDist {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2018-11-02 15:09:51 +03:00
|
|
|
meters := 0.0
|
2017-01-10 19:49:48 +03:00
|
|
|
if s.distance {
|
2020-04-08 06:10:58 +03:00
|
|
|
meters = dist
|
2017-01-10 19:49:48 +03:00
|
|
|
}
|
|
|
|
return sw.writeObject(ScanWriterParams{
|
2021-07-11 20:09:51 +03:00
|
|
|
id: id,
|
|
|
|
o: o,
|
|
|
|
fields: fields,
|
|
|
|
distance: meters,
|
|
|
|
distOutput: s.distance,
|
|
|
|
noLock: true,
|
|
|
|
ignoreGlobMatch: true,
|
|
|
|
skipTesting: true,
|
2018-10-11 00:25:40 +03:00
|
|
|
})
|
2017-01-31 02:41:12 +03:00
|
|
|
}
|
2020-04-08 06:10:58 +03:00
|
|
|
sw.col.Nearby(s.obj, sw, msg.Deadline, iter)
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2017-07-24 18:26:10 +03:00
|
|
|
sw.writeFoot()
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2021-03-31 18:13:44 +03:00
|
|
|
wr.WriteString(`,"elapsed":"` + time.Since(start).String() + "\"}")
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return resp.BytesValue(wr.Bytes()), nil
|
2016-03-29 00:16:21 +03:00
|
|
|
}
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return sw.respOut, nil
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdWithin(msg *Message) (res resp.Value, err error) {
|
|
|
|
return server.cmdWithinOrIntersects("within", msg)
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdIntersects(msg *Message) (res resp.Value, err error) {
|
|
|
|
return server.cmdWithinOrIntersects("intersects", msg)
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdWithinOrIntersects(cmd string, msg *Message) (res resp.Value, err error) {
|
2016-03-05 02:08:16 +03:00
|
|
|
start := time.Now()
|
2018-10-29 01:49:45 +03:00
|
|
|
vs := msg.Args[1:]
|
2016-03-29 00:16:21 +03:00
|
|
|
|
2016-03-05 02:08:16 +03:00
|
|
|
wr := &bytes.Buffer{}
|
2018-10-29 01:49:45 +03:00
|
|
|
s, err := server.cmdSearchArgs(false, cmd, vs, withinOrIntersectsTypes)
|
2018-03-05 21:10:40 +03:00
|
|
|
if s.usingLua() {
|
|
|
|
defer s.Close()
|
|
|
|
defer func() {
|
|
|
|
if r := recover(); r != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
res = NOMessage
|
2018-03-05 21:10:40 +03:00
|
|
|
err = errors.New(r.(string))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
|
|
|
s.cmd = cmd
|
|
|
|
if s.fence {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, s
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
sw, err := server.newScanWriter(
|
2018-02-15 22:08:27 +03:00
|
|
|
wr, msg, s.key, s.output, s.precision, s.glob, false,
|
|
|
|
s.cursor, s.limit, s.wheres, s.whereins, s.whereevals, s.nofields)
|
2016-03-05 02:08:16 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2016-07-11 07:40:18 +03:00
|
|
|
wr.WriteString(`{"ok":true`)
|
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
sw.writeHead()
|
2017-08-03 14:01:07 +03:00
|
|
|
if sw.col != nil {
|
|
|
|
if cmd == "within" {
|
2019-04-24 15:09:41 +03:00
|
|
|
sw.col.Within(s.obj, s.sparse, sw, msg.Deadline, func(
|
2018-10-11 00:25:40 +03:00
|
|
|
id string, o geojson.Object, fields []float64,
|
|
|
|
) bool {
|
|
|
|
return sw.writeObject(ScanWriterParams{
|
|
|
|
id: id,
|
|
|
|
o: o,
|
|
|
|
fields: fields,
|
|
|
|
noLock: true,
|
|
|
|
})
|
|
|
|
})
|
2017-08-03 14:01:07 +03:00
|
|
|
} else if cmd == "intersects" {
|
2019-04-24 15:09:41 +03:00
|
|
|
sw.col.Intersects(s.obj, s.sparse, sw, msg.Deadline, func(
|
2018-10-11 00:25:40 +03:00
|
|
|
id string,
|
|
|
|
o geojson.Object,
|
|
|
|
fields []float64,
|
|
|
|
) bool {
|
|
|
|
params := ScanWriterParams{
|
|
|
|
id: id,
|
|
|
|
o: o,
|
|
|
|
fields: fields,
|
|
|
|
noLock: true,
|
|
|
|
}
|
|
|
|
if s.clip {
|
|
|
|
params.clip = s.obj
|
|
|
|
}
|
|
|
|
return sw.writeObject(params)
|
|
|
|
})
|
2017-08-03 14:01:07 +03:00
|
|
|
}
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|
2017-07-24 18:26:10 +03:00
|
|
|
sw.writeFoot()
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2021-03-31 18:13:44 +03:00
|
|
|
wr.WriteString(`,"elapsed":"` + time.Since(start).String() + "\"}")
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return resp.BytesValue(wr.Bytes()), nil
|
2016-07-11 07:40:18 +03:00
|
|
|
}
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return sw.respOut, nil
|
2016-07-11 07:40:18 +03:00
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdSeachValuesArgs(vs []string) (
|
2018-08-14 03:05:30 +03:00
|
|
|
s liveFenceSwitches, err error,
|
|
|
|
) {
|
|
|
|
var t searchScanBaseTokens
|
2018-10-29 01:49:45 +03:00
|
|
|
vs, t, err = server.parseSearchScanBaseTokens("search", t, vs)
|
2018-08-14 03:05:30 +03:00
|
|
|
if err != nil {
|
2016-07-11 07:40:18 +03:00
|
|
|
return
|
|
|
|
}
|
2018-08-14 03:05:30 +03:00
|
|
|
s.searchScanBaseTokens = t
|
2016-07-13 06:11:02 +03:00
|
|
|
if len(vs) != 0 {
|
|
|
|
err = errInvalidNumberOfArguments
|
2016-07-11 07:40:18 +03:00
|
|
|
return
|
|
|
|
}
|
2016-07-13 06:11:02 +03:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2018-10-29 01:49:45 +03:00
|
|
|
func (server *Server) cmdSearch(msg *Message) (res resp.Value, err error) {
|
2016-07-13 06:11:02 +03:00
|
|
|
start := time.Now()
|
2018-10-29 01:49:45 +03:00
|
|
|
vs := msg.Args[1:]
|
2016-07-13 06:11:02 +03:00
|
|
|
|
2016-07-11 07:40:18 +03:00
|
|
|
wr := &bytes.Buffer{}
|
2018-10-29 01:49:45 +03:00
|
|
|
s, err := server.cmdSeachValuesArgs(vs)
|
2018-03-05 21:10:40 +03:00
|
|
|
if s.usingLua() {
|
|
|
|
defer s.Close()
|
|
|
|
defer func() {
|
|
|
|
if r := recover(); r != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
res = NOMessage
|
2018-03-05 21:10:40 +03:00
|
|
|
err = errors.New(r.(string))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2016-07-13 06:11:02 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-07-13 06:11:02 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
sw, err := server.newScanWriter(
|
2018-02-15 22:08:27 +03:00
|
|
|
wr, msg, s.key, s.output, s.precision, s.glob, true,
|
|
|
|
s.cursor, s.limit, s.wheres, s.whereins, s.whereevals, s.nofields)
|
2016-07-13 06:11:02 +03:00
|
|
|
if err != nil {
|
2018-10-29 01:49:45 +03:00
|
|
|
return NOMessage, err
|
2016-07-13 06:11:02 +03:00
|
|
|
}
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2016-07-13 06:11:02 +03:00
|
|
|
wr.WriteString(`{"ok":true`)
|
2016-07-11 07:40:18 +03:00
|
|
|
}
|
2016-07-13 06:11:02 +03:00
|
|
|
sw.writeHead()
|
|
|
|
if sw.col != nil {
|
2021-03-31 18:13:44 +03:00
|
|
|
if sw.output == outputCount && len(sw.wheres) == 0 && sw.globEverything {
|
2016-07-13 07:59:36 +03:00
|
|
|
count := sw.col.Count() - int(s.cursor)
|
2016-07-13 06:11:02 +03:00
|
|
|
if count < 0 {
|
|
|
|
count = 0
|
|
|
|
}
|
|
|
|
sw.count = uint64(count)
|
|
|
|
} else {
|
2016-07-13 07:51:01 +03:00
|
|
|
g := glob.Parse(sw.globPattern, s.desc)
|
2016-07-13 06:11:02 +03:00
|
|
|
if g.Limits[0] == "" && g.Limits[1] == "" {
|
2019-04-24 15:09:41 +03:00
|
|
|
sw.col.SearchValues(s.desc, sw, msg.Deadline,
|
2016-07-13 06:11:02 +03:00
|
|
|
func(id string, o geojson.Object, fields []float64) bool {
|
2017-01-10 19:49:48 +03:00
|
|
|
return sw.writeObject(ScanWriterParams{
|
2017-01-13 19:31:35 +03:00
|
|
|
id: id,
|
|
|
|
o: o,
|
2017-01-10 19:49:48 +03:00
|
|
|
fields: fields,
|
2017-08-11 03:32:40 +03:00
|
|
|
noLock: true,
|
2017-01-10 19:49:48 +03:00
|
|
|
})
|
2016-07-13 06:11:02 +03:00
|
|
|
},
|
|
|
|
)
|
|
|
|
} else {
|
2016-11-14 21:03:54 +03:00
|
|
|
// must disable globSingle for string value type matching because
|
|
|
|
// globSingle is only for ID matches, not values.
|
|
|
|
sw.globSingle = false
|
2018-11-02 16:09:56 +03:00
|
|
|
sw.col.SearchValuesRange(g.Limits[0], g.Limits[1], s.desc, sw,
|
2019-04-24 15:09:41 +03:00
|
|
|
msg.Deadline,
|
2016-07-13 06:11:02 +03:00
|
|
|
func(id string, o geojson.Object, fields []float64) bool {
|
2017-01-10 19:49:48 +03:00
|
|
|
return sw.writeObject(ScanWriterParams{
|
2017-01-13 19:31:35 +03:00
|
|
|
id: id,
|
|
|
|
o: o,
|
2017-01-10 19:49:48 +03:00
|
|
|
fields: fields,
|
2017-08-11 03:32:40 +03:00
|
|
|
noLock: true,
|
2017-01-10 19:49:48 +03:00
|
|
|
})
|
2016-07-13 06:11:02 +03:00
|
|
|
},
|
|
|
|
)
|
2016-07-11 07:40:18 +03:00
|
|
|
}
|
|
|
|
}
|
2016-07-13 06:11:02 +03:00
|
|
|
}
|
2017-07-24 18:26:10 +03:00
|
|
|
sw.writeFoot()
|
2018-10-29 01:49:45 +03:00
|
|
|
if msg.OutputType == JSON {
|
2021-03-31 18:13:44 +03:00
|
|
|
wr.WriteString(`,"elapsed":"` + time.Since(start).String() + "\"}")
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return resp.BytesValue(wr.Bytes()), nil
|
2016-07-11 07:40:18 +03:00
|
|
|
}
|
Lua scripting feature. (#224)
* Start on lua scripting
* Implement evalsha, script load, script exists, and script flush
* Type conversions from lua to resp/json.
Refactor to make luastate and luascripts persistent in the controller.
* Change controller.command and all underlying commands to return resp.Value.
Serialize only during the ouput.
* First stab at tile38 call from lua
* Change tile38 into tile38.call in Lua
* Property return errors from scripts
* Minor refactoring. No locking on script run
* Cleanup/refactoring
* Create a pool of 5 lua states, allow for more as needed. Refactor.
* Use safe map for scripts. Add a limit for max number of lua states. Refactor.
* Refactor
* Refactor script commands into atomic, read-only, and non-atomic classes.
Proper locking for all three classes.
Add tests for scripts
* More tests for scripts
* Properly escape newlines in lua-produced errors
* Better test for readonly failure
* Correctly convert ok/err messages between lua and resp.
Add pcall, sha1hex, error_reply, status_reply functions to tile38 namespace in lua.
* Add pcall test. Change writeErr to work with string argument
* Make sure eval/evalsha never attempt to write AOF
* Add eval-set and eval-get to benchmarks
* Fix eval benchmark tests, add more
* Improve benchmarks
* Optimizations and refactoring.
* Add lua memtest
* Typo
* Add dependency
* golint fixes
* gofmt fixes
* Add scripting commands to the core/commands.json
* Use ARGV for args inside lua
2017-10-05 18:20:40 +03:00
|
|
|
return sw.respOut, nil
|
2016-03-05 02:08:16 +03:00
|
|
|
}
|