Skip to content

Commit

Permalink
Merge #60427 #60449 #60450
Browse files Browse the repository at this point in the history 
60427: ui: upgrade deps with security vulns r=dhartunian a=dhartunian

- upgrade version of lodash
- upgrade resolution version of ua-parser
- upgrade version of analytics-node
- upgrade version of highlight.js and
  type definitions

Release note: None

60449: krb5: fix configure script r=RaduBerinde a=otan

This should read "test", not "text".

Release note: None

60450: geo/wkt: add support for parsing multipolygons with Z and M dimensions r=otan a=andyyang890

This patch extends the capabilities of the WKT parser to include
parsing of multipolygons with Z and M dimensions.

Refs: #53091

Release note: None

Co-authored-by: David Hartunian <davidh@cockroachlabs.com>
Co-authored-by: Oliver Tan <otan@cockroachlabs.com>
Co-authored-by: Andy Yang <ayang@cockroachlabs.com>
  • Loading branch information
@dhartunian @otan
4 people committed Feb 11, 2021
4 parents 673a257 + de9c308 + 6a102a7 + 6fd15ea commit 626ebfb
Show file tree
Hide file tree
Showing 8 changed files with 914 additions and 393 deletions.
2 changes: 1 addition & 1 deletion c-deps/krb5
Submodule krb5 updated 1 files
+1 −1 src/configure.in
8 changes: 8 additions & 0 deletions pkg/geo/wkt/lex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ func getKeywordToken(tokStr string) int {
return MULTILINESTRINGZ
case "MULTILINESTRINGZM":
return MULTILINESTRINGZM
case "MULTIPOLYGON":
return MULTIPOLYGON
case "MULTIPOLYGONM":
return MULTIPOLYGONM
case "MULTIPOLYGONZ":
return MULTIPOLYGONZ
case "MULTIPOLYGONZM":
return MULTIPOLYGONZM
default:
return eof
}
Expand Down
229 changes: 210 additions & 19 deletions pkg/geo/wkt/wkt.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,63 @@ func appendGeomFlatCoordsReprs(p1 geomFlatCoordsRepr, p2 geomFlatCoordsRepr) geo
return geomFlatCoordsRepr{flatCoords: append(p1.flatCoords, p2.flatCoords...), ends: append(p1.ends, p2.ends...)}
}

type multiPolygonFlatCoordsRepr struct {
flatCoords []float64
endss [][]int
}

func makeMultiPolygonFlatCoordsRepr(p geomFlatCoordsRepr) multiPolygonFlatCoordsRepr {
if p.flatCoords == nil {
return multiPolygonFlatCoordsRepr{flatCoords: nil, endss: [][]int{nil}}
}
return multiPolygonFlatCoordsRepr{flatCoords: p.flatCoords, endss: [][]int{p.ends}}
}

func appendMultiPolygonFlatCoordsRepr(
p1 multiPolygonFlatCoordsRepr, p2 multiPolygonFlatCoordsRepr,
) multiPolygonFlatCoordsRepr {
p1LastEndsLastEnd := 0
for i := len(p1.endss) - 1; i >= 0; i-- {
if len(p1.endss[i]) > 0 {
p1LastEndsLastEnd = p1.endss[i][len(p1.endss[i])-1]
break
}
}
if p1LastEndsLastEnd > 0 {
for i, _ := range p2.endss {
for j, _ := range p2.endss[i] {
p2.endss[i][j] += p1LastEndsLastEnd
}
}
}
return multiPolygonFlatCoordsRepr{
flatCoords: append(p1.flatCoords, p2.flatCoords...), endss: append(p1.endss, p2.endss...),
}
}

%}

%union {
str string
geom geom.T
coord float64
coordList []float64
flatRepr geomFlatCoordsRepr
str string
geom geom.T
coord float64
coordList []float64
flatRepr geomFlatCoordsRepr
multiPolyFlatRepr multiPolygonFlatCoordsRepr
}

%token <str> POINT POINTM POINTZ POINTZM
%token <str> LINESTRING LINESTRINGM LINESTRINGZ LINESTRINGZM
%token <str> POLYGON POLYGONM POLYGONZ POLYGONZM
%token <str> MULTIPOINT MULTIPOINTM MULTIPOINTZ MULTIPOINTZM
%token <str> MULTILINESTRING MULTILINESTRINGM MULTILINESTRINGZ MULTILINESTRINGZM
%token <str> MULTIPOLYGON MULTIPOLYGONM MULTIPOLYGONZ MULTIPOLYGONZM
%token <str> EMPTY
//%token <str> MULTIPOLYGON GEOMETRYCOLLECTION
//%token <str> GEOMETRYCOLLECTION
%token <coord> NUM

%type <geom> geometry
%type <geom> point linestring polygon multipoint multilinestring
%type <geom> point linestring polygon multipoint multilinestring multipolygon

// TODO(ayang) reorganize the list of %type statements
%type <coordList> two_coords three_coords four_coords
Expand All @@ -98,6 +134,23 @@ func appendGeomFlatCoordsReprs(p1 geomFlatCoordsRepr, p2 geomFlatCoordsRepr) geo
%type <flatRepr> two_coords_line_list_allowing_empty_lines
%type <flatRepr> three_coords_line_list_allowing_empty_lines
%type <flatRepr> four_coords_line_list_allowing_empty_lines
%type <flatRepr> two_coords_polygon three_coords_polygon four_coords_polygon empty_polygon

%type <multiPolyFlatRepr> two_coords_polygon_multi_poly_flat_repr
%type <multiPolyFlatRepr> three_coords_polygon_multi_poly_flat_repr
%type <multiPolyFlatRepr> four_coords_polygon_multi_poly_flat_repr
%type <multiPolyFlatRepr> empty_polygon_multi_poly_flat_repr

%type <multiPolyFlatRepr> three_coords_polygon_list
%type <multiPolyFlatRepr> four_coords_polygon_list

%type <multiPolyFlatRepr> two_coords_polygon_allowing_empty
%type <multiPolyFlatRepr> three_coords_polygon_allowing_empty
%type <multiPolyFlatRepr> four_coords_polygon_allowing_empty

%type <multiPolyFlatRepr> two_coords_polygon_list_allowing_empty_polygons
%type <multiPolyFlatRepr> three_coords_polygon_list_allowing_empty_polygons
%type <multiPolyFlatRepr> four_coords_polygon_list_allowing_empty_polygons

%%

Expand All @@ -113,6 +166,7 @@ geometry:
| polygon
| multipoint
| multilinestring
| multipolygon

point:
POINT two_coords_point_with_parens
Expand Down Expand Up @@ -199,29 +253,29 @@ linestring:
}

polygon:
POLYGON '(' two_coords_ring_list ')'
POLYGON two_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XY, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XY, $2.flatCoords, $2.ends)
}
| POLYGON '(' three_coords_ring_list ')'
| POLYGON three_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XYZ, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XYZ, $2.flatCoords, $2.ends)
}
| POLYGON '(' four_coords_ring_list ')'
| POLYGON four_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XYZM, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XYZM, $2.flatCoords, $2.ends)
}
| POLYGONM '(' three_coords_ring_list ')'
| POLYGONM three_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XYM, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XYM, $2.flatCoords, $2.ends)
}
| POLYGONZ '(' three_coords_ring_list ')'
| POLYGONZ three_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XYZ, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XYZ, $2.flatCoords, $2.ends)
}
| POLYGONZM '(' four_coords_ring_list ')'
| POLYGONZM four_coords_polygon
{
$$ = geom.NewPolygonFlat(geom.XYZM, $3.flatCoords, $3.ends)
$$ = geom.NewPolygonFlat(geom.XYZM, $2.flatCoords, $2.ends)
}
| POLYGON EMPTY
{
Expand Down Expand Up @@ -324,6 +378,143 @@ multilinestring:
$$ = geom.NewMultiLineString(geom.XYZM)
}

multipolygon:
MULTIPOLYGON '(' two_coords_polygon_list_allowing_empty_polygons ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XY, $3.flatCoords, $3.endss)
}
| MULTIPOLYGON '(' three_coords_polygon_list ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XYZ, $3.flatCoords, $3.endss)
}
| MULTIPOLYGON '(' four_coords_polygon_list ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XYZM, $3.flatCoords, $3.endss)
}
| MULTIPOLYGONM '(' three_coords_polygon_list_allowing_empty_polygons ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XYM, $3.flatCoords, $3.endss)
}
| MULTIPOLYGONZ '(' three_coords_polygon_list_allowing_empty_polygons ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XYZ, $3.flatCoords, $3.endss)
}
| MULTIPOLYGONZM '(' four_coords_polygon_list_allowing_empty_polygons ')'
{
$$ = geom.NewMultiPolygonFlat(geom.XYZM, $3.flatCoords, $3.endss)
}
| MULTIPOLYGON EMPTY
{
$$ = geom.NewMultiPolygon(geom.XY)
}
| MULTIPOLYGONM EMPTY
{
$$ = geom.NewMultiPolygon(geom.XYM)
}
| MULTIPOLYGONZ EMPTY
{
$$ = geom.NewMultiPolygon(geom.XYZ)
}
| MULTIPOLYGONZM EMPTY
{
$$ = geom.NewMultiPolygon(geom.XYZM)
}

three_coords_polygon_list:
three_coords_polygon_list ',' three_coords_polygon_multi_poly_flat_repr
{
$$ = appendMultiPolygonFlatCoordsRepr($1, $3)
}
| three_coords_polygon_multi_poly_flat_repr

four_coords_polygon_list:
four_coords_polygon_list ',' four_coords_polygon_multi_poly_flat_repr
{
$$ = appendMultiPolygonFlatCoordsRepr($1, $3)
}
| four_coords_polygon_multi_poly_flat_repr

two_coords_polygon_list_allowing_empty_polygons:
two_coords_polygon_list_allowing_empty_polygons ',' two_coords_polygon_allowing_empty
{
$$ = appendMultiPolygonFlatCoordsRepr($1, $3)
}
| two_coords_polygon_allowing_empty

three_coords_polygon_list_allowing_empty_polygons:
three_coords_polygon_list_allowing_empty_polygons ',' three_coords_polygon_allowing_empty
{
$$ = appendMultiPolygonFlatCoordsRepr($1, $3)
}
| three_coords_polygon_allowing_empty

four_coords_polygon_list_allowing_empty_polygons:
four_coords_polygon_list_allowing_empty_polygons ',' four_coords_polygon_allowing_empty
{
$$ = appendMultiPolygonFlatCoordsRepr($1, $3)
}
| four_coords_polygon_allowing_empty

two_coords_polygon_allowing_empty:
two_coords_polygon_multi_poly_flat_repr
| empty_polygon_multi_poly_flat_repr

three_coords_polygon_allowing_empty:
three_coords_polygon_multi_poly_flat_repr
| empty_polygon_multi_poly_flat_repr

four_coords_polygon_allowing_empty:
four_coords_polygon_multi_poly_flat_repr
| empty_polygon_multi_poly_flat_repr

two_coords_polygon_multi_poly_flat_repr:
two_coords_polygon
{
$$ = makeMultiPolygonFlatCoordsRepr($1)
}

three_coords_polygon_multi_poly_flat_repr:
three_coords_polygon
{
$$ = makeMultiPolygonFlatCoordsRepr($1)
}

four_coords_polygon_multi_poly_flat_repr:
four_coords_polygon
{
$$ = makeMultiPolygonFlatCoordsRepr($1)
}

empty_polygon_multi_poly_flat_repr:
empty_polygon
{
$$ = makeMultiPolygonFlatCoordsRepr($1)
}

two_coords_polygon:
'(' two_coords_ring_list ')'
{
$$ = $2
}

three_coords_polygon:
'(' three_coords_ring_list ')'
{
$$ = $2
}

four_coords_polygon:
'(' four_coords_ring_list ')'
{
$$ = $2
}

empty_polygon:
EMPTY
{
$$ = makeGeomFlatCoordsRepr(nil)
}

two_coords_ring_list:
two_coords_ring_list ',' two_coords_ring
{
Expand Down
Loading

0 comments on commit 626ebfb

Please sign in to comment.