From 4aa769074a448d370aaed007a882252ddaa7b337 Mon Sep 17 00:00:00 2001 From: tasty-gumi <1021989072@qq.com> Date: Fri, 5 Jul 2024 15:51:06 +0800 Subject: [PATCH] initial code for geo add geospatial interface in src common change type define and add segcore support add storage & chunkdata support feature: go package storage & proxy & typeutil support geospatial type in internal and typeutil in pkg Signed-off-by: tasty-gumi <1021989072@qq.com> add geospatial interface in src common change type define and add segcore support change: use wkb only in core Signed-off-by: tasty-gumi <1021989072@qq.com> fix:the geospatial only use std::string as FieldDataImpl template paramters && add geospatial data generation && pass chunk ,growing , sealed test fix : merge confilcts after rebase ,test nullable not pass due to upstream feat:basic GIS Function expr and visitor impl and GIS proto support && add:storage test of geo data Signed-off-by: tasty-gumi <1021989072@qq.com> feat:add proxy validate (pass httpserver test) && plan parser of geospatialfunction fix:sealedseg && go tidy fix:go mod feat:can produce wkt result for pymilvus client feat: add parser and query operator for geos filed && print geos binlog as wkt fix:fielddataimpl interface Signed-off-by: tasty-gumi <1021989072@qq.com> fix: some format of code && segmentfault debug for rebase Signed-off-by: tasty-gumi <1021989072@qq.com> add: import util test for parquet and mix compaction test Signed-off-by: tasty-gumi <1021989072@qq.com> fix: delete useless file and fix error for rebase Signed-off-by: tasty-gumi <1021989072@qq.com> fix: git rebase for custom function feat Signed-off-by: tasty-gumi <1021989072@qq.com> fix:rename geospatial field && update proto && rewrite Geometry class with smart pointer Signed-off-by: tasty-gumi <1021989072@qq.com> add:last commit miss add files Signed-off-by: tasty-gumi <1021989072@qq.com> fix: geospatial name replace in test files && fix geomertry and parser fix:remove some file change for dev Signed-off-by: tasty-gumi <1021989072@qq.com> fix:remove size in if && add destory in ~Geometry() Signed-off-by: tasty-gumi <1021989072@qq.com> add:conan file gdal rep Signed-off-by: tasty-gumi <1021989072@qq.com> remove:gdal fPIC Signed-off-by: tasty-gumi <1021989072@qq.com> fix: for rebase Signed-off-by: tasty-gumi <1021989072@qq.com> remove:log_warn Signed-off-by: tasty-gumi <1021989072@qq.com> remove:gdal shared Signed-off-by: tasty-gumi <1021989072@qq.com> remove:tbbproxy Signed-off-by: tasty-gumi <1021989072@qq.com> fix:add gdal option && update go mod Signed-off-by: tasty-gumi <1021989072@qq.com> dev:change some scripts Signed-off-by: tasty-gumi <1021989072@qq.com> remove: dev scripts Signed-off-by: tasty-gumi <1021989072@qq.com> add:conan files dependency of gdal Signed-off-by: tasty-gumi <1021989072@qq.com> fix:fmt cpp code Signed-off-by: tasty-gumi <1021989072@qq.com> add:delete geos-config in cmake_bulid/bin which may cause permission deny Signed-off-by: tasty-gumi <1021989072@qq.com> fix: add go client geometry interface && fix group by test Signed-off-by: tasty-gumi <1021989072@qq.com> fix: mod tidy for tests go client Signed-off-by: tasty-gumi <1021989072@qq.com> fix:memory leak in test and go fmt Signed-off-by: tasty-gumi <1021989072@qq.com> fix: datagen function remove pkoffset Signed-off-by: tasty-gumi <1021989072@qq.com> fix: go-client test add entity.geometry Signed-off-by: tasty-gumi <1021989072@qq.com> fix: fix test args and add some annotations Signed-off-by: tasty-gumi <1021989072@qq.com> fix:name and remove wkt marshl MaxDecimalDigits limit Signed-off-by: tasty-gumi <1021989072@qq.com> fix:misspell Signed-off-by: tasty-gumi <1021989072@qq.com> fix:go client test Signed-off-by: tasty-gumi <1021989072@qq.com> fix:listA size Signed-off-by: tasty-gumi <1021989072@qq.com> add:field data in schema_test Signed-off-by: tasty-gumi <1021989072@qq.com> test:add mergefield data Signed-off-by: tasty-gumi <1021989072@qq.com> fix:test err code modify Signed-off-by: tasty-gumi <1021989072@qq.com> --- client/column/columns.go | 12 + client/column/geometry.go | 118 ++ client/column/geometry_test.go | 82 ++ client/entity/field_type.go | 8 + client/go.mod | 2 +- client/go.sum | 4 +- client/milvusclient/client_suite_test.go | 16 + client/row/data.go | 4 + go.mod | 38 +- go.sum | 84 +- internal/core/conanfile.py | 15 +- internal/core/src/common/Array.h | 24 +- internal/core/src/common/FieldData.cpp | 20 + internal/core/src/common/FieldData.h | 11 + internal/core/src/common/FieldDataInterface.h | 62 + internal/core/src/common/Geometry.h | 174 +++ internal/core/src/common/Types.h | 30 +- internal/core/src/common/VectorTrait.h | 8 +- internal/core/src/exec/expression/Expr.cpp | 13 + .../exec/expression/GISFunctionFilterExpr.cpp | 108 ++ .../exec/expression/GISFunctionFilterExpr.h | 56 + internal/core/src/expr/ITypeExpr.h | 24 + internal/core/src/mmap/Utils.h | 22 + internal/core/src/query/PlanProto.cpp | 25 + internal/core/src/query/PlanProto.h | 4 + .../core/src/segcore/ConcurrentVector.cpp | 11 + internal/core/src/segcore/InsertRecord.h | 4 + .../core/src/segcore/SegmentGrowingImpl.cpp | 10 + .../core/src/segcore/SegmentSealedImpl.cpp | 35 + internal/core/src/segcore/Utils.cpp | 31 + internal/core/src/storage/Event.cpp | 12 + internal/core/src/storage/Util.cpp | 9 +- internal/core/unittest/test_c_api.cpp | 2 +- internal/core/unittest/test_chunk_vector.cpp | 5 + internal/core/unittest/test_data_codec.cpp | 49 + internal/core/unittest/test_group_by.cpp | 5 +- internal/core/unittest/test_growing.cpp | 5 + internal/core/unittest/test_sealed.cpp | 9 + internal/core/unittest/test_utils/DataGen.h | 130 +- .../distributed/proxy/httpserver/utils.go | 41 + .../proxy/httpserver/utils_test.go | 36 +- internal/parser/planparserv2/Plan.g4 | 15 + .../parser/planparserv2/generated/Plan.interp | 16 +- .../parser/planparserv2/generated/Plan.tokens | 27 +- .../planparserv2/generated/PlanLexer.interp | 23 +- .../planparserv2/generated/PlanLexer.tokens | 27 +- .../generated/plan_base_visitor.go | 28 + .../planparserv2/generated/plan_lexer.go | 772 ++++++------ .../planparserv2/generated/plan_parser.go | 1066 ++++++++++++++--- .../planparserv2/generated/plan_visitor.go | 21 + .../parser/planparserv2/parser_visitor.go | 215 ++++ internal/parser/planparserv2/utils.go | 5 + internal/proto/plan.proto | 17 + internal/proxy/task_index.go | 2 +- internal/proxy/task_insert_test.go | 3 + internal/proxy/task_query.go | 1 + internal/proxy/task_search.go | 1 + internal/proxy/task_test.go | 15 + internal/proxy/validate_util.go | 98 ++ internal/storage/data_codec.go | 21 + internal/storage/data_sorter.go | 3 + internal/storage/insert_data.go | 88 ++ internal/storage/payload.go | 2 + internal/storage/payload_reader.go | 22 + internal/storage/payload_writer.go | 44 + internal/storage/print_binlog.go | 20 + internal/storage/print_binlog_test.go | 21 + internal/storage/serde.go | 1 + internal/storage/utils.go | 22 + internal/storage/utils_test.go | 25 +- .../util/importutilv2/parquet/field_reader.go | 42 + .../util/importutilv2/parquet/reader_test.go | 2 + internal/util/importutilv2/parquet/util.go | 2 + .../indexparamcheck/inverted_checker_test.go | 1 + internal/util/testutil/test_util.go | 11 + internal/util/typeutil/schema.go | 5 + internal/util/typeutil/storage.go | 2 + pkg/go.mod | 22 +- pkg/go.sum | 64 +- pkg/util/funcutil/func.go | 4 + pkg/util/testutils/gen_data.go | 105 ++ pkg/util/typeutil/gen_empty_field_data.go | 16 + pkg/util/typeutil/schema.go | 50 +- pkg/util/typeutil/schema_test.go | 78 +- scripts/3rdparty_build.sh | 4 + tests/go_client/common/consts.go | 1 + tests/go_client/common/response_checker.go | 14 + tests/go_client/go.mod | 26 +- tests/go_client/go.sum | 67 +- .../go_client/testcases/helper/data_helper.go | 22 + .../testcases/helper/field_helper.go | 2 + tests/go_client/testcases/helper/helper.go | 3 + .../testcases/helper/index_helper.go | 2 +- tests/go_client/testcases/index_test.go | 4 +- .../compaction/mix_compaction_test.go | 6 +- tests/integration/import/import_test.go | 26 +- tests/integration/util_insert.go | 5 + tests/integration/util_schema.go | 57 +- tests/python_client/testcases/test_index.py | 2 +- 99 files changed, 3881 insertions(+), 743 deletions(-) create mode 100644 client/column/geometry.go create mode 100644 client/column/geometry_test.go create mode 100644 internal/core/src/common/Geometry.h create mode 100644 internal/core/src/exec/expression/GISFunctionFilterExpr.cpp create mode 100644 internal/core/src/exec/expression/GISFunctionFilterExpr.h diff --git a/client/column/columns.go b/client/column/columns.go index 905cc8c2d9ca1..3a247a9dd0933 100644 --- a/client/column/columns.go +++ b/client/column/columns.go @@ -228,6 +228,16 @@ func FieldDataColumn(fd *schemapb.FieldData, begin, end int) (Column, error) { } return NewColumnJSONBytes(fd.GetFieldName(), data.JsonData.GetData()[begin:end]).WithIsDynamic(isDynamic), nil + case schemapb.DataType_Geometry: + data, ok := fd.GetScalars().GetData().(*schemapb.ScalarField_GeometryData) + if !ok { + return nil, errFieldDataTypeNotMatch + } + if end < 0 { + return NewColumnGeometryBytes(fd.GetFieldName(), data.GeometryData.GetData()[begin:]), nil + } + return NewColumnGeometryBytes(fd.GetFieldName(), data.GeometryData.GetData()[begin:end]), nil + case schemapb.DataType_FloatVector: vectors := fd.GetVectors() x, ok := vectors.GetData().(*schemapb.VectorField_FloatVector) @@ -524,6 +534,8 @@ func DefaultValueColumn(name string, dataType entity.FieldType) (Column, error) return NewColumnVarChar(name, nil), nil case entity.FieldTypeJSON: return NewColumnJSONBytes(name, nil), nil + case entity.FieldTypeGeometry: + return NewColumnGeometryBytes(name, nil), nil default: return nil, fmt.Errorf("default value unsupported data type %s", dataType) diff --git a/client/column/geometry.go b/client/column/geometry.go new file mode 100644 index 0000000000000..564501b959c22 --- /dev/null +++ b/client/column/geometry.go @@ -0,0 +1,118 @@ +package column + +import ( + "fmt" + + "github.com/cockroachdb/errors" + + "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" + "github.com/milvus-io/milvus/client/v2/entity" +) + +type ColumnGeometryBytes struct { + ColumnBase + name string + values [][]byte +} + +// Name returns column name. +func (c *ColumnGeometryBytes) Name() string { + return c.name +} + +// Type returns column entity.FieldType. +func (c *ColumnGeometryBytes) Type() entity.FieldType { + return entity.FieldTypeGeometry +} + +// Len returns column values length. +func (c *ColumnGeometryBytes) Len() int { + return len(c.values) +} + +func (c *ColumnGeometryBytes) Slice(start, end int) Column { + l := c.Len() + if start > l { + start = l + } + if end == -1 || end > l { + end = l + } + return &ColumnGeometryBytes{ + ColumnBase: c.ColumnBase, + name: c.name, + values: c.values[start:end], + } +} + +// Get returns value at index as interface{}. +func (c *ColumnGeometryBytes) Get(idx int) (interface{}, error) { + if idx < 0 || idx > c.Len() { + return nil, errors.New("index out of range") + } + return c.values[idx], nil +} + +func (c *ColumnGeometryBytes) GetAsString(idx int) (string, error) { + bs, err := c.ValueByIdx(idx) + if err != nil { + return "", err + } + return string(bs), nil +} + +// FieldData return column data mapped to schemapb.FieldData. +func (c *ColumnGeometryBytes) FieldData() *schemapb.FieldData { + fd := &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: c.name, + } + + fd.Field = &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: c.values, + }, + }, + }, + } + + return fd +} + +// ValueByIdx returns value of the provided index. +func (c *ColumnGeometryBytes) ValueByIdx(idx int) ([]byte, error) { + if idx < 0 || idx >= c.Len() { + return nil, errors.New("index out of range") + } + return c.values[idx], nil +} + +// AppendValue append value into column. +func (c *ColumnGeometryBytes) AppendValue(i interface{}) error { + var v []byte + switch raw := i.(type) { + case []byte: + v = raw + case string: + v = []byte(raw) + default: + return fmt.Errorf("expect geometry compatible type([]byte, struct, map), got %T", i) + } + c.values = append(c.values, v) + + return nil +} + +// Data returns column data. +func (c *ColumnGeometryBytes) Data() [][]byte { + return c.values +} + +func NewColumnGeometryBytes(name string, values [][]byte) *ColumnGeometryBytes { + return &ColumnGeometryBytes{ + name: name, + values: values, + } +} diff --git a/client/column/geometry_test.go b/client/column/geometry_test.go new file mode 100644 index 0000000000000..cea570338ef93 --- /dev/null +++ b/client/column/geometry_test.go @@ -0,0 +1,82 @@ +package column + +import ( + "fmt" + "math/rand" + "testing" + "time" + + "github.com/stretchr/testify/suite" + + "github.com/milvus-io/milvus/client/v2/entity" +) + +type ColumnGeometryBytesSuite struct { + suite.Suite +} + +func (s *ColumnGeometryBytesSuite) SetupSuite() { + rand.Seed(time.Now().UnixNano()) +} + +func (s *ColumnGeometryBytesSuite) TestAttrMethods() { + columnName := fmt.Sprintf("column_Geometrybs_%d", rand.Int()) + columnLen := 8 + rand.Intn(10) + + v := make([][]byte, columnLen) + column := NewColumnGeometryBytes(columnName, v) + + s.Run("test_meta", func() { + ft := entity.FieldTypeGeometry + s.Equal("Geometry", ft.Name()) + s.Equal("Geometry", ft.String()) + pbName, pbType := ft.PbFieldType() + s.Equal("Geometry", pbName) + s.Equal("Geometry", pbType) + }) + + s.Run("test_column_attribute", func() { + s.Equal(columnName, column.Name()) + s.Equal(entity.FieldTypeGeometry, column.Type()) + s.Equal(columnLen, column.Len()) + s.EqualValues(v, column.Data()) + }) + + s.Run("test_column_field_data", func() { + fd := column.FieldData() + s.NotNil(fd) + s.Equal(fd.GetFieldName(), columnName) + }) + + s.Run("test_column_valuer_by_idx", func() { + _, err := column.ValueByIdx(-1) + s.Error(err) + _, err = column.ValueByIdx(columnLen) + s.Error(err) + for i := 0; i < columnLen; i++ { + v, err := column.ValueByIdx(i) + s.NoError(err) + s.Equal(column.values[i], v) + } + }) + + s.Run("test_append_value", func() { + item := make([]byte, 10) + err := column.AppendValue(item) + s.NoError(err) + s.Equal(columnLen+1, column.Len()) + val, err := column.ValueByIdx(columnLen) + s.NoError(err) + s.Equal(item, val) + + err = column.AppendValue("POINT (30.123 -10.456)") + s.NoError(err) + + err = column.AppendValue(1) + s.Error(err) + }) +} + +func TestColumnGeometryBytes(t *testing.T) { + suite.Run(t, new(ColumnGeometryBytesSuite)) +} diff --git a/client/entity/field_type.go b/client/entity/field_type.go index 9c96aa20ae015..eee696215adc1 100644 --- a/client/entity/field_type.go +++ b/client/entity/field_type.go @@ -45,6 +45,8 @@ func (t FieldType) Name() string { return "Array" case FieldTypeJSON: return "JSON" + case FieldTypeGeometry: + return "Geometry" case FieldTypeBinaryVector: return "BinaryVector" case FieldTypeFloatVector: @@ -83,6 +85,8 @@ func (t FieldType) String() string { return "Array" case FieldTypeJSON: return "JSON" + case FieldTypeGeometry: + return "Geometry" case FieldTypeBinaryVector: return "[]byte" case FieldTypeFloatVector: @@ -119,6 +123,8 @@ func (t FieldType) PbFieldType() (string, string) { return "VarChar", "string" case FieldTypeJSON: return "JSON", "JSON" + case FieldTypeGeometry: + return "Geometry", "Geometry" case FieldTypeBinaryVector: return "[]byte", "" case FieldTypeFloatVector: @@ -158,6 +164,8 @@ const ( FieldTypeArray FieldType = 22 // FieldTypeJSON field type JSON FieldTypeJSON FieldType = 23 + // FieldTypeGeometry field type Geometry + FieldTypeGeometry FieldType = 24 // FieldTypeBinaryVector field type binary vector FieldTypeBinaryVector FieldType = 100 // FieldTypeFloatVector field type float vector diff --git a/client/go.mod b/client/go.mod index ec82b9088887e..76df60032c1d6 100644 --- a/client/go.mod +++ b/client/go.mod @@ -6,7 +6,7 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/cockroachdb/errors v1.9.1 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 - github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454 + github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7 github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6 github.com/quasilyte/go-ruleguard/dsl v0.3.22 github.com/samber/lo v1.27.0 diff --git a/client/go.sum b/client/go.sum index 8e98106412057..343504df376eb 100644 --- a/client/go.sum +++ b/client/go.sum @@ -390,8 +390,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454 h1:JmZCYjMPpiE4ksZw0AUxXWkDY7wwA4fhS+SO1N211Vw= -github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454/go.mod h1:/6UT4zZl6awVeXLeE7UGDWZvXj3IWkRsh3mqsn0DiAs= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7 h1:u02klF3sJg/AaPJ8rzzuG4io4sRjf87fd1sInf93/9A= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7/go.mod h1:/6UT4zZl6awVeXLeE7UGDWZvXj3IWkRsh3mqsn0DiAs= github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6 h1:dotu470D/DkctdLHsTCCmuvAD3h5C8gkFhMxb0Zlu7A= github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6/go.mod h1:tdeEcpeaAcrIJgrr6LVzu7SYl9zn18dNKZwPmCUb0Io= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= diff --git a/client/milvusclient/client_suite_test.go b/client/milvusclient/client_suite_test.go index 6c452575f87b6..92a01b276cc73 100644 --- a/client/milvusclient/client_suite_test.go +++ b/client/milvusclient/client_suite_test.go @@ -212,6 +212,22 @@ func (s *MockSuiteBase) getJSONBytesFieldData(name string, data [][]byte, isDyna } } +func (s *MockSuiteBase) getGeometryBytesFieldData(name string, data [][]byte) *schemapb.FieldData { + return &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: name, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: data, + }, + }, + }, + }, + } +} + func (s *MockSuiteBase) getFloatVectorFieldData(name string, dim int64, data []float32) *schemapb.FieldData { return &schemapb.FieldData{ Type: schemapb.DataType_FloatVector, diff --git a/client/row/data.go b/client/row/data.go index 448509be911e4..e65e9dd6f4090 100644 --- a/client/row/data.go +++ b/client/row/data.go @@ -125,6 +125,10 @@ func AnyToColumns(rows []interface{}, schemas ...*entity.Schema) ([]column.Colum data := make([][]byte, 0, rowsLen) col := column.NewColumnJSONBytes(field.Name, data) nameColumns[field.Name] = col + case entity.FieldTypeGeometry: + data := make([][]byte, 0, rowsLen) + col := column.NewColumnGeometryBytes(field.Name, data) + nameColumns[field.Name] = col case entity.FieldTypeArray: col := NewArrayColumn(field) if col == nil { diff --git a/go.mod b/go.mod index 7db5c5cf0dc1d..8cefcb6a2c04f 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,11 @@ toolchain go1.22.0 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0 github.com/aliyun/credentials-go v1.2.7 github.com/apache/arrow/go/v12 v12.0.1 + github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 // indirect github.com/bits-and-blooms/bloom/v3 v3.0.1 github.com/blang/semver/v4 v4.0.0 github.com/casbin/casbin/v2 v2.44.2 @@ -36,6 +37,7 @@ require ( github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.8.1 github.com/stretchr/testify v1.9.0 + github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.865 github.com/tikv/client-go/v2 v2.0.4 go.etcd.io/etcd/api/v3 v3.5.5 @@ -61,7 +63,7 @@ require ( github.com/antlr4-go/antlr/v4 v4.13.1 github.com/bits-and-blooms/bitset v1.10.0 github.com/bytedance/sonic v1.12.2 - github.com/cenkalti/backoff/v4 v4.2.1 + github.com/cenkalti/backoff/v4 v4.3.0 github.com/cockroachdb/redact v1.1.3 github.com/goccy/go-json v0.10.3 github.com/greatroar/blobloom v0.0.0-00010101000000-000000000000 @@ -71,6 +73,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/remeh/sizedwaitgroup v1.0.0 github.com/tidwall/gjson v1.17.1 + github.com/twpayne/go-geom v1.5.7 github.com/valyala/fastjson v1.6.4 github.com/zeebo/xxh3 v1.0.2 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 @@ -96,7 +99,6 @@ require ( github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect github.com/alibabacloud-go/tea v1.1.8 // indirect github.com/andybalholm/brotli v1.0.4 // indirect - github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 // indirect github.com/apache/thrift v0.18.1 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect @@ -116,7 +118,7 @@ require ( github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/expr-lang/expr v1.15.7 // indirect @@ -129,7 +131,7 @@ require ( github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect @@ -148,7 +150,7 @@ require ( github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -163,8 +165,8 @@ require ( github.com/kylelemons/godebug v1.1.0 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/linkedin/goavro/v2 v2.11.1 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.11 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -195,13 +197,14 @@ require ( github.com/pingcap/kvproto v0.0.0-20221129023506-621ec37aac7a // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rs/xid v1.5.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/shirou/gopsutil/v3 v3.22.9 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.6.0 // indirect @@ -211,13 +214,12 @@ require ( github.com/streamnative/pulsarctl v0.5.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.2.0 // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.13 // indirect + github.com/tklauser/numcpus v0.7.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/twmb/murmur3 v1.1.3 // indirect @@ -225,7 +227,7 @@ require ( github.com/ugorji/go/codec v1.2.11 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/client/v2 v2.305.5 // indirect @@ -234,13 +236,13 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.13.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.0.0 // indirect + go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/automaxprocs v1.5.3 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/mod v0.17.0 // indirect @@ -251,7 +253,7 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gonum.org/v1/gonum v0.11.0 // indirect google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 9d2a841976107..b6df27fe4a170 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 h1:U2rTu3Ef+7w9FHKIAXM6ZyqF3UOWJZ12zIm8zECAFfg= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo= github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8= @@ -77,6 +77,8 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= @@ -93,6 +95,10 @@ github.com/actgardner/gogen-avro/v10 v10.2.1/go.mod h1:QUhjeHPchheYmMDni/Nx7VB0R github.com/actgardner/gogen-avro/v9 v9.1.0/go.mod h1:nyTj6wPqDJoxM3qdnjcLv+EnMDSDFqE0qDpva2QRmKc= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= +github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= +github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -151,8 +157,8 @@ github.com/casbin/casbin/v2 v2.44.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRt github.com/casbin/json-adapter/v2 v2.0.0 h1:nOCN3TK1CJKSNQQ/MnakbU9/cUcNR3N0AxBDnEBLSDI= github.com/casbin/json-adapter/v2 v2.0.0/go.mod h1:LvsfPXXr8CD0ZFucAxawcY9Xb0FtLk3mozJ1qcSTUD4= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= @@ -224,8 +230,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -309,8 +315,9 @@ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -348,8 +355,6 @@ github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17w github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= -github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -463,8 +468,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/hamba/avro v1.5.6/go.mod h1:3vNT0RLXXpFm2Tb/5KC71ZRJlOroggq1Rcitb6k4Fr8= @@ -496,6 +501,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/heetch/avro v0.3.1/go.mod h1:4xn38Oz/+hiEUTpbVfGVLfvOg0yKLlRP7Q9+gJJILgA= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= @@ -590,12 +597,14 @@ github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF github.com/linkedin/goavro/v2 v2.10.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= github.com/linkedin/goavro/v2 v2.11.1 h1:4cuAtbDfqkKnBXp9E+tRkIJGa6W6iAjwonwt8O1f4U0= github.com/linkedin/goavro/v2 v2.11.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a h1:3Bm7EwfUQUvhNeKIkUct/gl9eod1TcXuj8stxvi/GoI= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -737,8 +746,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -804,8 +814,12 @@ github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtm github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA= -github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -863,6 +877,7 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -883,10 +898,12 @@ github.com/tikv/client-go/v2 v2.0.4 h1:cPtMXTExqjzk8L40qhrgB/mXiBXKP5LRU0vwjtI2X github.com/tikv/client-go/v2 v2.0.4/go.mod h1:v52O5zDtv2BBus4lm5yrSQhxGW4Z4RaXWfg0U1Kuyqo= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= +github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= +github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -894,6 +911,8 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA= github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= +github.com/twpayne/go-geom v1.5.7 h1:7fdceDUr03/MP7rAKOaTV6x9njMiQdxB/D0PDzMTCDc= +github.com/twpayne/go-geom v1.5.7/go.mod h1:y4fTAQtLedXW8eG2Yo4tYrIGN1yIwwKkmA+K3iSHKBA= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -929,8 +948,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= @@ -975,11 +994,11 @@ go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIj go.opentelemetry.io/otel/exporters/jaeger v1.13.0 h1:VAMoGujbVV8Q0JNM/cEbhzUIWWBxnEqH45HP9iBKN04= go.opentelemetry.io/otel/exporters/jaeger v1.13.0/go.mod h1:fHwbmle6mBFJA1p2ZIhilvffCdq/dM5UTIiCOmEjS+w= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0 h1:CsBiKCiQPdSjS+MlRiqeTI9JDDpSuk0Hb6QTRfwer8k= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0/go.mod h1:CMJYNAfooOwSZSAmAeMUV1M+TXld3BiK++z9fqIm2xk= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.20.0 h1:4s9HxB4azeeQkhY0GE5wZlMj4/pz8tE5gx2OQpGUw58= @@ -994,8 +1013,8 @@ go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+ go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1234,13 +1253,14 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1424,8 +1444,8 @@ google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+n google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d h1:PksQg4dV6Sem3/HkBX+Ltq8T0ke0PKIRBNBatoDTVls= google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M= -google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc= -google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index 9978fe53f0c32..a04bac59c2d08 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -8,8 +8,8 @@ class MilvusConan(ConanFile): "rocksdb/6.29.5@milvus/dev#b1842a53ddff60240c5282a3da498ba1", "boost/1.82.0#744a17160ebb5838e9115eab4d6d0c06", "onetbb/2021.9.0#4a223ff1b4025d02f31b65aedf5e7f4a", - "nlohmann_json/3.11.2#ffb9e9236619f1c883e36662f944345d", - "zstd/1.5.4#308b8b048f9a3823ce248f9c150cc889", + "nlohmann_json/3.11.3#ffb9e9236619f1c883e36662f944345d", + "zstd/1.5.5#34e9debe03bf0964834a09dfbc31a5dd", "lz4/1.9.4#c5afb86edd69ac0df30e3a9e192e43db", "snappy/1.1.9#0519333fef284acd04806243de7d3070", "lzo/2.10#9517fc1bcc4d4cc229a79806003a1baa", @@ -44,7 +44,14 @@ class MilvusConan(ConanFile): "abseil/20230125.3#dad7cc4c83bbd44c1f1cc9cc4d97ac88", "roaring/3.0.0#25a703f80eda0764a31ef939229e202d", "grpc/1.50.1@milvus/dev#75103960d1cac300cf425ccfccceac08", - "rapidjson/cci.20230929#624c0094d741e6a3749d2e44d834b96c" + "rapidjson/cci.20230929#624c0094d741e6a3749d2e44d834b96c", + "json-c/0.17#aaea4a8164c63860731ea7ce4fa206f2", + "sqlite3/3.44.2#497f5b5414e48e35a717dd3035947819", + "proj/9.3.1#38e8bacd0f98467d38e20f46a085b4b3", + "libtiff/4.6.0#32ca1d04c9f024637d49c0c2882cfdbe", + "libgeotiff/1.7.1#0375633ef1116fc067b3773be7fd902f", + "geos/3.12.0#b76c27884c1fa4ee8c9e486337b7dc4e", + "gdal/3.5.3#61a42c933d3440a449cac89fd0866621" ) generators = ("cmake", "cmake_find_package") default_options = { @@ -78,6 +85,8 @@ class MilvusConan(ConanFile): "fmt:header_only": True, "onetbb:tbbmalloc": False, "onetbb:tbbproxy": False, + "gdal:shared": True, + "gdal:fPIC": True, } def configure(self): diff --git a/internal/core/src/common/Array.h b/internal/core/src/common/Array.h index 705258c876c94..a0d3a3ba61d5d 100644 --- a/internal/core/src/common/Array.h +++ b/internal/core/src/common/Array.h @@ -218,7 +218,9 @@ class Array { return true; } case DataType::STRING: - case DataType::VARCHAR: { + case DataType::VARCHAR: + //treat Geometry as wkb string + case DataType::GEOMETRY: { for (int i = 0; i < length_; ++i) { if (get_data(i) != arr.get_data(i)) { @@ -331,6 +333,13 @@ class Array { } break; } + case DataType::GEOMETRY: { + for (int j = 0; j < length_; ++j) { + auto element = get_data(j); + data_array.mutable_geometry_data()->add_data(element); + } + break; + } default: { // empty array } @@ -418,7 +427,8 @@ class Array { return true; } case DataType::VARCHAR: - case DataType::STRING: { + case DataType::STRING: + case DataType::GEOMETRY: { for (int i = 0; i < length_; i++) { auto val = get_data(i); if (val != arr2.array(i).string_val()) { @@ -554,6 +564,13 @@ class ArrayView { } break; } + case DataType::GEOMETRY: { + for (int j = 0; j < length_; ++j) { + auto element = get_data(j); + data_array.mutable_geometry_data()->add_data(element); + } + break; + } default: { // empty array } @@ -643,7 +660,8 @@ class ArrayView { return true; } case DataType::VARCHAR: - case DataType::STRING: { + case DataType::STRING: + case DataType::GEOMETRY: { for (int i = 0; i < length_; i++) { auto val = get_data(i); if (val != arr2.array(i).string_val()) { diff --git a/internal/core/src/common/FieldData.cpp b/internal/core/src/common/FieldData.cpp index 69015dd2743c0..27ec60c68e807 100644 --- a/internal/core/src/common/FieldData.cpp +++ b/internal/core/src/common/FieldData.cpp @@ -212,6 +212,22 @@ FieldDataImpl::FillFieldData( } return FillFieldData(values.data(), element_count); } + case DataType::GEOMETRY: { + auto array_info = + GetDataInfoFromArray(array); + auto geometry_array = + std::dynamic_pointer_cast(array); + std::vector values(element_count); + for (size_t index = 0; index < element_count; ++index) { + values[index] = geometry_array->GetString(index); + } + if (nullable_) { + return FillFieldData( + values.data(), array->null_bitmap_data(), element_count); + } + return FillFieldData(values.data(), array_info.second); + } case DataType::ARRAY: { auto array_array = std::dynamic_pointer_cast(array); @@ -277,6 +293,7 @@ template class FieldDataImpl; template class FieldDataImpl; template class FieldDataImpl; template class FieldDataImpl; +template class FieldDataImpl; template class FieldDataImpl; // vector data @@ -314,6 +331,9 @@ InitScalarFieldData(const DataType& type, bool nullable, int64_t cap_rows) { type, nullable, cap_rows); case DataType::JSON: return std::make_shared>(type, nullable, cap_rows); + case DataType::GEOMETRY: + return std::make_shared>( + type, nullable, cap_rows); default: PanicInfo(DataTypeInvalid, "InitScalarFieldData not support data type " + diff --git a/internal/core/src/common/FieldData.h b/internal/core/src/common/FieldData.h index 334a46190f02e..24e3f878e77dc 100644 --- a/internal/core/src/common/FieldData.h +++ b/internal/core/src/common/FieldData.h @@ -68,6 +68,17 @@ class FieldData : public FieldDataJsonImpl { } }; +template <> +class FieldData : public FieldDataGeometryImpl { + public: + static_assert(IsScalar || std::is_same_v); + explicit FieldData(DataType data_type, + bool nullable, + int64_t buffered_num_rows = 0) + : FieldDataGeometryImpl(data_type, nullable, buffered_num_rows) { + } +}; + template <> class FieldData : public FieldDataArrayImpl { public: diff --git a/internal/core/src/common/FieldDataInterface.h b/internal/core/src/common/FieldDataInterface.h index 5703acce16106..de7ab098c1d40 100644 --- a/internal/core/src/common/FieldDataInterface.h +++ b/internal/core/src/common/FieldDataInterface.h @@ -573,6 +573,68 @@ class FieldDataStringImpl : public FieldDataImpl { } }; +class FieldDataGeometryImpl : public FieldDataImpl { + public: + explicit FieldDataGeometryImpl(DataType data_type, + bool nullable, + int64_t total_num_rows = 0) + : FieldDataImpl( + 1, data_type, nullable, total_num_rows) { + } + + int64_t + DataSize() const override { + int64_t data_size = 0; + for (size_t offset = 0; offset < length(); ++offset) { + data_size += data_[offset].size(); + } + + return data_size; + } + + int64_t + DataSize(ssize_t offset) const override { + AssertInfo(offset < get_num_rows(), + "field data subscript out of range"); + AssertInfo(offset < length(), + "subscript position don't has valid value"); + return data_[offset].size(); + } + void + FillFieldData(const std::shared_ptr array) override { + AssertInfo(array->type()->id() == arrow::Type::type::BINARY, + "inconsistent data type, expected: {}, got: {}", + "BINARY", + array->type()->ToString()); + auto geometry_array = + std::dynamic_pointer_cast(array); + FillFieldData(geometry_array); + } + void + FillFieldData(const std::shared_ptr& array) override { + auto n = array->length(); + if (n == 0) { + return; + } + null_count_ = array->null_count(); + + std::lock_guard lck(tell_mutex_); + if (length_ + n > get_num_rows()) { + resize_field_data(length_ + n); + } + auto i = 0; + for (const auto& geometry : *array) { + if (!geometry.has_value()) { + i++; + continue; + } + data_[length_ + i] = geometry.value(); + i++; + } + length_ += n; + } +}; + class FieldDataJsonImpl : public FieldDataImpl { public: explicit FieldDataJsonImpl(DataType data_type, diff --git a/internal/core/src/common/Geometry.h b/internal/core/src/common/Geometry.h new file mode 100644 index 0000000000000..10c703add69f8 --- /dev/null +++ b/internal/core/src/common/Geometry.h @@ -0,0 +1,174 @@ +// Copyright (C) 2019-2020 Zilliz. All rights reserved. +// +// 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 +#pragma once + +#include "ogr_geometry.h" +#include +#include +#include "common/EasyAssert.h" + +namespace milvus { + +class Geometry { + public: + Geometry() = default; + + // all ctr assume that wkb data is valid + explicit Geometry(const void* wkb, size_t size) { + OGRGeometry* geometry = nullptr; + OGRGeometryFactory::createFromWkb(wkb, nullptr, &geometry, size); + + AssertInfo(geometry != nullptr, + "failed to construct geometry from wkb data"); + geometry_.reset(geometry); + to_wkb_internal(); + } + + explicit Geometry(const char* wkt) { + OGRGeometry* geometry = nullptr; + OGRGeometryFactory::createFromWkt(wkt, nullptr, &geometry); + AssertInfo(geometry != nullptr, + "failed to construct geometry from wkt data"); + geometry_.reset(geometry); + to_wkb_internal(); + } + + Geometry(const Geometry& other) { + if (other.IsValid()) { + this->geometry_.reset(other.geometry_->clone()); + this->to_wkb_internal(); + } + } + + Geometry(Geometry&& other) noexcept + : wkb_data_(std::move(other.wkb_data_)), + size_(std::move(other.size_)), + geometry_(std::move(other.geometry_)) { + } + + Geometry& + operator=(const Geometry& other) { + if (this != &other && other.IsValid()) { + this->geometry_.reset(other.geometry_->clone()); + this->to_wkb_internal(); + } + return *this; + } + + Geometry& + operator=(Geometry&& other) noexcept { + if (this != &other) { + wkb_data_ = std::move(other.wkb_data_); + size_ = std::move(other.size_); + geometry_ = std::move(other.geometry_); + } + return *this; + } + + operator std::string() const { + //tmp string created by copy ctr + return std::string(reinterpret_cast(wkb_data_.get())); + } + + operator std::string_view() const { + return std::string_view(reinterpret_cast(wkb_data_.get()), + size_); + } + + ~Geometry() { + if (geometry_) { + OGRGeometryFactory::destroyGeometry(geometry_.release()); + } + } + + bool + IsValid() const { + return geometry_ != nullptr; + } + + OGRGeometry* + GetGeometry() const { + return geometry_.get(); + } + + const unsigned char* + data() const { + return wkb_data_.get(); + } + + size_t + size() const { + return size_; + } + + //spatial relation + bool + equals(const Geometry& other) const { + return geometry_->Equals(other.geometry_.get()); + } + + bool + touches(const Geometry& other) const { + return geometry_->Touches(other.geometry_.get()); + } + + bool + overlaps(const Geometry& other) const { + return geometry_->Overlaps(other.geometry_.get()); + } + + bool + crosses(const Geometry& other) const { + return geometry_->Crosses(other.geometry_.get()); + } + + bool + contains(const Geometry& other) const { + return geometry_->Contains(other.geometry_.get()); + } + + bool + intersects(const Geometry& other) const { + return geometry_->Intersects(other.geometry_.get()); + } + + bool + within(const Geometry& other) const { + return geometry_->Within(other.geometry_.get()); + } + + std::string + to_wkt_string() const { + return geometry_->exportToWkt(); + } + + std::string + to_wkb_string() const { + return std::string(reinterpret_cast(wkb_data_.get()), size_); + } + + private: + inline void + to_wkb_internal() { + if (geometry_) { + size_ = geometry_->WkbSize(); + wkb_data_ = std::make_unique(size_); + // little-endian order to save wkb + geometry_->exportToWkb(wkbNDR, wkb_data_.get()); + } + } + + std::unique_ptr wkb_data_; + size_t size_{0}; + std::unique_ptr geometry_; +}; + +} // namespace milvus \ No newline at end of file diff --git a/internal/core/src/common/Types.h b/internal/core/src/common/Types.h index d26d2ee2ed9dc..095f8d5a5b230 100644 --- a/internal/core/src/common/Types.h +++ b/internal/core/src/common/Types.h @@ -45,6 +45,7 @@ #include "pb/schema.pb.h" #include "pb/segcore.pb.h" #include "Json.h" +#include "Geometry.h" #include "CustomBitset.h" @@ -75,6 +76,7 @@ enum class DataType { VARCHAR = 21, ARRAY = 22, JSON = 23, + GEOMETRY = 24, // Some special Data type, start from after 50 // just for internal use now, may sync proto in future @@ -180,6 +182,8 @@ GetDataTypeName(DataType data_type) { return "array"; case DataType::JSON: return "json"; + case DataType::GEOMETRY: + return "geometry"; case DataType::VECTOR_FLOAT: return "vector_float"; case DataType::VECTOR_BINARY: @@ -215,6 +219,7 @@ using GroupByValueType = std::variant; using ContainsType = proto::plan::JSONContainsExpr_JSONOp; +using GISFunctionType = proto::plan::GISFunctionFilterExpr_GISOp; inline bool IsPrimaryKeyDataType(DataType data_type) { @@ -261,6 +266,11 @@ IsJsonDataType(DataType data_type) { return data_type == DataType::JSON; } +inline bool +IsGeometryDataType(DataType data_type) { + return data_type == DataType::GEOMETRY; +} + inline bool IsArrayDataType(DataType data_type) { return data_type == DataType::ARRAY; @@ -268,7 +278,8 @@ IsArrayDataType(DataType data_type) { inline bool IsBinaryDataType(DataType data_type) { - return IsJsonDataType(data_type) || IsArrayDataType(data_type); + return IsJsonDataType(data_type) || IsArrayDataType(data_type) || + IsGeometryDataType(data_type); } inline bool @@ -294,6 +305,11 @@ IsJsonType(proto::schema::DataType type) { return type == proto::schema::DataType::JSON; } +inline bool +IsGeometryType(proto::schema::DataType type) { + return type == proto::schema::DataType::Geometry; +} + inline bool IsArrayType(proto::schema::DataType type) { return type == proto::schema::DataType::Array; @@ -536,6 +552,15 @@ struct TypeTraits { static constexpr const char* Name = "JSON"; }; +template <> +struct TypeTraits { + using NativeType = void; + static constexpr DataType TypeKind = DataType::GEOMETRY; + static constexpr bool IsPrimitiveType = false; + static constexpr bool IsFixedWidth = false; + static constexpr const char* Name = "GEOMETRY"; +}; + template <> struct TypeTraits { using NativeType = void; @@ -606,6 +631,9 @@ struct fmt::formatter : formatter { case milvus::DataType::JSON: name = "JSON"; break; + case milvus::DataType::GEOMETRY: + name = "GEOMETRY"; + break; case milvus::DataType::ROW: name = "ROW"; break; diff --git a/internal/core/src/common/VectorTrait.h b/internal/core/src/common/VectorTrait.h index e021558bbde2d..a58ad0e5c68bb 100644 --- a/internal/core/src/common/VectorTrait.h +++ b/internal/core/src/common/VectorTrait.h @@ -60,9 +60,9 @@ constexpr bool IsVector = std::is_base_of_v; template constexpr bool IsScalar = std::is_fundamental_v || std::is_same_v || - std::is_same_v || std::is_same_v || - std::is_same_v || std::is_same_v || - std::is_same_v; + std::is_same_v || std::is_same_v || + std::is_same_v || std::is_same_v || + std::is_same_v || std::is_same_v; template constexpr bool IsSparse = std::is_same_v || @@ -73,7 +73,7 @@ constexpr bool IsVariableType = std::is_same_v || std::is_same_v || std::is_same_v || std::is_same_v || std::is_same_v || std::is_same_v || - IsSparse; + std::is_same_v || IsSparse; template constexpr bool IsVariableTypeSupportInChunk = diff --git a/internal/core/src/exec/expression/Expr.cpp b/internal/core/src/exec/expression/Expr.cpp index 690c0e490dca5..54550213ee301 100644 --- a/internal/core/src/exec/expression/Expr.cpp +++ b/internal/core/src/exec/expression/Expr.cpp @@ -25,12 +25,15 @@ #include "exec/expression/CompareExpr.h" #include "exec/expression/ConjunctExpr.h" #include "exec/expression/ExistsExpr.h" +#include "exec/expression/GISFunctionFilterExpr.h" #include "exec/expression/JsonContainsExpr.h" #include "exec/expression/LogicalBinaryExpr.h" #include "exec/expression/LogicalUnaryExpr.h" #include "exec/expression/TermExpr.h" #include "exec/expression/UnaryExpr.h" +#include "expr/ITypeExpr.h" #include "exec/expression/ValueExpr.h" +#include "log/Log.h" #include @@ -285,6 +288,16 @@ CompileExpression(const expr::TypedExprPtr& expr, context->get_segment(), context->get_active_count(), context->query_config()->get_expr_batch_size()); + } else if (auto casted_expr = std::dynamic_pointer_cast< + const milvus::expr::GISFunctioinFilterExpr>(expr)) { + LOG_WARN("trans to phygisexpr!!"); + result = std::make_shared( + compiled_inputs, + casted_expr, + "PhyGISFunctionFilterExpr", + context->get_segment(), + context->get_active_count(), + context->query_config()->get_expr_batch_size()); } else { PanicInfo(ExprInvalid, "unsupport expr: ", expr->ToString()); } diff --git a/internal/core/src/exec/expression/GISFunctionFilterExpr.cpp b/internal/core/src/exec/expression/GISFunctionFilterExpr.cpp new file mode 100644 index 0000000000000..f844e95945512 --- /dev/null +++ b/internal/core/src/exec/expression/GISFunctionFilterExpr.cpp @@ -0,0 +1,108 @@ +// Copyright (C) 2019-2020 Zilliz. All rights reserved. +// +// 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 + +#include "GISFunctionFilterExpr.h" +#include "common/EasyAssert.h" +#include "common/Geometry.h" +#include "common/Types.h" +#include "pb/plan.pb.h" +namespace milvus { +namespace exec { + +#define GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(method) \ + auto execute_sub_batch = [](const std::string_view* data, \ + const bool* valid_data, \ + const int size, \ + TargetBitmapView res, \ + TargetBitmapView valid_res, \ + const Geometry& right_source) { \ + for (int i = 0; i < size; ++i) { \ + if (valid_data != nullptr && !valid_data[i]) { \ + res[i] = valid_res[i] = false; \ + continue; \ + } \ + res[i] = \ + Geometry(data[i].data(), data[i].size()).method(right_source); \ + } \ + }; \ + int64_t processed_size = ProcessDataChunks( \ + execute_sub_batch, std::nullptr_t{}, res, valid_res, right_source); \ + AssertInfo(processed_size == real_batch_size, \ + "internal error: expr processed rows {} not equal " \ + "expect batch size {}", \ + processed_size, \ + real_batch_size); \ + return res_vec; + +void +PhyGISFunctionFilterExpr::Eval(EvalCtx& context, VectorPtr& result) { + AssertInfo(expr_->column_.data_type_ == DataType::GEOMETRY, + "unsupported data type: {}", + expr_->column_.data_type_); + if (is_index_mode_) { + // result = EvalForIndexSegment(); + PanicInfo(NotImplemented, "index for geos not implement"); + } else { + result = EvalForDataSegment(); + } +} + +VectorPtr +PhyGISFunctionFilterExpr::EvalForDataSegment() { + auto real_batch_size = GetNextBatchSize(); + if (real_batch_size == 0) { + return nullptr; + } + auto res_vec = std::make_shared( + TargetBitmap(real_batch_size), TargetBitmap(real_batch_size)); + TargetBitmapView res(res_vec->GetRawData(), real_batch_size); + TargetBitmapView valid_res(res_vec->GetValidRawData(), real_batch_size); + valid_res.set(); + + auto& right_source = expr_->geometry_; + switch (expr_->op_) { + case proto::plan::GISFunctionFilterExpr_GISOp_Equals: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(equals); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Touches: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(touches); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Overlaps: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(overlaps); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Crosses: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(crosses); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Contains: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(contains); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Intersects: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(intersects); + } + case proto::plan::GISFunctionFilterExpr_GISOp_Within: { + GEOMETRY_EXECUTE_SUB_BATCH_WITH_COMPARISON(within); + } + default: { + PanicInfo(NotImplemented, + "internal error: unknown GIS op : {}", + expr_->op_); + } + } + return res_vec; +} + +// VectorPtr +// PhyGISFunctionFilterExpr::EvalForIndexSegment() { +// // TODO +// } + +} //namespace exec +} // namespace milvus \ No newline at end of file diff --git a/internal/core/src/exec/expression/GISFunctionFilterExpr.h b/internal/core/src/exec/expression/GISFunctionFilterExpr.h new file mode 100644 index 0000000000000..b67f6a08ad217 --- /dev/null +++ b/internal/core/src/exec/expression/GISFunctionFilterExpr.h @@ -0,0 +1,56 @@ +// Copyright (C) 2019-2020 Zilliz. All rights reserved. +// +// 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 + +#pragma once + +#include + +#include "common/Vector.h" +#include "exec/expression/Expr.h" +#include "expr/ITypeExpr.h" +#include "segcore/SegmentInterface.h" + +namespace milvus { +namespace exec { + +class PhyGISFunctionFilterExpr : public SegmentExpr { + public: + PhyGISFunctionFilterExpr( + const std::vector>& input, + const std::shared_ptr& expr, + const std::string& name, + const segcore::SegmentInternalInterface* segment, + int64_t active_count, + int64_t batch_size) + : SegmentExpr(std::move(input), + name, + segment, + expr->column_.field_id_, + active_count, + batch_size), + expr_(expr) { + } + + void + Eval(EvalCtx& context, VectorPtr& result) override; + + private: + // VectorPtr + // EvalForIndexSegment(); + + VectorPtr + EvalForDataSegment(); + + private: + std::shared_ptr expr_; +}; +} //namespace exec +} // namespace milvus diff --git a/internal/core/src/expr/ITypeExpr.h b/internal/core/src/expr/ITypeExpr.h index 320e616b4e947..a74d5f528e7d2 100644 --- a/internal/core/src/expr/ITypeExpr.h +++ b/internal/core/src/expr/ITypeExpr.h @@ -21,11 +21,13 @@ #include #include +#include "common/Geometry.h" #include "exec/expression/function/FunctionFactory.h" #include "common/Exception.h" #include "common/Schema.h" #include "common/Types.h" #include "common/Utils.h" +#include "ogr_geometry.h" #include "pb/plan.pb.h" namespace milvus { @@ -705,6 +707,28 @@ class CompareExpr : public ITypeFilterExpr { const proto::plan::OpType op_type_; }; +class GISFunctioinFilterExpr : public ITypeFilterExpr { + public: + GISFunctioinFilterExpr(ColumnInfo cloumn, + GISFunctionType op, + const Geometry& geometry) + : column_(cloumn), op_(op), geometry_(geometry){}; + std::string + ToString() const override { + return fmt::format( + "GISFunctioinFilterExpr:[Column: {}, Operator: {} " + "WktValue: {}]", + column_.ToString(), + GISFunctionFilterExpr_GISOp_Name(op_), + geometry_.to_wkt_string()); + } + + public: + const ColumnInfo column_; + const GISFunctionType op_; + const Geometry geometry_; +}; + class JsonContainsExpr : public ITypeFilterExpr { public: JsonContainsExpr(ColumnInfo column, diff --git a/internal/core/src/mmap/Utils.h b/internal/core/src/mmap/Utils.h index 264e57454bcd0..bd7fd862b03be 100644 --- a/internal/core/src/mmap/Utils.h +++ b/internal/core/src/mmap/Utils.h @@ -26,6 +26,7 @@ #include #include "common/FieldMeta.h" +#include "common/Geometry.h" #include "common/Types.h" #include "mmap/Types.h" #include "storage/Util.h" @@ -136,6 +137,27 @@ WriteFieldData(File& file, } break; } + case DataType::GEOMETRY: { + // write as: |size|data|size|data...... + for (ssize_t i = 0; i < data->get_num_rows(); ++i) { + indices.push_back(total_written); + auto geo_ptr = + static_cast(data->RawValue(i)); + ssize_t written_data_size = + file.WriteInt(geo_ptr->size()); + if (written_data_size != sizeof(uint32_t)) { + THROW_FILE_WRITE_ERROR + } + total_written += written_data_size; + ssize_t written_data = + file.Write(geo_ptr->data(), geo_ptr->size()); + if (written_data < geo_ptr->size()) { + THROW_FILE_WRITE_ERROR + } + total_written += written_data; + } + break; + } case DataType::ARRAY: { // write as: |data|data|data|data|data...... for (size_t i = 0; i < data->get_num_rows(); ++i) { diff --git a/internal/core/src/query/PlanProto.cpp b/internal/core/src/query/PlanProto.cpp index b3ddb01dc0f72..2b5d0900533ef 100644 --- a/internal/core/src/query/PlanProto.cpp +++ b/internal/core/src/query/PlanProto.cpp @@ -14,12 +14,17 @@ #include #include +#include #include #include +#include "common/Geometry.h" #include "common/VectorTrait.h" #include "common/EasyAssert.h" #include "exec/expression/function/FunctionFactory.h" +#include "log/Log.h" +#include "ogr_core.h" +#include "ogr_geometry.h" #include "pb/plan.pb.h" #include "query/Utils.h" #include "knowhere/comp/materialized_view.h" @@ -384,6 +389,20 @@ ProtoParser::ParseValueExprs(const proto::plan::ValueExpr& expr_pb) { return std::make_shared(expr_pb.value()); } +expr::TypedExprPtr +ProtoParser::ParseGISFunctionFilterExprs( + const proto::plan::GISFunctionFilterExpr& expr_pb) { + auto& columnInfo = expr_pb.column_info(); + auto field_id = FieldId(columnInfo.field_id()); + auto data_type = schema[field_id].get_data_type(); + Assert(data_type == (DataType)columnInfo.data_type()); + const std::string& str = expr_pb.wkt_string(); + Geometry geometry(str.data()); + LOG_WARN("{}", geometry.to_wkt_string()); + return std::make_shared( + columnInfo, expr_pb.op(), geometry); +} + expr::TypedExprPtr ProtoParser::CreateAlwaysTrueExprs() { return std::make_shared(); @@ -449,6 +468,11 @@ ProtoParser::ParseExprs(const proto::plan::Expr& expr_pb, result = ParseValueExprs(expr_pb.value_expr()); break; } + case ppe::kGisfunctionFilterExpr: { + result = + ParseGISFunctionFilterExprs(expr_pb.gisfunction_filter_expr()); + break; + } default: { std::string s; google::protobuf::TextFormat::PrintToString(expr_pb, &s); @@ -457,6 +481,7 @@ ProtoParser::ParseExprs(const proto::plan::Expr& expr_pb, } } if (type_check(result->type())) { + LOG_WARN("passed check"); return result; } PanicInfo( diff --git a/internal/core/src/query/PlanProto.h b/internal/core/src/query/PlanProto.h index 28aaaaa0cb67f..adccd89de1248 100644 --- a/internal/core/src/query/PlanProto.h +++ b/internal/core/src/query/PlanProto.h @@ -83,6 +83,10 @@ class ProtoParser { expr::TypedExprPtr ParseJsonContainsExprs(const proto::plan::JSONContainsExpr& expr_pb); + expr::TypedExprPtr + ParseGISFunctionFilterExprs( + const proto::plan::GISFunctionFilterExpr& expr_pb); + expr::TypedExprPtr ParseTermExprs(const proto::plan::TermExpr& expr_pb); diff --git a/internal/core/src/segcore/ConcurrentVector.cpp b/internal/core/src/segcore/ConcurrentVector.cpp index 0fc665d303ab6..cad5f99e29317 100644 --- a/internal/core/src/segcore/ConcurrentVector.cpp +++ b/internal/core/src/segcore/ConcurrentVector.cpp @@ -98,6 +98,17 @@ VectorBase::set_data_raw(ssize_t element_offset, return set_data_raw(element_offset, data_raw.data(), element_count); } + case DataType::GEOMETRY: { + // get the geometry array of a column from proto message + auto& geometry_data = FIELD_DATA(data, geometry); + std::vector data_raw{}; + data_raw.reserve(geometry_data.size()); + for (auto& geometry_bytes : geometry_data) { + //this geometry_bytes consider as wkt strings from milvus-proto + data_raw.emplace_back(std::string(geometry_bytes)); + } + return set_data_raw(element_offset, data_raw.data(), element_count); + } case DataType::ARRAY: { auto& array_data = FIELD_DATA(data, array); std::vector data_raw{}; diff --git a/internal/core/src/segcore/InsertRecord.h b/internal/core/src/segcore/InsertRecord.h index a009ca5e9d12a..f3767761fd574 100644 --- a/internal/core/src/segcore/InsertRecord.h +++ b/internal/core/src/segcore/InsertRecord.h @@ -455,6 +455,10 @@ struct InsertRecord { this->append_data(field_id, size_per_chunk); break; } + case DataType::GEOMETRY: { + this->append_data(field_id, size_per_chunk); + break; + } case DataType::ARRAY: { this->append_data(field_id, size_per_chunk); break; diff --git a/internal/core/src/segcore/SegmentGrowingImpl.cpp b/internal/core/src/segcore/SegmentGrowingImpl.cpp index bacfdab588774..ad43e9728e307 100644 --- a/internal/core/src/segcore/SegmentGrowingImpl.cpp +++ b/internal/core/src/segcore/SegmentGrowingImpl.cpp @@ -10,6 +10,7 @@ // or implied. See the License for the specific language governing permissions and limitations under the License #include +#include #include #include #include @@ -607,6 +608,15 @@ SegmentGrowingImpl::bulk_subscript(FieldId field_id, result->mutable_scalars()->mutable_json_data()->mutable_data()); break; } + case DataType::GEOMETRY: { + bulk_subscript_ptr_impl(vec_ptr, + seg_offsets, + count, + result->mutable_scalars() + ->mutable_geometry_data() + ->mutable_data()); + break; + } case DataType::ARRAY: { // element bulk_subscript_array_impl(*vec_ptr, diff --git a/internal/core/src/segcore/SegmentSealedImpl.cpp b/internal/core/src/segcore/SegmentSealedImpl.cpp index be2b2635e2917..88c9bf3df3bbc 100644 --- a/internal/core/src/segcore/SegmentSealedImpl.cpp +++ b/internal/core/src/segcore/SegmentSealedImpl.cpp @@ -35,6 +35,7 @@ #include "common/FieldMeta.h" #include "common/File.h" #include "common/Json.h" +#include "common/Geometry.h" #include "common/LoadInfo.h" #include "common/Tracer.h" #include "common/Types.h" @@ -416,6 +417,20 @@ SegmentSealedImpl::LoadFieldData(FieldId field_id, FieldDataInfo& data) { column = std::move(var_column); break; } + case milvus::DataType::GEOMETRY: { + auto var_column = std::make_shared< + SingleChunkVariableColumn>( + num_rows, field_meta, get_block_size()); + FieldDataPtr field_data; + while (data.channel->pop(field_data)) { + var_column->Append(std::move(field_data)); + } + var_column->Seal(); + stats_.mem_size += var_column->MemoryUsageBytes(); + field_data_size = var_column->DataByteSize(); + column = std::move(var_column); + break; + } case milvus::DataType::ARRAY: { auto var_column = std::make_shared( num_rows, field_meta); @@ -585,6 +600,17 @@ SegmentSealedImpl::MapFieldData(const FieldId field_id, FieldDataInfo& data) { column = std::move(var_column); break; } + case milvus::DataType::GEOMETRY: { + auto var_column = + std::make_shared>( + file, + total_written, + field_meta, + DEFAULT_MMAP_VRCOL_BLOCK_SIZE); + var_column->Seal(std::move(indices)); + column = std::move(var_column); + break; + } case milvus::DataType::ARRAY: { auto arr_column = std::make_shared( file, total_written, field_meta); @@ -1445,6 +1471,15 @@ SegmentSealedImpl::get_raw_data(FieldId field_id, break; } + case DataType::GEOMETRY: { + bulk_subscript_ptr_impl(column.get(), + seg_offsets, + count, + ret->mutable_scalars() + ->mutable_geometry_data() + ->mutable_data()); + break; + } case DataType::ARRAY: { bulk_subscript_array_impl( column.get(), diff --git a/internal/core/src/segcore/Utils.cpp b/internal/core/src/segcore/Utils.cpp index 30b01caa86a4d..fe3ffc460a420 100644 --- a/internal/core/src/segcore/Utils.cpp +++ b/internal/core/src/segcore/Utils.cpp @@ -19,7 +19,9 @@ #include "common/Common.h" #include "common/FieldData.h" +#include "common/FieldDataInterface.h" #include "common/Types.h" +#include "common/Utils.h" #include "index/ScalarIndex.h" #include "mmap/Utils.h" #include "log/Log.h" @@ -146,6 +148,13 @@ GetRawDataSizeOfDataArray(const DataArray* data, } break; } + case DataType::GEOMETRY: { + auto& geometry_data = FIELD_DATA(data, geometry); + for (auto& geometry_bytes : geometry_data) { + result += geometry_bytes.size(); + } + break; + } case DataType::ARRAY: { auto& array_data = FIELD_DATA(data, array); switch (field_meta.get_element_type()) { @@ -292,6 +301,14 @@ CreateScalarDataArray(int64_t count, const FieldMeta& field_meta) { } break; } + case DataType::GEOMETRY: { + auto obj = scalar_array->mutable_geometry_data(); + obj->mutable_data()->Reserve(count); + for (int i = 0; i < count; i++) { + *(obj->mutable_data()->Add()) = std::string(); + } + break; + } case DataType::ARRAY: { auto obj = scalar_array->mutable_array_data(); obj->mutable_data()->Reserve(count); @@ -440,6 +457,14 @@ CreateScalarDataArrayFrom(const void* data_raw, } break; } + case DataType::GEOMETRY: { + auto data = reinterpret_cast(data_raw); + auto obj = scalar_array->mutable_geometry_data(); + for (auto i = 0; i < count; i++) { + *(obj->mutable_data()->Add()) = data[i]; + } + break; + } case DataType::ARRAY: { auto data = reinterpret_cast(data_raw); auto obj = scalar_array->mutable_array_data(); @@ -655,6 +680,12 @@ MergeDataArray(std::vector& merge_bases, *(obj->mutable_data()->Add()) = data[src_offset]; break; } + case DataType::GEOMETRY: { + auto& data = FIELD_DATA(src_field_data, geometry); + auto obj = scalar_array->mutable_geometry_data(); + *(obj->mutable_data()->Add()) = data[src_offset]; + break; + } case DataType::ARRAY: { auto& data = FIELD_DATA(src_field_data, array); auto obj = scalar_array->mutable_array_data(); diff --git a/internal/core/src/storage/Event.cpp b/internal/core/src/storage/Event.cpp index b35c92c22c155..6392d1c6d0b79 100644 --- a/internal/core/src/storage/Event.cpp +++ b/internal/core/src/storage/Event.cpp @@ -21,6 +21,7 @@ #include "common/Consts.h" #include "common/EasyAssert.h" #include "common/FieldMeta.h" +#include "common/Geometry.h" #include "common/Json.h" #include "fmt/format.h" #include "nlohmann/json.hpp" @@ -282,6 +283,17 @@ BaseEventData::Serialize() { } break; } + case DataType::GEOMETRY: { + for (size_t offset = 0; offset < field_data->get_num_rows(); + ++offset) { + auto geo_ptr = static_cast( + field_data->RawValue(offset)); + payload_writer->add_one_binary_payload( + reinterpret_cast(geo_ptr->data()), + geo_ptr->size()); + } + break; + } case DataType::VECTOR_SPARSE_FLOAT: { for (size_t offset = 0; offset < field_data->get_num_rows(); ++offset) { diff --git a/internal/core/src/storage/Util.cpp b/internal/core/src/storage/Util.cpp index 5e137207722f7..c632fe380da04 100644 --- a/internal/core/src/storage/Util.cpp +++ b/internal/core/src/storage/Util.cpp @@ -275,7 +275,8 @@ CreateArrowBuilder(DataType data_type) { return std::make_shared(); } case DataType::ARRAY: - case DataType::JSON: { + case DataType::JSON: + case DataType::GEOMETRY: { return std::make_shared(); } // sparse float vector doesn't require a dim @@ -356,7 +357,8 @@ CreateArrowSchema(DataType data_type, bool nullable) { {arrow::field("val", arrow::utf8(), nullable)}); } case DataType::ARRAY: - case DataType::JSON: { + case DataType::JSON: + case DataType::GEOMETRY: { return arrow::schema( {arrow::field("val", arrow::binary(), nullable)}); } @@ -792,6 +794,9 @@ CreateFieldData(const DataType& type, case DataType::JSON: return std::make_shared>( type, nullable, total_num_rows); + case DataType::GEOMETRY: + return std::make_shared>( + type, nullable, total_num_rows); case DataType::ARRAY: return std::make_shared>( type, nullable, total_num_rows); diff --git a/internal/core/unittest/test_c_api.cpp b/internal/core/unittest/test_c_api.cpp index 6cd11609038ef..d4d04ad63abb5 100644 --- a/internal/core/unittest/test_c_api.cpp +++ b/internal/core/unittest/test_c_api.cpp @@ -4057,7 +4057,7 @@ TEST(CApiTest, SealedSegment_search_without_predicates) { auto N = ROW_COUNT; uint64_t ts_offset = 1000; - auto dataset = DataGen(schema, N, ts_offset); + auto dataset = DataGen(schema, N, 42, ts_offset); auto vec_col = dataset.get_col(FieldId(100)); auto query_ptr = vec_col.data() + BIAS * DIM; diff --git a/internal/core/unittest/test_chunk_vector.cpp b/internal/core/unittest/test_chunk_vector.cpp index 66867bbbd0b57..2220ee486a8c3 100644 --- a/internal/core/unittest/test_chunk_vector.cpp +++ b/internal/core/unittest/test_chunk_vector.cpp @@ -51,6 +51,7 @@ TEST_F(ChunkVectorTest, FillDataWithMmap) { auto double_field = schema->AddDebugField("double", DataType::DOUBLE); auto varchar_field = schema->AddDebugField("varchar", DataType::VARCHAR); auto json_field = schema->AddDebugField("json", DataType::JSON); + auto geometry_field = schema->AddDebugField("geometry", DataType::GEOMETRY); auto int_array_field = schema->AddDebugField("int_array", DataType::ARRAY, DataType::INT8); auto long_array_field = @@ -116,6 +117,8 @@ TEST_F(ChunkVectorTest, FillDataWithMmap) { varchar_field, ids_ds->GetIds(), num_inserted); auto json_result = segment->bulk_subscript(json_field, ids_ds->GetIds(), num_inserted); + auto geometry_result = segment->bulk_subscript( + geometry_field, ids_ds->GetIds(), num_inserted); auto int_array_result = segment->bulk_subscript( int_array_field, ids_ds->GetIds(), num_inserted); auto long_array_result = segment->bulk_subscript( @@ -150,6 +153,8 @@ TEST_F(ChunkVectorTest, FillDataWithMmap) { EXPECT_EQ(varchar_result->scalars().string_data().data_size(), num_inserted); EXPECT_EQ(json_result->scalars().json_data().data_size(), num_inserted); + EXPECT_EQ(geometry_result->scalars().geometry_data().data_size(), + num_inserted); EXPECT_EQ(fp32_vec_result->vectors().float_vector().data_size(), num_inserted * dim); EXPECT_EQ(fp16_vec_result->vectors().float16_vector().size(), diff --git a/internal/core/unittest/test_data_codec.cpp b/internal/core/unittest/test_data_codec.cpp index 1e836eeb3aa93..c361ba510083f 100644 --- a/internal/core/unittest/test_data_codec.cpp +++ b/internal/core/unittest/test_data_codec.cpp @@ -17,6 +17,9 @@ #include #include +#include "common/Geometry.h" +#include "ogr_core.h" +#include "ogr_geometry.h" #include "storage/DataCodec.h" #include "storage/InsertData.h" #include "storage/IndexData.h" @@ -331,7 +334,53 @@ TEST(storage, InsertDataInt64Nullable) { ASSERT_EQ(*new_payload->ValidData(), *valid_data); delete[] valid_data; } +TEST(storage, InsertDataGeometry) { + OGRPoint point1(10.25, 0.55), point2(9.75, -0.23), point3(-8.50, 1.44); + OGRLineString linstring; + linstring.addPoint(&point1); + linstring.addPoint(&point2); + linstring.addPoint(&point3); + OGRPolygon polygon; + OGRLinearRing ring; + ring.addPoint(&point1); + ring.addPoint(&point2); + ring.addPoint(&point3); + ring.closeRings(); + polygon.addRing(&ring); + std::string str1, str2, str3; + str1 = Geometry(point1.exportToWkt().data()).to_wkb_string(); + str2 = Geometry(linstring.exportToWkt().data()).to_wkb_string(); + str3 = Geometry(polygon.exportToWkt().data()).to_wkb_string(); + FixedVector data = {str1, str2, str3}; + auto field_data = + milvus::storage::CreateFieldData(storage::DataType::GEOMETRY, false); + field_data->FillFieldData(data.data(), data.size()); + + storage::InsertData insert_data(field_data); + storage::FieldDataMeta field_data_meta{100, 101, 102, 103}; + insert_data.SetFieldDataMeta(field_data_meta); + insert_data.SetTimestamps(0, 100); + auto serialized_bytes = insert_data.Serialize(storage::StorageType::Remote); + std::shared_ptr serialized_data_ptr(serialized_bytes.data(), + [&](uint8_t*) {}); + auto new_insert_data = storage::DeserializeFileData( + serialized_data_ptr, serialized_bytes.size()); + ASSERT_EQ(new_insert_data->GetCodecType(), storage::InsertDataType); + ASSERT_EQ(new_insert_data->GetTimeRage(), + std::make_pair(Timestamp(0), Timestamp(100))); + auto new_payload = new_insert_data->GetFieldData(); + ASSERT_EQ(new_payload->get_data_type(), storage::DataType::GEOMETRY); + ASSERT_EQ(new_payload->get_num_rows(), data.size()); + FixedVector new_data(data.size()); + ASSERT_EQ(new_payload->get_null_count(), 0); + for (int i = 0; i < data.size(); ++i) { + new_data[i] = + *static_cast(new_payload->RawValue(i)); + ASSERT_EQ(new_payload->DataSize(i), data[i].size()); + } + ASSERT_EQ(data, new_data); +} TEST(storage, InsertDataString) { FixedVector data = { "test1", "test2", "test3", "test4", "test5"}; diff --git a/internal/core/unittest/test_group_by.cpp b/internal/core/unittest/test_group_by.cpp index 0d334cbe51382..9380ca8182262 100644 --- a/internal/core/unittest/test_group_by.cpp +++ b/internal/core/unittest/test_group_by.cpp @@ -10,6 +10,7 @@ // or implied. See the License for the specific language governing permissions and limitations under the License #include +#include #include "common/Schema.h" #include "query/Plan.h" #include "segcore/SegmentSealedImpl.h" @@ -543,9 +544,9 @@ TEST(GroupBY, Reduce) { int repeat_count_1 = 2; int repeat_count_2 = 5; auto raw_data1 = - DataGen(schema, N, seed, ts_offset, repeat_count_1, false, false); + DataGen(schema, N, seed, ts_offset, repeat_count_1, 10, false, false); auto raw_data2 = - DataGen(schema, N, seed, ts_offset, repeat_count_2, false, false); + DataGen(schema, N, seed, ts_offset, repeat_count_2, 10, false, false); auto fields = schema->get_fields(); //load segment1 raw data diff --git a/internal/core/unittest/test_growing.cpp b/internal/core/unittest/test_growing.cpp index f53f214ba568d..e8e12514d15fd 100644 --- a/internal/core/unittest/test_growing.cpp +++ b/internal/core/unittest/test_growing.cpp @@ -150,6 +150,7 @@ TEST_P(GrowingTest, FillData) { auto double_field = schema->AddDebugField("double", DataType::DOUBLE); auto varchar_field = schema->AddDebugField("varchar", DataType::VARCHAR); auto json_field = schema->AddDebugField("json", DataType::JSON); + auto geometry_field = schema->AddDebugField("geometry", DataType::GEOMETRY); auto int_array_field = schema->AddDebugField("int_array", DataType::ARRAY, DataType::INT8); auto long_array_field = @@ -213,6 +214,8 @@ TEST_P(GrowingTest, FillData) { varchar_field, ids_ds->GetIds(), num_inserted); auto json_result = segment->bulk_subscript(json_field, ids_ds->GetIds(), num_inserted); + auto geometry_result = segment->bulk_subscript( + geometry_field, ids_ds->GetIds(), num_inserted); auto int_array_result = segment->bulk_subscript( int_array_field, ids_ds->GetIds(), num_inserted); auto long_array_result = segment->bulk_subscript( @@ -241,6 +244,8 @@ TEST_P(GrowingTest, FillData) { EXPECT_EQ(varchar_result->scalars().string_data().data_size(), num_inserted); EXPECT_EQ(json_result->scalars().json_data().data_size(), num_inserted); + EXPECT_EQ(geometry_result->scalars().geometry_data().data_size(), + num_inserted); if (data_type == DataType::VECTOR_FLOAT) { EXPECT_EQ(vec_result->vectors().float_vector().data_size(), num_inserted * dim); diff --git a/internal/core/unittest/test_sealed.cpp b/internal/core/unittest/test_sealed.cpp index 5aaba895da676..7461a1899dc8a 100644 --- a/internal/core/unittest/test_sealed.cpp +++ b/internal/core/unittest/test_sealed.cpp @@ -407,6 +407,7 @@ TEST(Sealed, LoadFieldData) { schema->AddDebugField("int16", DataType::INT16); schema->AddDebugField("float", DataType::FLOAT); schema->AddDebugField("json", DataType::JSON); + schema->AddDebugField("geometry", DataType::GEOMETRY); schema->AddDebugField("array", DataType::ARRAY, DataType::INT64); schema->set_primary_field_id(counter_id); auto int8_nullable_id = @@ -584,6 +585,7 @@ TEST(Sealed, ClearData) { schema->AddDebugField("int16", DataType::INT16); schema->AddDebugField("float", DataType::FLOAT); schema->AddDebugField("json", DataType::JSON); + schema->AddDebugField("geometry", DataType::GEOMETRY); schema->AddDebugField("array", DataType::ARRAY, DataType::INT64); schema->set_primary_field_id(counter_id); @@ -715,6 +717,7 @@ TEST(Sealed, LoadFieldDataMmap) { schema->AddDebugField("int16", DataType::INT16); schema->AddDebugField("float", DataType::FLOAT); schema->AddDebugField("json", DataType::JSON); + schema->AddDebugField("geometry", DataType::GEOMETRY); schema->AddDebugField("array", DataType::ARRAY, DataType::INT64); schema->set_primary_field_id(counter_id); @@ -2179,6 +2182,7 @@ TEST(Sealed, QueryAllFields) { auto double_field = schema->AddDebugField("double", DataType::DOUBLE); auto varchar_field = schema->AddDebugField("varchar", DataType::VARCHAR); auto json_field = schema->AddDebugField("json", DataType::JSON); + auto geometry_field = schema->AddDebugField("geometry", DataType::GEOMETRY); auto int_array_field = schema->AddDebugField("int_array", DataType::ARRAY, DataType::INT8); auto long_array_field = @@ -2226,6 +2230,7 @@ TEST(Sealed, QueryAllFields) { auto double_values = dataset.get_col(double_field); auto varchar_values = dataset.get_col(varchar_field); auto json_values = dataset.get_col(json_field); + auto geometry_values = dataset.get_col(geometry_field); auto int_array_values = dataset.get_col(int_array_field); auto long_array_values = dataset.get_col(long_array_field); auto bool_array_values = dataset.get_col(bool_array_field); @@ -2255,6 +2260,8 @@ TEST(Sealed, QueryAllFields) { segment->bulk_subscript(varchar_field, ids_ds->GetIds(), dataset_size); auto json_result = segment->bulk_subscript(json_field, ids_ds->GetIds(), dataset_size); + auto geometry_result = + segment->bulk_subscript(geometry_field, ids_ds->GetIds(), dataset_size); auto int_array_result = segment->bulk_subscript( int_array_field, ids_ds->GetIds(), dataset_size); auto long_array_result = segment->bulk_subscript( @@ -2284,6 +2291,8 @@ TEST(Sealed, QueryAllFields) { EXPECT_EQ(varchar_result->scalars().string_data().data_size(), dataset_size); EXPECT_EQ(json_result->scalars().json_data().data_size(), dataset_size); + EXPECT_EQ(geometry_result->scalars().geometry_data().data_size(), + dataset_size); EXPECT_EQ(vec_result->vectors().float_vector().data_size(), dataset_size * dim); EXPECT_EQ(float16_vec_result->vectors().float16_vector().size(), diff --git a/internal/core/unittest/test_utils/DataGen.h b/internal/core/unittest/test_utils/DataGen.h index db306a4d97390..7eaf93d84b7ce 100644 --- a/internal/core/unittest/test_utils/DataGen.h +++ b/internal/core/unittest/test_utils/DataGen.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "Constants.h" #include "common/EasyAssert.h" @@ -206,6 +207,14 @@ struct GeneratedData { std::copy(src_data.begin(), src_data.end(), ret_data); break; } + case DataType::GEOMETRY: { + auto ret_data = + reinterpret_cast(ret.data()); + auto src_data = + target_field_data.scalars().geometry_data().data(); + std::copy(src_data.begin(), src_data.end(), ret_data); + break; + } default: { PanicInfo(Unsupported, "unsupported"); } @@ -317,14 +326,94 @@ GenerateRandomSparseFloatVector(size_t rows, return tensor; } -inline GeneratedData DataGen(SchemaPtr schema, - int64_t N, - uint64_t seed = 42, - uint64_t ts_offset = 0, - int repeat_count = 1, - int array_len = 10, - bool random_pk = false, - bool random_val = true) { +inline void generateRandomPoint(OGRPoint& point) { + point.setX(static_cast(rand()) / RAND_MAX * 360.0 - 180.0); + point.setY(static_cast(rand()) / RAND_MAX * 180.0 - 90.0); +} + +inline void +generateRandomLineString(OGRLineString& lineString, int numPoints) { + for (int i = 0; i < numPoints; ++i) { + OGRPoint point; + generateRandomPoint(point); + lineString.addPoint(&point); + } +} + +inline void +generateRandomPolygon(OGRPolygon& polygon, int numperRing) { + OGRLinearRing ring; + generateRandomLineString(ring, numperRing); + ring.closeRings(); + polygon.addRing(&ring); +} + +inline OGRGeometry* +GenRandomGeometry() { + OGRGeometry* geometry = nullptr; + int geomType = rand() % 6; // Randomly select a geometry type (0 to 6) + switch (geomType) { + case 0: { + OGRPoint point; + generateRandomPoint(point); + geometry = point.clone(); + break; + } + case 1: { + OGRLineString lineString; + generateRandomLineString(lineString, 5); + geometry = lineString.clone(); + break; + } + case 2: { + OGRPolygon polygon; + generateRandomPolygon(polygon, 5); + geometry = polygon.clone(); + break; + } + case 3: { + OGRMultiPoint multiPoint; + for (int i = 0; i < 3; ++i) { + OGRPoint point; + generateRandomPoint(point); + multiPoint.addGeometry(&point); + } + geometry = multiPoint.clone(); + break; + } + case 4: { + OGRMultiLineString multiLineString; + for (int i = 0; i < 3; ++i) { + OGRLineString lineString; + generateRandomLineString(lineString, 5); + multiLineString.addGeometry(&lineString); + } + geometry = multiLineString.clone(); + break; + } + case 5: { + OGRMultiPolygon multiPolygon; + for (int i = 0; i < 3; ++i) { + OGRPolygon polygon; + generateRandomPolygon(polygon, 5); + multiPolygon.addGeometry(&polygon); + } + geometry = multiPolygon.clone(); + break; + } + } + return geometry; +} + +inline GeneratedData +DataGen(SchemaPtr schema, + int64_t N, + uint64_t seed = 42, + uint64_t ts_offset = 0, + int repeat_count = 1, + int array_len = 10, + bool random_pk = false, + bool random_val = true) { using std::vector; std::default_random_engine random(seed); std::normal_distribution<> distr(0, 1); @@ -516,6 +605,21 @@ inline GeneratedData DataGen(SchemaPtr schema, insert_cols(data, N, field_meta); break; } + case DataType::GEOMETRY: { + vector data(N); + for (int i = 0; i < N / repeat_count; i++) { + OGRGeometry* geo = GenRandomGeometry(); + size_t size = geo->WkbSize(); + unsigned char* wkb_data = new unsigned char[size]; + geo->exportToWkb(wkbNDR, wkb_data); + data[i] = std::string( + reinterpret_cast(wkb_data), size); + OGRGeometryFactory::destroyGeometry(geo); + delete[] wkb_data; + } + insert_cols(data, N, field_meta); + break; + } case DataType::ARRAY: { vector data(N); switch (field_meta.get_element_type()) { @@ -1157,6 +1261,16 @@ CreateFieldDataFromDataArray(ssize_t raw_count, } break; } + case DataType::GEOMETRY: { + auto src_data = data->scalars().geometry_data().data(); + std::vector data_raw(src_data.size()); + for (int i = 0; i < src_data.size(); i++) { + auto str = src_data.Get(i); + data_raw[i] = std::move(std::string(str)); + } + createFieldData(data_raw.data(), DataType::GEOMETRY, dim); + break; + } case DataType::ARRAY: { auto src_data = data->scalars().array_data().data(); std::vector data_raw(src_data.size()); diff --git a/internal/distributed/proxy/httpserver/utils.go b/internal/distributed/proxy/httpserver/utils.go index eda05468a84e2..2750504134f1f 100644 --- a/internal/distributed/proxy/httpserver/utils.go +++ b/internal/distributed/proxy/httpserver/utils.go @@ -3,6 +3,7 @@ package httpserver import ( "bytes" "context" + "encoding/base64" "encoding/binary" "fmt" "math" @@ -14,6 +15,8 @@ import ( "github.com/gin-gonic/gin" "github.com/spf13/cast" "github.com/tidwall/gjson" + "github.com/twpayne/go-geom/encoding/wkb" + "github.com/twpayne/go-geom/encoding/wkt" "go.uber.org/zap" "google.golang.org/protobuf/proto" @@ -492,6 +495,26 @@ func checkAndSetData(body string, collSchema *schemapb.CollectionSchema) (error, } case schemapb.DataType_JSON: reallyData[fieldName] = []byte(dataString) + case schemapb.DataType_Geometry: + // treat as string(wkt) data,the string data must be valid + WktString, err := base64.StdEncoding.DecodeString(dataString) + if err != nil { + log.Warn("proxy can not decode datastring with base64", zap.String("WktString:", dataString)) + return merr.WrapErrParameterInvalid(schemapb.DataType_name[int32(fieldType)], dataString, err.Error()), reallyDataArray, validDataMap + } + fmt.Println("before unmarshal wkt:", string(WktString)) + geomT, err := wkt.Unmarshal(string(WktString)) + if err != nil { + log.Warn("proxy change wkt to geomtyr failed!!", zap.String("WktString:", dataString)) + return merr.WrapErrParameterInvalid(schemapb.DataType_name[int32(fieldType)], dataString, err.Error()), reallyDataArray, validDataMap + } + // translate the wkt bytes to wkb bytes ,store the bytes in LittleEndian which cpp core used as well + dataWkbBytes, err := wkb.Marshal(geomT, wkb.NDR) + if err != nil { + log.Warn("proxy change geomtry to wkb failed!!", zap.String("WktString:", dataString)) + return merr.WrapErrParameterInvalid(schemapb.DataType_name[int32(fieldType)], dataString, err.Error()), reallyDataArray, validDataMap + } + reallyData[fieldName] = dataWkbBytes case schemapb.DataType_Float: result, err := cast.ToFloat32E(dataString) if err != nil { @@ -694,6 +717,8 @@ func anyToColumns(rows []map[string]interface{}, validDataMap map[string][]bool, data = make([]*schemapb.ScalarField, 0, rowsLen) case schemapb.DataType_JSON: data = make([][]byte, 0, rowsLen) + case schemapb.DataType_Geometry: + data = make([][]byte, 0, rowsLen) case schemapb.DataType_FloatVector: data = make([][]float32, 0, rowsLen) dim, _ := getDim(field) @@ -780,6 +805,8 @@ func anyToColumns(rows []map[string]interface{}, validDataMap map[string][]bool, nameColumns[field.Name] = append(nameColumns[field.Name].([]*schemapb.ScalarField), candi.v.Interface().(*schemapb.ScalarField)) case schemapb.DataType_JSON: nameColumns[field.Name] = append(nameColumns[field.Name].([][]byte), candi.v.Interface().([]byte)) + case schemapb.DataType_Geometry: + nameColumns[field.Name] = append(nameColumns[field.Name].([][]byte), candi.v.Interface().([]byte)) case schemapb.DataType_FloatVector: nameColumns[field.Name] = append(nameColumns[field.Name].([][]float32), candi.v.Interface().([]float32)) case schemapb.DataType_BinaryVector: @@ -928,6 +955,16 @@ func anyToColumns(rows []map[string]interface{}, validDataMap map[string][]bool, }, }, } + case schemapb.DataType_Geometry: + colData.Field = &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: column.([][]byte), + }, + }, + }, + } case schemapb.DataType_FloatVector: dim := nameDims[name] arr, err := convertFloatVectorToArray(column.([][]float32), dim) @@ -1188,6 +1225,8 @@ func buildQueryResp(rowsNum int64, needFields []string, fieldDataList []*schemap rowsNum = int64(len(fieldDataList[0].GetScalars().GetArrayData().Data)) case schemapb.DataType_JSON: rowsNum = int64(len(fieldDataList[0].GetScalars().GetJsonData().Data)) + case schemapb.DataType_Geometry: + rowsNum = int64(len(fieldDataList[0].GetScalars().GetGeometryData().Data)) case schemapb.DataType_BinaryVector: rowsNum = int64(len(fieldDataList[0].GetVectors().GetBinaryVector())*8) / fieldDataList[0].GetVectors().GetDim() case schemapb.DataType_FloatVector: @@ -1326,6 +1365,8 @@ func buildQueryResp(rowsNum int64, needFields []string, fieldDataList []*schemap } } } + case schemapb.DataType_Geometry: + row[fieldDataList[j].FieldName] = fieldDataList[j].GetScalars().GetGeometryData().Data[i] default: row[fieldDataList[j].FieldName] = "" } diff --git a/internal/distributed/proxy/httpserver/utils_test.go b/internal/distributed/proxy/httpserver/utils_test.go index 11a20cab78f72..ba29dd0bf6004 100644 --- a/internal/distributed/proxy/httpserver/utils_test.go +++ b/internal/distributed/proxy/httpserver/utils_test.go @@ -781,7 +781,7 @@ func compareRow(m1 map[string]interface{}, m2 map[string]interface{}) bool { return false } } - } else if key == "field-json" { + } else if key == "field-json" || key == "field-geometry" { arr1 := value.([]byte) arr2 := m2[key].([]byte) if len(arr1) != len(arr2) { @@ -800,7 +800,7 @@ func compareRow(m1 map[string]interface{}, m2 map[string]interface{}) bool { } for key, value := range m2 { - if (key == FieldBookIntro) || (key == "field-json") || (key == "field-array") { + if (key == FieldBookIntro) || (key == "field-json") || (key == "field-geometry") || (key == "field-array") { continue } else if strings.HasPrefix(key, "array-") { continue @@ -900,6 +900,12 @@ func newCollectionSchema(coll *schemapb.CollectionSchema) *schemapb.CollectionSc } coll.Fields = append(coll.Fields, &fieldSchema10) + fieldSchema11 := schemapb.FieldSchema{ + Name: "field-geometry", + DataType: schemapb.DataType_Geometry, + IsDynamic: false, + } + coll.Fields = append(coll.Fields, &fieldSchema11) return coll } @@ -1146,6 +1152,28 @@ func newFieldData(fieldDatas []*schemapb.FieldData, firstFieldType schemapb.Data } fieldDatas = append(fieldDatas, &fieldData11) + fieldData12 := schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: "field-geometry", + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + // WKT: POINT (30.123 -10.456) + Data: [][]byte{ + []byte(`POINT (30.123 -10.456)`), + []byte(`POINT (30.123 -10.456)`), + []byte(`POINT (30.123 -10.456)`), + // wkb:{0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x4}, + }, + }, + }, + }, + }, + IsDynamic: false, + } + fieldDatas = append(fieldDatas, &fieldData12) + switch firstFieldType { case schemapb.DataType_None: return fieldDatas @@ -1181,6 +1209,8 @@ func newFieldData(fieldDatas []*schemapb.FieldData, firstFieldType schemapb.Data return []*schemapb.FieldData{&fieldData10} case schemapb.DataType_JSON: return []*schemapb.FieldData{&fieldData9} + case schemapb.DataType_Geometry: + return []*schemapb.FieldData{&fieldData12} case schemapb.DataType_SparseFloatVector: vectorField := generateVectorFieldData(firstFieldType) return []*schemapb.FieldData{&vectorField} @@ -1446,6 +1476,7 @@ func newSearchResult(results []map[string]interface{}) []map[string]interface{} result["field-varchar"] = strconv.Itoa(i) result["field-string"] = strconv.Itoa(i) result["field-json"] = []byte(`{"XXX": 0}`) + result["field-geometry"] = []byte(`POINT (30.123 -10.456)`) result["field-array"] = []bool{true} result["array-bool"] = []bool{true} result["array-int8"] = []int32{0} @@ -1706,6 +1737,7 @@ func TestBuildQueryResps(t *testing.T) { schemapb.DataType_Float, schemapb.DataType_Double, schemapb.DataType_String, schemapb.DataType_VarChar, schemapb.DataType_JSON, schemapb.DataType_Array, + schemapb.DataType_Geometry, } for _, dateType := range dataTypes { _, err := buildQueryResp(int64(0), outputFields, newFieldData([]*schemapb.FieldData{}, dateType), generateIDs(schemapb.DataType_Int64, 3), DefaultScores, true) diff --git a/internal/parser/planparserv2/Plan.g4 b/internal/parser/planparserv2/Plan.g4 index 36ac4f805b79f..fdf6190814328 100644 --- a/internal/parser/planparserv2/Plan.g4 +++ b/internal/parser/planparserv2/Plan.g4 @@ -23,6 +23,13 @@ expr: | (JSONContains | ArrayContains)'('expr',' expr')' # JSONContains | (JSONContainsAll | ArrayContainsAll)'('expr',' expr')' # JSONContainsAll | (JSONContainsAny | ArrayContainsAny)'('expr',' expr')' # JSONContainsAny + | STEuqals'('Identifier','StringLiteral')' # STEuqals + | STTouches'('Identifier','StringLiteral')' # STTouches + | STOverlaps'('Identifier','StringLiteral')' # STOverlaps + | STCrosses'('Identifier','StringLiteral')' # STCrosses + | STContains'('Identifier','StringLiteral')' # STContains + | STIntersects'('Identifier','StringLiteral')' # STIntersects + | STWithin'('Identifier','StringLiteral')' # STWithin | ArrayLength'('(Identifier | JSONIdentifier)')' # ArrayLength | Identifier '(' ( expr (',' expr )* ','? )? ')' # Call | expr op1 = (LT | LE) (Identifier | JSONIdentifier) op2 = (LT | LE) expr # Range @@ -89,6 +96,14 @@ ArrayContainsAll: 'array_contains_all' | 'ARRAY_CONTAINS_ALL'; ArrayContainsAny: 'array_contains_any' | 'ARRAY_CONTAINS_ANY'; ArrayLength: 'array_length' | 'ARRAY_LENGTH'; +STEuqals:'st_equals' | 'ST_EQUALS'; +STTouches:'st_touches' | 'ST_TOUCHES'; +STOverlaps: 'st_overlaps' | 'ST_OVERLAPS'; +STCrosses: 'st_crosses' | 'ST_CROSSES'; +STContains: 'st_contains' | 'ST_CONTAINS'; +STIntersects : 'st_intersects' | 'ST_INTERSECTS'; +STWithin :'st_within' | 'ST_WITHIN'; + BooleanConstant: 'true' | 'True' | 'TRUE' | 'false' | 'False' | 'FALSE'; IntegerConstant: diff --git a/internal/parser/planparserv2/generated/Plan.interp b/internal/parser/planparserv2/generated/Plan.interp index c2ffa1e44960d..e5e6f44914fa1 100644 --- a/internal/parser/planparserv2/generated/Plan.interp +++ b/internal/parser/planparserv2/generated/Plan.interp @@ -44,6 +44,13 @@ null null null null +null +null +null +null +null +null +null '$meta' null null @@ -92,6 +99,13 @@ ArrayContains ArrayContainsAll ArrayContainsAny ArrayLength +STEuqals +STTouches +STOverlaps +STCrosses +STContains +STIntersects +STWithin BooleanConstant IntegerConstant FloatingConstant @@ -107,4 +121,4 @@ expr atn: -[4, 1, 49, 142, 2, 0, 7, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 3, 0, 27, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 70, 8, 0, 10, 0, 12, 0, 73, 9, 0, 1, 0, 3, 0, 76, 8, 0, 3, 0, 78, 8, 0, 1, 0, 1, 0, 1, 0, 3, 0, 83, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 99, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 137, 8, 0, 10, 0, 12, 0, 140, 9, 0, 1, 0, 0, 1, 0, 1, 0, 0, 13, 1, 0, 44, 45, 2, 0, 17, 18, 30, 31, 2, 0, 34, 34, 37, 37, 2, 0, 35, 35, 38, 38, 2, 0, 36, 36, 39, 39, 2, 0, 44, 44, 47, 47, 1, 0, 19, 21, 1, 0, 17, 18, 1, 0, 23, 24, 1, 0, 8, 9, 1, 0, 10, 11, 1, 0, 8, 11, 1, 0, 12, 13, 178, 0, 82, 1, 0, 0, 0, 2, 3, 6, 0, -1, 0, 3, 83, 5, 42, 0, 0, 4, 83, 5, 43, 0, 0, 5, 83, 5, 41, 0, 0, 6, 83, 5, 46, 0, 0, 7, 83, 7, 0, 0, 0, 8, 83, 5, 47, 0, 0, 9, 10, 5, 6, 0, 0, 10, 11, 5, 44, 0, 0, 11, 83, 5, 7, 0, 0, 12, 13, 5, 1, 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 2, 0, 0, 15, 83, 1, 0, 0, 0, 16, 17, 5, 3, 0, 0, 17, 22, 3, 0, 0, 0, 18, 19, 5, 4, 0, 0, 19, 21, 3, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, 1, 0, 0, 0, 23, 26, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 27, 5, 4, 0, 0, 26, 25, 1, 0, 0, 0, 26, 27, 1, 0, 0, 0, 27, 28, 1, 0, 0, 0, 28, 29, 5, 5, 0, 0, 29, 83, 1, 0, 0, 0, 30, 83, 5, 33, 0, 0, 31, 32, 5, 16, 0, 0, 32, 33, 5, 1, 0, 0, 33, 34, 5, 44, 0, 0, 34, 35, 5, 4, 0, 0, 35, 36, 5, 46, 0, 0, 36, 83, 5, 2, 0, 0, 37, 38, 7, 1, 0, 0, 38, 83, 3, 0, 0, 20, 39, 40, 7, 2, 0, 0, 40, 41, 5, 1, 0, 0, 41, 42, 3, 0, 0, 0, 42, 43, 5, 4, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 2, 0, 0, 45, 83, 1, 0, 0, 0, 46, 47, 7, 3, 0, 0, 47, 48, 5, 1, 0, 0, 48, 49, 3, 0, 0, 0, 49, 50, 5, 4, 0, 0, 50, 51, 3, 0, 0, 0, 51, 52, 5, 2, 0, 0, 52, 83, 1, 0, 0, 0, 53, 54, 7, 4, 0, 0, 54, 55, 5, 1, 0, 0, 55, 56, 3, 0, 0, 0, 56, 57, 5, 4, 0, 0, 57, 58, 3, 0, 0, 0, 58, 59, 5, 2, 0, 0, 59, 83, 1, 0, 0, 0, 60, 61, 5, 40, 0, 0, 61, 62, 5, 1, 0, 0, 62, 63, 7, 5, 0, 0, 63, 83, 5, 2, 0, 0, 64, 65, 5, 44, 0, 0, 65, 77, 5, 1, 0, 0, 66, 71, 3, 0, 0, 0, 67, 68, 5, 4, 0, 0, 68, 70, 3, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 73, 1, 0, 0, 0, 71, 69, 1, 0, 0, 0, 71, 72, 1, 0, 0, 0, 72, 75, 1, 0, 0, 0, 73, 71, 1, 0, 0, 0, 74, 76, 5, 4, 0, 0, 75, 74, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 78, 1, 0, 0, 0, 77, 66, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, 1, 0, 0, 0, 79, 83, 5, 2, 0, 0, 80, 81, 5, 15, 0, 0, 81, 83, 3, 0, 0, 1, 82, 2, 1, 0, 0, 0, 82, 4, 1, 0, 0, 0, 82, 5, 1, 0, 0, 0, 82, 6, 1, 0, 0, 0, 82, 7, 1, 0, 0, 0, 82, 8, 1, 0, 0, 0, 82, 9, 1, 0, 0, 0, 82, 12, 1, 0, 0, 0, 82, 16, 1, 0, 0, 0, 82, 30, 1, 0, 0, 0, 82, 31, 1, 0, 0, 0, 82, 37, 1, 0, 0, 0, 82, 39, 1, 0, 0, 0, 82, 46, 1, 0, 0, 0, 82, 53, 1, 0, 0, 0, 82, 60, 1, 0, 0, 0, 82, 64, 1, 0, 0, 0, 82, 80, 1, 0, 0, 0, 83, 138, 1, 0, 0, 0, 84, 85, 10, 21, 0, 0, 85, 86, 5, 22, 0, 0, 86, 137, 3, 0, 0, 22, 87, 88, 10, 19, 0, 0, 88, 89, 7, 6, 0, 0, 89, 137, 3, 0, 0, 20, 90, 91, 10, 18, 0, 0, 91, 92, 7, 7, 0, 0, 92, 137, 3, 0, 0, 19, 93, 94, 10, 17, 0, 0, 94, 95, 7, 8, 0, 0, 95, 137, 3, 0, 0, 18, 96, 98, 10, 16, 0, 0, 97, 99, 5, 31, 0, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 1, 0, 0, 0, 100, 101, 5, 32, 0, 0, 101, 137, 3, 0, 0, 17, 102, 103, 10, 10, 0, 0, 103, 104, 7, 9, 0, 0, 104, 105, 7, 5, 0, 0, 105, 106, 7, 9, 0, 0, 106, 137, 3, 0, 0, 11, 107, 108, 10, 9, 0, 0, 108, 109, 7, 10, 0, 0, 109, 110, 7, 5, 0, 0, 110, 111, 7, 10, 0, 0, 111, 137, 3, 0, 0, 10, 112, 113, 10, 8, 0, 0, 113, 114, 7, 11, 0, 0, 114, 137, 3, 0, 0, 9, 115, 116, 10, 7, 0, 0, 116, 117, 7, 12, 0, 0, 117, 137, 3, 0, 0, 8, 118, 119, 10, 6, 0, 0, 119, 120, 5, 25, 0, 0, 120, 137, 3, 0, 0, 7, 121, 122, 10, 5, 0, 0, 122, 123, 5, 27, 0, 0, 123, 137, 3, 0, 0, 6, 124, 125, 10, 4, 0, 0, 125, 126, 5, 26, 0, 0, 126, 137, 3, 0, 0, 5, 127, 128, 10, 3, 0, 0, 128, 129, 5, 28, 0, 0, 129, 137, 3, 0, 0, 4, 130, 131, 10, 2, 0, 0, 131, 132, 5, 29, 0, 0, 132, 137, 3, 0, 0, 3, 133, 134, 10, 23, 0, 0, 134, 135, 5, 14, 0, 0, 135, 137, 5, 46, 0, 0, 136, 84, 1, 0, 0, 0, 136, 87, 1, 0, 0, 0, 136, 90, 1, 0, 0, 0, 136, 93, 1, 0, 0, 0, 136, 96, 1, 0, 0, 0, 136, 102, 1, 0, 0, 0, 136, 107, 1, 0, 0, 0, 136, 112, 1, 0, 0, 0, 136, 115, 1, 0, 0, 0, 136, 118, 1, 0, 0, 0, 136, 121, 1, 0, 0, 0, 136, 124, 1, 0, 0, 0, 136, 127, 1, 0, 0, 0, 136, 130, 1, 0, 0, 0, 136, 133, 1, 0, 0, 0, 137, 140, 1, 0, 0, 0, 138, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 1, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 9, 22, 26, 71, 75, 77, 82, 98, 136, 138] \ No newline at end of file +[4, 1, 56, 184, 2, 0, 7, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 3, 0, 27, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 112, 8, 0, 10, 0, 12, 0, 115, 9, 0, 1, 0, 3, 0, 118, 8, 0, 3, 0, 120, 8, 0, 1, 0, 1, 0, 1, 0, 3, 0, 125, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 141, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 179, 8, 0, 10, 0, 12, 0, 182, 9, 0, 1, 0, 0, 1, 0, 1, 0, 0, 13, 1, 0, 51, 52, 2, 0, 17, 18, 30, 31, 2, 0, 34, 34, 37, 37, 2, 0, 35, 35, 38, 38, 2, 0, 36, 36, 39, 39, 2, 0, 51, 51, 54, 54, 1, 0, 19, 21, 1, 0, 17, 18, 1, 0, 23, 24, 1, 0, 8, 9, 1, 0, 10, 11, 1, 0, 8, 11, 1, 0, 12, 13, 227, 0, 124, 1, 0, 0, 0, 2, 3, 6, 0, -1, 0, 3, 125, 5, 49, 0, 0, 4, 125, 5, 50, 0, 0, 5, 125, 5, 48, 0, 0, 6, 125, 5, 53, 0, 0, 7, 125, 7, 0, 0, 0, 8, 125, 5, 54, 0, 0, 9, 10, 5, 6, 0, 0, 10, 11, 5, 51, 0, 0, 11, 125, 5, 7, 0, 0, 12, 13, 5, 1, 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 2, 0, 0, 15, 125, 1, 0, 0, 0, 16, 17, 5, 3, 0, 0, 17, 22, 3, 0, 0, 0, 18, 19, 5, 4, 0, 0, 19, 21, 3, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, 1, 0, 0, 0, 23, 26, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 27, 5, 4, 0, 0, 26, 25, 1, 0, 0, 0, 26, 27, 1, 0, 0, 0, 27, 28, 1, 0, 0, 0, 28, 29, 5, 5, 0, 0, 29, 125, 1, 0, 0, 0, 30, 125, 5, 33, 0, 0, 31, 32, 5, 16, 0, 0, 32, 33, 5, 1, 0, 0, 33, 34, 5, 51, 0, 0, 34, 35, 5, 4, 0, 0, 35, 36, 5, 53, 0, 0, 36, 125, 5, 2, 0, 0, 37, 38, 7, 1, 0, 0, 38, 125, 3, 0, 0, 27, 39, 40, 7, 2, 0, 0, 40, 41, 5, 1, 0, 0, 41, 42, 3, 0, 0, 0, 42, 43, 5, 4, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 2, 0, 0, 45, 125, 1, 0, 0, 0, 46, 47, 7, 3, 0, 0, 47, 48, 5, 1, 0, 0, 48, 49, 3, 0, 0, 0, 49, 50, 5, 4, 0, 0, 50, 51, 3, 0, 0, 0, 51, 52, 5, 2, 0, 0, 52, 125, 1, 0, 0, 0, 53, 54, 7, 4, 0, 0, 54, 55, 5, 1, 0, 0, 55, 56, 3, 0, 0, 0, 56, 57, 5, 4, 0, 0, 57, 58, 3, 0, 0, 0, 58, 59, 5, 2, 0, 0, 59, 125, 1, 0, 0, 0, 60, 61, 5, 41, 0, 0, 61, 62, 5, 1, 0, 0, 62, 63, 5, 51, 0, 0, 63, 64, 5, 4, 0, 0, 64, 65, 5, 53, 0, 0, 65, 125, 5, 2, 0, 0, 66, 67, 5, 42, 0, 0, 67, 68, 5, 1, 0, 0, 68, 69, 5, 51, 0, 0, 69, 70, 5, 4, 0, 0, 70, 71, 5, 53, 0, 0, 71, 125, 5, 2, 0, 0, 72, 73, 5, 43, 0, 0, 73, 74, 5, 1, 0, 0, 74, 75, 5, 51, 0, 0, 75, 76, 5, 4, 0, 0, 76, 77, 5, 53, 0, 0, 77, 125, 5, 2, 0, 0, 78, 79, 5, 44, 0, 0, 79, 80, 5, 1, 0, 0, 80, 81, 5, 51, 0, 0, 81, 82, 5, 4, 0, 0, 82, 83, 5, 53, 0, 0, 83, 125, 5, 2, 0, 0, 84, 85, 5, 45, 0, 0, 85, 86, 5, 1, 0, 0, 86, 87, 5, 51, 0, 0, 87, 88, 5, 4, 0, 0, 88, 89, 5, 53, 0, 0, 89, 125, 5, 2, 0, 0, 90, 91, 5, 46, 0, 0, 91, 92, 5, 1, 0, 0, 92, 93, 5, 51, 0, 0, 93, 94, 5, 4, 0, 0, 94, 95, 5, 53, 0, 0, 95, 125, 5, 2, 0, 0, 96, 97, 5, 47, 0, 0, 97, 98, 5, 1, 0, 0, 98, 99, 5, 51, 0, 0, 99, 100, 5, 4, 0, 0, 100, 101, 5, 53, 0, 0, 101, 125, 5, 2, 0, 0, 102, 103, 5, 40, 0, 0, 103, 104, 5, 1, 0, 0, 104, 105, 7, 5, 0, 0, 105, 125, 5, 2, 0, 0, 106, 107, 5, 51, 0, 0, 107, 119, 5, 1, 0, 0, 108, 113, 3, 0, 0, 0, 109, 110, 5, 4, 0, 0, 110, 112, 3, 0, 0, 0, 111, 109, 1, 0, 0, 0, 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 118, 5, 4, 0, 0, 117, 116, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 120, 1, 0, 0, 0, 119, 108, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 125, 5, 2, 0, 0, 122, 123, 5, 15, 0, 0, 123, 125, 3, 0, 0, 1, 124, 2, 1, 0, 0, 0, 124, 4, 1, 0, 0, 0, 124, 5, 1, 0, 0, 0, 124, 6, 1, 0, 0, 0, 124, 7, 1, 0, 0, 0, 124, 8, 1, 0, 0, 0, 124, 9, 1, 0, 0, 0, 124, 12, 1, 0, 0, 0, 124, 16, 1, 0, 0, 0, 124, 30, 1, 0, 0, 0, 124, 31, 1, 0, 0, 0, 124, 37, 1, 0, 0, 0, 124, 39, 1, 0, 0, 0, 124, 46, 1, 0, 0, 0, 124, 53, 1, 0, 0, 0, 124, 60, 1, 0, 0, 0, 124, 66, 1, 0, 0, 0, 124, 72, 1, 0, 0, 0, 124, 78, 1, 0, 0, 0, 124, 84, 1, 0, 0, 0, 124, 90, 1, 0, 0, 0, 124, 96, 1, 0, 0, 0, 124, 102, 1, 0, 0, 0, 124, 106, 1, 0, 0, 0, 124, 122, 1, 0, 0, 0, 125, 180, 1, 0, 0, 0, 126, 127, 10, 28, 0, 0, 127, 128, 5, 22, 0, 0, 128, 179, 3, 0, 0, 29, 129, 130, 10, 26, 0, 0, 130, 131, 7, 6, 0, 0, 131, 179, 3, 0, 0, 27, 132, 133, 10, 25, 0, 0, 133, 134, 7, 7, 0, 0, 134, 179, 3, 0, 0, 26, 135, 136, 10, 24, 0, 0, 136, 137, 7, 8, 0, 0, 137, 179, 3, 0, 0, 25, 138, 140, 10, 23, 0, 0, 139, 141, 5, 31, 0, 0, 140, 139, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 5, 32, 0, 0, 143, 179, 3, 0, 0, 24, 144, 145, 10, 10, 0, 0, 145, 146, 7, 9, 0, 0, 146, 147, 7, 5, 0, 0, 147, 148, 7, 9, 0, 0, 148, 179, 3, 0, 0, 11, 149, 150, 10, 9, 0, 0, 150, 151, 7, 10, 0, 0, 151, 152, 7, 5, 0, 0, 152, 153, 7, 10, 0, 0, 153, 179, 3, 0, 0, 10, 154, 155, 10, 8, 0, 0, 155, 156, 7, 11, 0, 0, 156, 179, 3, 0, 0, 9, 157, 158, 10, 7, 0, 0, 158, 159, 7, 12, 0, 0, 159, 179, 3, 0, 0, 8, 160, 161, 10, 6, 0, 0, 161, 162, 5, 25, 0, 0, 162, 179, 3, 0, 0, 7, 163, 164, 10, 5, 0, 0, 164, 165, 5, 27, 0, 0, 165, 179, 3, 0, 0, 6, 166, 167, 10, 4, 0, 0, 167, 168, 5, 26, 0, 0, 168, 179, 3, 0, 0, 5, 169, 170, 10, 3, 0, 0, 170, 171, 5, 28, 0, 0, 171, 179, 3, 0, 0, 4, 172, 173, 10, 2, 0, 0, 173, 174, 5, 29, 0, 0, 174, 179, 3, 0, 0, 3, 175, 176, 10, 30, 0, 0, 176, 177, 5, 14, 0, 0, 177, 179, 5, 53, 0, 0, 178, 126, 1, 0, 0, 0, 178, 129, 1, 0, 0, 0, 178, 132, 1, 0, 0, 0, 178, 135, 1, 0, 0, 0, 178, 138, 1, 0, 0, 0, 178, 144, 1, 0, 0, 0, 178, 149, 1, 0, 0, 0, 178, 154, 1, 0, 0, 0, 178, 157, 1, 0, 0, 0, 178, 160, 1, 0, 0, 0, 178, 163, 1, 0, 0, 0, 178, 166, 1, 0, 0, 0, 178, 169, 1, 0, 0, 0, 178, 172, 1, 0, 0, 0, 178, 175, 1, 0, 0, 0, 179, 182, 1, 0, 0, 0, 180, 178, 1, 0, 0, 0, 180, 181, 1, 0, 0, 0, 181, 1, 1, 0, 0, 0, 182, 180, 1, 0, 0, 0, 9, 22, 26, 113, 117, 119, 124, 140, 178, 180] \ No newline at end of file diff --git a/internal/parser/planparserv2/generated/Plan.tokens b/internal/parser/planparserv2/generated/Plan.tokens index 0b084bff8ff8d..f19bc3be41e16 100644 --- a/internal/parser/planparserv2/generated/Plan.tokens +++ b/internal/parser/planparserv2/generated/Plan.tokens @@ -38,15 +38,22 @@ ArrayContains=37 ArrayContainsAll=38 ArrayContainsAny=39 ArrayLength=40 -BooleanConstant=41 -IntegerConstant=42 -FloatingConstant=43 -Identifier=44 -Meta=45 -StringLiteral=46 -JSONIdentifier=47 -Whitespace=48 -Newline=49 +STEuqals=41 +STTouches=42 +STOverlaps=43 +STCrosses=44 +STContains=45 +STIntersects=46 +STWithin=47 +BooleanConstant=48 +IntegerConstant=49 +FloatingConstant=50 +Identifier=51 +Meta=52 +StringLiteral=53 +JSONIdentifier=54 +Whitespace=55 +Newline=56 '('=1 ')'=2 '['=3 @@ -72,4 +79,4 @@ Newline=49 '|'=26 '^'=27 '~'=30 -'$meta'=45 +'$meta'=52 diff --git a/internal/parser/planparserv2/generated/PlanLexer.interp b/internal/parser/planparserv2/generated/PlanLexer.interp index 1e6840b0065bc..ce640ddf60aa5 100644 --- a/internal/parser/planparserv2/generated/PlanLexer.interp +++ b/internal/parser/planparserv2/generated/PlanLexer.interp @@ -44,6 +44,13 @@ null null null null +null +null +null +null +null +null +null '$meta' null null @@ -92,6 +99,13 @@ ArrayContains ArrayContainsAll ArrayContainsAny ArrayLength +STEuqals +STTouches +STOverlaps +STCrosses +STContains +STIntersects +STWithin BooleanConstant IntegerConstant FloatingConstant @@ -143,6 +157,13 @@ ArrayContains ArrayContainsAll ArrayContainsAny ArrayLength +STEuqals +STTouches +STOverlaps +STCrosses +STContains +STIntersects +STWithin BooleanConstant IntegerConstant FloatingConstant @@ -186,4 +207,4 @@ mode names: DEFAULT_MODE atn: -[4, 0, 49, 782, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 188, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 202, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 224, 8, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 3, 27, 256, 8, 27, 1, 28, 1, 28, 1, 28, 1, 28, 3, 28, 262, 8, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 3, 30, 270, 8, 30, 1, 31, 1, 31, 1, 31, 1, 31, 3, 31, 276, 8, 31, 1, 32, 1, 32, 1, 32, 5, 32, 281, 8, 32, 10, 32, 12, 32, 284, 9, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 3, 33, 314, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 350, 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 3, 35, 386, 8, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 416, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 3, 37, 454, 8, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 492, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 3, 39, 518, 8, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 547, 8, 40, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 553, 8, 41, 1, 42, 1, 42, 3, 42, 557, 8, 42, 1, 43, 1, 43, 1, 43, 5, 43, 562, 8, 43, 10, 43, 12, 43, 565, 9, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 3, 45, 574, 8, 45, 1, 45, 1, 45, 3, 45, 578, 8, 45, 1, 45, 1, 45, 1, 45, 3, 45, 583, 8, 45, 1, 45, 3, 45, 586, 8, 45, 1, 46, 1, 46, 3, 46, 590, 8, 46, 1, 46, 1, 46, 1, 46, 3, 46, 595, 8, 46, 1, 46, 1, 46, 4, 46, 599, 8, 46, 11, 46, 12, 46, 600, 1, 47, 1, 47, 1, 47, 3, 47, 606, 8, 47, 1, 48, 4, 48, 609, 8, 48, 11, 48, 12, 48, 610, 1, 49, 4, 49, 614, 8, 49, 11, 49, 12, 49, 615, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 3, 50, 625, 8, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 3, 51, 634, 8, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 4, 54, 643, 8, 54, 11, 54, 12, 54, 644, 1, 55, 1, 55, 5, 55, 649, 8, 55, 10, 55, 12, 55, 652, 9, 55, 1, 55, 3, 55, 655, 8, 55, 1, 56, 1, 56, 5, 56, 659, 8, 56, 10, 56, 12, 56, 662, 9, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 3, 62, 689, 8, 62, 1, 63, 1, 63, 3, 63, 693, 8, 63, 1, 63, 1, 63, 1, 63, 3, 63, 698, 8, 63, 1, 64, 1, 64, 1, 64, 1, 64, 3, 64, 704, 8, 64, 1, 64, 1, 64, 1, 65, 3, 65, 709, 8, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 3, 65, 716, 8, 65, 1, 66, 1, 66, 3, 66, 720, 8, 66, 1, 66, 1, 66, 1, 67, 4, 67, 725, 8, 67, 11, 67, 12, 67, 726, 1, 68, 3, 68, 730, 8, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 3, 68, 737, 8, 68, 1, 69, 4, 69, 740, 8, 69, 11, 69, 12, 69, 741, 1, 70, 1, 70, 3, 70, 746, 8, 70, 1, 70, 1, 70, 1, 71, 1, 71, 1, 71, 1, 71, 1, 71, 3, 71, 755, 8, 71, 1, 71, 3, 71, 758, 8, 71, 1, 71, 1, 71, 1, 71, 1, 71, 1, 71, 3, 71, 765, 8, 71, 1, 72, 4, 72, 768, 8, 72, 11, 72, 12, 72, 769, 1, 72, 1, 72, 1, 73, 1, 73, 3, 73, 776, 8, 73, 1, 73, 3, 73, 779, 8, 73, 1, 73, 1, 73, 0, 0, 74, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 0, 97, 0, 99, 0, 101, 0, 103, 0, 105, 0, 107, 0, 109, 0, 111, 0, 113, 0, 115, 0, 117, 0, 119, 0, 121, 0, 123, 0, 125, 0, 127, 0, 129, 0, 131, 0, 133, 0, 135, 0, 137, 0, 139, 0, 141, 0, 143, 0, 145, 48, 147, 49, 1, 0, 16, 3, 0, 76, 76, 85, 85, 117, 117, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 4, 0, 10, 10, 13, 13, 39, 39, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, 48, 57, 2, 0, 66, 66, 98, 98, 1, 0, 48, 49, 2, 0, 88, 88, 120, 120, 1, 0, 49, 57, 1, 0, 48, 55, 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, 101, 2, 0, 43, 43, 45, 45, 2, 0, 80, 80, 112, 112, 10, 0, 34, 34, 39, 39, 63, 63, 92, 92, 97, 98, 102, 102, 110, 110, 114, 114, 116, 116, 118, 118, 2, 0, 9, 9, 32, 32, 823, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 145, 1, 0, 0, 0, 0, 147, 1, 0, 0, 0, 1, 149, 1, 0, 0, 0, 3, 151, 1, 0, 0, 0, 5, 153, 1, 0, 0, 0, 7, 155, 1, 0, 0, 0, 9, 157, 1, 0, 0, 0, 11, 159, 1, 0, 0, 0, 13, 161, 1, 0, 0, 0, 15, 163, 1, 0, 0, 0, 17, 165, 1, 0, 0, 0, 19, 168, 1, 0, 0, 0, 21, 170, 1, 0, 0, 0, 23, 173, 1, 0, 0, 0, 25, 176, 1, 0, 0, 0, 27, 187, 1, 0, 0, 0, 29, 201, 1, 0, 0, 0, 31, 223, 1, 0, 0, 0, 33, 225, 1, 0, 0, 0, 35, 227, 1, 0, 0, 0, 37, 229, 1, 0, 0, 0, 39, 231, 1, 0, 0, 0, 41, 233, 1, 0, 0, 0, 43, 235, 1, 0, 0, 0, 45, 238, 1, 0, 0, 0, 47, 241, 1, 0, 0, 0, 49, 244, 1, 0, 0, 0, 51, 246, 1, 0, 0, 0, 53, 248, 1, 0, 0, 0, 55, 255, 1, 0, 0, 0, 57, 261, 1, 0, 0, 0, 59, 263, 1, 0, 0, 0, 61, 269, 1, 0, 0, 0, 63, 275, 1, 0, 0, 0, 65, 277, 1, 0, 0, 0, 67, 313, 1, 0, 0, 0, 69, 349, 1, 0, 0, 0, 71, 385, 1, 0, 0, 0, 73, 415, 1, 0, 0, 0, 75, 453, 1, 0, 0, 0, 77, 491, 1, 0, 0, 0, 79, 517, 1, 0, 0, 0, 81, 546, 1, 0, 0, 0, 83, 552, 1, 0, 0, 0, 85, 556, 1, 0, 0, 0, 87, 558, 1, 0, 0, 0, 89, 566, 1, 0, 0, 0, 91, 573, 1, 0, 0, 0, 93, 589, 1, 0, 0, 0, 95, 605, 1, 0, 0, 0, 97, 608, 1, 0, 0, 0, 99, 613, 1, 0, 0, 0, 101, 624, 1, 0, 0, 0, 103, 633, 1, 0, 0, 0, 105, 635, 1, 0, 0, 0, 107, 637, 1, 0, 0, 0, 109, 639, 1, 0, 0, 0, 111, 654, 1, 0, 0, 0, 113, 656, 1, 0, 0, 0, 115, 663, 1, 0, 0, 0, 117, 667, 1, 0, 0, 0, 119, 669, 1, 0, 0, 0, 121, 671, 1, 0, 0, 0, 123, 673, 1, 0, 0, 0, 125, 688, 1, 0, 0, 0, 127, 697, 1, 0, 0, 0, 129, 699, 1, 0, 0, 0, 131, 715, 1, 0, 0, 0, 133, 717, 1, 0, 0, 0, 135, 724, 1, 0, 0, 0, 137, 736, 1, 0, 0, 0, 139, 739, 1, 0, 0, 0, 141, 743, 1, 0, 0, 0, 143, 764, 1, 0, 0, 0, 145, 767, 1, 0, 0, 0, 147, 778, 1, 0, 0, 0, 149, 150, 5, 40, 0, 0, 150, 2, 1, 0, 0, 0, 151, 152, 5, 41, 0, 0, 152, 4, 1, 0, 0, 0, 153, 154, 5, 91, 0, 0, 154, 6, 1, 0, 0, 0, 155, 156, 5, 44, 0, 0, 156, 8, 1, 0, 0, 0, 157, 158, 5, 93, 0, 0, 158, 10, 1, 0, 0, 0, 159, 160, 5, 123, 0, 0, 160, 12, 1, 0, 0, 0, 161, 162, 5, 125, 0, 0, 162, 14, 1, 0, 0, 0, 163, 164, 5, 60, 0, 0, 164, 16, 1, 0, 0, 0, 165, 166, 5, 60, 0, 0, 166, 167, 5, 61, 0, 0, 167, 18, 1, 0, 0, 0, 168, 169, 5, 62, 0, 0, 169, 20, 1, 0, 0, 0, 170, 171, 5, 62, 0, 0, 171, 172, 5, 61, 0, 0, 172, 22, 1, 0, 0, 0, 173, 174, 5, 61, 0, 0, 174, 175, 5, 61, 0, 0, 175, 24, 1, 0, 0, 0, 176, 177, 5, 33, 0, 0, 177, 178, 5, 61, 0, 0, 178, 26, 1, 0, 0, 0, 179, 180, 5, 108, 0, 0, 180, 181, 5, 105, 0, 0, 181, 182, 5, 107, 0, 0, 182, 188, 5, 101, 0, 0, 183, 184, 5, 76, 0, 0, 184, 185, 5, 73, 0, 0, 185, 186, 5, 75, 0, 0, 186, 188, 5, 69, 0, 0, 187, 179, 1, 0, 0, 0, 187, 183, 1, 0, 0, 0, 188, 28, 1, 0, 0, 0, 189, 190, 5, 101, 0, 0, 190, 191, 5, 120, 0, 0, 191, 192, 5, 105, 0, 0, 192, 193, 5, 115, 0, 0, 193, 194, 5, 116, 0, 0, 194, 202, 5, 115, 0, 0, 195, 196, 5, 69, 0, 0, 196, 197, 5, 88, 0, 0, 197, 198, 5, 73, 0, 0, 198, 199, 5, 83, 0, 0, 199, 200, 5, 84, 0, 0, 200, 202, 5, 83, 0, 0, 201, 189, 1, 0, 0, 0, 201, 195, 1, 0, 0, 0, 202, 30, 1, 0, 0, 0, 203, 204, 5, 116, 0, 0, 204, 205, 5, 101, 0, 0, 205, 206, 5, 120, 0, 0, 206, 207, 5, 116, 0, 0, 207, 208, 5, 95, 0, 0, 208, 209, 5, 109, 0, 0, 209, 210, 5, 97, 0, 0, 210, 211, 5, 116, 0, 0, 211, 212, 5, 99, 0, 0, 212, 224, 5, 104, 0, 0, 213, 214, 5, 84, 0, 0, 214, 215, 5, 69, 0, 0, 215, 216, 5, 88, 0, 0, 216, 217, 5, 84, 0, 0, 217, 218, 5, 95, 0, 0, 218, 219, 5, 77, 0, 0, 219, 220, 5, 65, 0, 0, 220, 221, 5, 84, 0, 0, 221, 222, 5, 67, 0, 0, 222, 224, 5, 72, 0, 0, 223, 203, 1, 0, 0, 0, 223, 213, 1, 0, 0, 0, 224, 32, 1, 0, 0, 0, 225, 226, 5, 43, 0, 0, 226, 34, 1, 0, 0, 0, 227, 228, 5, 45, 0, 0, 228, 36, 1, 0, 0, 0, 229, 230, 5, 42, 0, 0, 230, 38, 1, 0, 0, 0, 231, 232, 5, 47, 0, 0, 232, 40, 1, 0, 0, 0, 233, 234, 5, 37, 0, 0, 234, 42, 1, 0, 0, 0, 235, 236, 5, 42, 0, 0, 236, 237, 5, 42, 0, 0, 237, 44, 1, 0, 0, 0, 238, 239, 5, 60, 0, 0, 239, 240, 5, 60, 0, 0, 240, 46, 1, 0, 0, 0, 241, 242, 5, 62, 0, 0, 242, 243, 5, 62, 0, 0, 243, 48, 1, 0, 0, 0, 244, 245, 5, 38, 0, 0, 245, 50, 1, 0, 0, 0, 246, 247, 5, 124, 0, 0, 247, 52, 1, 0, 0, 0, 248, 249, 5, 94, 0, 0, 249, 54, 1, 0, 0, 0, 250, 251, 5, 38, 0, 0, 251, 256, 5, 38, 0, 0, 252, 253, 5, 97, 0, 0, 253, 254, 5, 110, 0, 0, 254, 256, 5, 100, 0, 0, 255, 250, 1, 0, 0, 0, 255, 252, 1, 0, 0, 0, 256, 56, 1, 0, 0, 0, 257, 258, 5, 124, 0, 0, 258, 262, 5, 124, 0, 0, 259, 260, 5, 111, 0, 0, 260, 262, 5, 114, 0, 0, 261, 257, 1, 0, 0, 0, 261, 259, 1, 0, 0, 0, 262, 58, 1, 0, 0, 0, 263, 264, 5, 126, 0, 0, 264, 60, 1, 0, 0, 0, 265, 270, 5, 33, 0, 0, 266, 267, 5, 110, 0, 0, 267, 268, 5, 111, 0, 0, 268, 270, 5, 116, 0, 0, 269, 265, 1, 0, 0, 0, 269, 266, 1, 0, 0, 0, 270, 62, 1, 0, 0, 0, 271, 272, 5, 105, 0, 0, 272, 276, 5, 110, 0, 0, 273, 274, 5, 73, 0, 0, 274, 276, 5, 78, 0, 0, 275, 271, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 276, 64, 1, 0, 0, 0, 277, 282, 5, 91, 0, 0, 278, 281, 3, 145, 72, 0, 279, 281, 3, 147, 73, 0, 280, 278, 1, 0, 0, 0, 280, 279, 1, 0, 0, 0, 281, 284, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 282, 283, 1, 0, 0, 0, 283, 285, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 285, 286, 5, 93, 0, 0, 286, 66, 1, 0, 0, 0, 287, 288, 5, 106, 0, 0, 288, 289, 5, 115, 0, 0, 289, 290, 5, 111, 0, 0, 290, 291, 5, 110, 0, 0, 291, 292, 5, 95, 0, 0, 292, 293, 5, 99, 0, 0, 293, 294, 5, 111, 0, 0, 294, 295, 5, 110, 0, 0, 295, 296, 5, 116, 0, 0, 296, 297, 5, 97, 0, 0, 297, 298, 5, 105, 0, 0, 298, 299, 5, 110, 0, 0, 299, 314, 5, 115, 0, 0, 300, 301, 5, 74, 0, 0, 301, 302, 5, 83, 0, 0, 302, 303, 5, 79, 0, 0, 303, 304, 5, 78, 0, 0, 304, 305, 5, 95, 0, 0, 305, 306, 5, 67, 0, 0, 306, 307, 5, 79, 0, 0, 307, 308, 5, 78, 0, 0, 308, 309, 5, 84, 0, 0, 309, 310, 5, 65, 0, 0, 310, 311, 5, 73, 0, 0, 311, 312, 5, 78, 0, 0, 312, 314, 5, 83, 0, 0, 313, 287, 1, 0, 0, 0, 313, 300, 1, 0, 0, 0, 314, 68, 1, 0, 0, 0, 315, 316, 5, 106, 0, 0, 316, 317, 5, 115, 0, 0, 317, 318, 5, 111, 0, 0, 318, 319, 5, 110, 0, 0, 319, 320, 5, 95, 0, 0, 320, 321, 5, 99, 0, 0, 321, 322, 5, 111, 0, 0, 322, 323, 5, 110, 0, 0, 323, 324, 5, 116, 0, 0, 324, 325, 5, 97, 0, 0, 325, 326, 5, 105, 0, 0, 326, 327, 5, 110, 0, 0, 327, 328, 5, 115, 0, 0, 328, 329, 5, 95, 0, 0, 329, 330, 5, 97, 0, 0, 330, 331, 5, 108, 0, 0, 331, 350, 5, 108, 0, 0, 332, 333, 5, 74, 0, 0, 333, 334, 5, 83, 0, 0, 334, 335, 5, 79, 0, 0, 335, 336, 5, 78, 0, 0, 336, 337, 5, 95, 0, 0, 337, 338, 5, 67, 0, 0, 338, 339, 5, 79, 0, 0, 339, 340, 5, 78, 0, 0, 340, 341, 5, 84, 0, 0, 341, 342, 5, 65, 0, 0, 342, 343, 5, 73, 0, 0, 343, 344, 5, 78, 0, 0, 344, 345, 5, 83, 0, 0, 345, 346, 5, 95, 0, 0, 346, 347, 5, 65, 0, 0, 347, 348, 5, 76, 0, 0, 348, 350, 5, 76, 0, 0, 349, 315, 1, 0, 0, 0, 349, 332, 1, 0, 0, 0, 350, 70, 1, 0, 0, 0, 351, 352, 5, 106, 0, 0, 352, 353, 5, 115, 0, 0, 353, 354, 5, 111, 0, 0, 354, 355, 5, 110, 0, 0, 355, 356, 5, 95, 0, 0, 356, 357, 5, 99, 0, 0, 357, 358, 5, 111, 0, 0, 358, 359, 5, 110, 0, 0, 359, 360, 5, 116, 0, 0, 360, 361, 5, 97, 0, 0, 361, 362, 5, 105, 0, 0, 362, 363, 5, 110, 0, 0, 363, 364, 5, 115, 0, 0, 364, 365, 5, 95, 0, 0, 365, 366, 5, 97, 0, 0, 366, 367, 5, 110, 0, 0, 367, 386, 5, 121, 0, 0, 368, 369, 5, 74, 0, 0, 369, 370, 5, 83, 0, 0, 370, 371, 5, 79, 0, 0, 371, 372, 5, 78, 0, 0, 372, 373, 5, 95, 0, 0, 373, 374, 5, 67, 0, 0, 374, 375, 5, 79, 0, 0, 375, 376, 5, 78, 0, 0, 376, 377, 5, 84, 0, 0, 377, 378, 5, 65, 0, 0, 378, 379, 5, 73, 0, 0, 379, 380, 5, 78, 0, 0, 380, 381, 5, 83, 0, 0, 381, 382, 5, 95, 0, 0, 382, 383, 5, 65, 0, 0, 383, 384, 5, 78, 0, 0, 384, 386, 5, 89, 0, 0, 385, 351, 1, 0, 0, 0, 385, 368, 1, 0, 0, 0, 386, 72, 1, 0, 0, 0, 387, 388, 5, 97, 0, 0, 388, 389, 5, 114, 0, 0, 389, 390, 5, 114, 0, 0, 390, 391, 5, 97, 0, 0, 391, 392, 5, 121, 0, 0, 392, 393, 5, 95, 0, 0, 393, 394, 5, 99, 0, 0, 394, 395, 5, 111, 0, 0, 395, 396, 5, 110, 0, 0, 396, 397, 5, 116, 0, 0, 397, 398, 5, 97, 0, 0, 398, 399, 5, 105, 0, 0, 399, 400, 5, 110, 0, 0, 400, 416, 5, 115, 0, 0, 401, 402, 5, 65, 0, 0, 402, 403, 5, 82, 0, 0, 403, 404, 5, 82, 0, 0, 404, 405, 5, 65, 0, 0, 405, 406, 5, 89, 0, 0, 406, 407, 5, 95, 0, 0, 407, 408, 5, 67, 0, 0, 408, 409, 5, 79, 0, 0, 409, 410, 5, 78, 0, 0, 410, 411, 5, 84, 0, 0, 411, 412, 5, 65, 0, 0, 412, 413, 5, 73, 0, 0, 413, 414, 5, 78, 0, 0, 414, 416, 5, 83, 0, 0, 415, 387, 1, 0, 0, 0, 415, 401, 1, 0, 0, 0, 416, 74, 1, 0, 0, 0, 417, 418, 5, 97, 0, 0, 418, 419, 5, 114, 0, 0, 419, 420, 5, 114, 0, 0, 420, 421, 5, 97, 0, 0, 421, 422, 5, 121, 0, 0, 422, 423, 5, 95, 0, 0, 423, 424, 5, 99, 0, 0, 424, 425, 5, 111, 0, 0, 425, 426, 5, 110, 0, 0, 426, 427, 5, 116, 0, 0, 427, 428, 5, 97, 0, 0, 428, 429, 5, 105, 0, 0, 429, 430, 5, 110, 0, 0, 430, 431, 5, 115, 0, 0, 431, 432, 5, 95, 0, 0, 432, 433, 5, 97, 0, 0, 433, 434, 5, 108, 0, 0, 434, 454, 5, 108, 0, 0, 435, 436, 5, 65, 0, 0, 436, 437, 5, 82, 0, 0, 437, 438, 5, 82, 0, 0, 438, 439, 5, 65, 0, 0, 439, 440, 5, 89, 0, 0, 440, 441, 5, 95, 0, 0, 441, 442, 5, 67, 0, 0, 442, 443, 5, 79, 0, 0, 443, 444, 5, 78, 0, 0, 444, 445, 5, 84, 0, 0, 445, 446, 5, 65, 0, 0, 446, 447, 5, 73, 0, 0, 447, 448, 5, 78, 0, 0, 448, 449, 5, 83, 0, 0, 449, 450, 5, 95, 0, 0, 450, 451, 5, 65, 0, 0, 451, 452, 5, 76, 0, 0, 452, 454, 5, 76, 0, 0, 453, 417, 1, 0, 0, 0, 453, 435, 1, 0, 0, 0, 454, 76, 1, 0, 0, 0, 455, 456, 5, 97, 0, 0, 456, 457, 5, 114, 0, 0, 457, 458, 5, 114, 0, 0, 458, 459, 5, 97, 0, 0, 459, 460, 5, 121, 0, 0, 460, 461, 5, 95, 0, 0, 461, 462, 5, 99, 0, 0, 462, 463, 5, 111, 0, 0, 463, 464, 5, 110, 0, 0, 464, 465, 5, 116, 0, 0, 465, 466, 5, 97, 0, 0, 466, 467, 5, 105, 0, 0, 467, 468, 5, 110, 0, 0, 468, 469, 5, 115, 0, 0, 469, 470, 5, 95, 0, 0, 470, 471, 5, 97, 0, 0, 471, 472, 5, 110, 0, 0, 472, 492, 5, 121, 0, 0, 473, 474, 5, 65, 0, 0, 474, 475, 5, 82, 0, 0, 475, 476, 5, 82, 0, 0, 476, 477, 5, 65, 0, 0, 477, 478, 5, 89, 0, 0, 478, 479, 5, 95, 0, 0, 479, 480, 5, 67, 0, 0, 480, 481, 5, 79, 0, 0, 481, 482, 5, 78, 0, 0, 482, 483, 5, 84, 0, 0, 483, 484, 5, 65, 0, 0, 484, 485, 5, 73, 0, 0, 485, 486, 5, 78, 0, 0, 486, 487, 5, 83, 0, 0, 487, 488, 5, 95, 0, 0, 488, 489, 5, 65, 0, 0, 489, 490, 5, 78, 0, 0, 490, 492, 5, 89, 0, 0, 491, 455, 1, 0, 0, 0, 491, 473, 1, 0, 0, 0, 492, 78, 1, 0, 0, 0, 493, 494, 5, 97, 0, 0, 494, 495, 5, 114, 0, 0, 495, 496, 5, 114, 0, 0, 496, 497, 5, 97, 0, 0, 497, 498, 5, 121, 0, 0, 498, 499, 5, 95, 0, 0, 499, 500, 5, 108, 0, 0, 500, 501, 5, 101, 0, 0, 501, 502, 5, 110, 0, 0, 502, 503, 5, 103, 0, 0, 503, 504, 5, 116, 0, 0, 504, 518, 5, 104, 0, 0, 505, 506, 5, 65, 0, 0, 506, 507, 5, 82, 0, 0, 507, 508, 5, 82, 0, 0, 508, 509, 5, 65, 0, 0, 509, 510, 5, 89, 0, 0, 510, 511, 5, 95, 0, 0, 511, 512, 5, 76, 0, 0, 512, 513, 5, 69, 0, 0, 513, 514, 5, 78, 0, 0, 514, 515, 5, 71, 0, 0, 515, 516, 5, 84, 0, 0, 516, 518, 5, 72, 0, 0, 517, 493, 1, 0, 0, 0, 517, 505, 1, 0, 0, 0, 518, 80, 1, 0, 0, 0, 519, 520, 5, 116, 0, 0, 520, 521, 5, 114, 0, 0, 521, 522, 5, 117, 0, 0, 522, 547, 5, 101, 0, 0, 523, 524, 5, 84, 0, 0, 524, 525, 5, 114, 0, 0, 525, 526, 5, 117, 0, 0, 526, 547, 5, 101, 0, 0, 527, 528, 5, 84, 0, 0, 528, 529, 5, 82, 0, 0, 529, 530, 5, 85, 0, 0, 530, 547, 5, 69, 0, 0, 531, 532, 5, 102, 0, 0, 532, 533, 5, 97, 0, 0, 533, 534, 5, 108, 0, 0, 534, 535, 5, 115, 0, 0, 535, 547, 5, 101, 0, 0, 536, 537, 5, 70, 0, 0, 537, 538, 5, 97, 0, 0, 538, 539, 5, 108, 0, 0, 539, 540, 5, 115, 0, 0, 540, 547, 5, 101, 0, 0, 541, 542, 5, 70, 0, 0, 542, 543, 5, 65, 0, 0, 543, 544, 5, 76, 0, 0, 544, 545, 5, 83, 0, 0, 545, 547, 5, 69, 0, 0, 546, 519, 1, 0, 0, 0, 546, 523, 1, 0, 0, 0, 546, 527, 1, 0, 0, 0, 546, 531, 1, 0, 0, 0, 546, 536, 1, 0, 0, 0, 546, 541, 1, 0, 0, 0, 547, 82, 1, 0, 0, 0, 548, 553, 3, 111, 55, 0, 549, 553, 3, 113, 56, 0, 550, 553, 3, 115, 57, 0, 551, 553, 3, 109, 54, 0, 552, 548, 1, 0, 0, 0, 552, 549, 1, 0, 0, 0, 552, 550, 1, 0, 0, 0, 552, 551, 1, 0, 0, 0, 553, 84, 1, 0, 0, 0, 554, 557, 3, 127, 63, 0, 555, 557, 3, 129, 64, 0, 556, 554, 1, 0, 0, 0, 556, 555, 1, 0, 0, 0, 557, 86, 1, 0, 0, 0, 558, 563, 3, 105, 52, 0, 559, 562, 3, 105, 52, 0, 560, 562, 3, 107, 53, 0, 561, 559, 1, 0, 0, 0, 561, 560, 1, 0, 0, 0, 562, 565, 1, 0, 0, 0, 563, 561, 1, 0, 0, 0, 563, 564, 1, 0, 0, 0, 564, 88, 1, 0, 0, 0, 565, 563, 1, 0, 0, 0, 566, 567, 5, 36, 0, 0, 567, 568, 5, 109, 0, 0, 568, 569, 5, 101, 0, 0, 569, 570, 5, 116, 0, 0, 570, 571, 5, 97, 0, 0, 571, 90, 1, 0, 0, 0, 572, 574, 3, 95, 47, 0, 573, 572, 1, 0, 0, 0, 573, 574, 1, 0, 0, 0, 574, 585, 1, 0, 0, 0, 575, 577, 5, 34, 0, 0, 576, 578, 3, 97, 48, 0, 577, 576, 1, 0, 0, 0, 577, 578, 1, 0, 0, 0, 578, 579, 1, 0, 0, 0, 579, 586, 5, 34, 0, 0, 580, 582, 5, 39, 0, 0, 581, 583, 3, 99, 49, 0, 582, 581, 1, 0, 0, 0, 582, 583, 1, 0, 0, 0, 583, 584, 1, 0, 0, 0, 584, 586, 5, 39, 0, 0, 585, 575, 1, 0, 0, 0, 585, 580, 1, 0, 0, 0, 586, 92, 1, 0, 0, 0, 587, 590, 3, 87, 43, 0, 588, 590, 3, 89, 44, 0, 589, 587, 1, 0, 0, 0, 589, 588, 1, 0, 0, 0, 590, 598, 1, 0, 0, 0, 591, 594, 5, 91, 0, 0, 592, 595, 3, 91, 45, 0, 593, 595, 3, 111, 55, 0, 594, 592, 1, 0, 0, 0, 594, 593, 1, 0, 0, 0, 595, 596, 1, 0, 0, 0, 596, 597, 5, 93, 0, 0, 597, 599, 1, 0, 0, 0, 598, 591, 1, 0, 0, 0, 599, 600, 1, 0, 0, 0, 600, 598, 1, 0, 0, 0, 600, 601, 1, 0, 0, 0, 601, 94, 1, 0, 0, 0, 602, 603, 5, 117, 0, 0, 603, 606, 5, 56, 0, 0, 604, 606, 7, 0, 0, 0, 605, 602, 1, 0, 0, 0, 605, 604, 1, 0, 0, 0, 606, 96, 1, 0, 0, 0, 607, 609, 3, 101, 50, 0, 608, 607, 1, 0, 0, 0, 609, 610, 1, 0, 0, 0, 610, 608, 1, 0, 0, 0, 610, 611, 1, 0, 0, 0, 611, 98, 1, 0, 0, 0, 612, 614, 3, 103, 51, 0, 613, 612, 1, 0, 0, 0, 614, 615, 1, 0, 0, 0, 615, 613, 1, 0, 0, 0, 615, 616, 1, 0, 0, 0, 616, 100, 1, 0, 0, 0, 617, 625, 8, 1, 0, 0, 618, 625, 3, 143, 71, 0, 619, 620, 5, 92, 0, 0, 620, 625, 5, 10, 0, 0, 621, 622, 5, 92, 0, 0, 622, 623, 5, 13, 0, 0, 623, 625, 5, 10, 0, 0, 624, 617, 1, 0, 0, 0, 624, 618, 1, 0, 0, 0, 624, 619, 1, 0, 0, 0, 624, 621, 1, 0, 0, 0, 625, 102, 1, 0, 0, 0, 626, 634, 8, 2, 0, 0, 627, 634, 3, 143, 71, 0, 628, 629, 5, 92, 0, 0, 629, 634, 5, 10, 0, 0, 630, 631, 5, 92, 0, 0, 631, 632, 5, 13, 0, 0, 632, 634, 5, 10, 0, 0, 633, 626, 1, 0, 0, 0, 633, 627, 1, 0, 0, 0, 633, 628, 1, 0, 0, 0, 633, 630, 1, 0, 0, 0, 634, 104, 1, 0, 0, 0, 635, 636, 7, 3, 0, 0, 636, 106, 1, 0, 0, 0, 637, 638, 7, 4, 0, 0, 638, 108, 1, 0, 0, 0, 639, 640, 5, 48, 0, 0, 640, 642, 7, 5, 0, 0, 641, 643, 7, 6, 0, 0, 642, 641, 1, 0, 0, 0, 643, 644, 1, 0, 0, 0, 644, 642, 1, 0, 0, 0, 644, 645, 1, 0, 0, 0, 645, 110, 1, 0, 0, 0, 646, 650, 3, 117, 58, 0, 647, 649, 3, 107, 53, 0, 648, 647, 1, 0, 0, 0, 649, 652, 1, 0, 0, 0, 650, 648, 1, 0, 0, 0, 650, 651, 1, 0, 0, 0, 651, 655, 1, 0, 0, 0, 652, 650, 1, 0, 0, 0, 653, 655, 5, 48, 0, 0, 654, 646, 1, 0, 0, 0, 654, 653, 1, 0, 0, 0, 655, 112, 1, 0, 0, 0, 656, 660, 5, 48, 0, 0, 657, 659, 3, 119, 59, 0, 658, 657, 1, 0, 0, 0, 659, 662, 1, 0, 0, 0, 660, 658, 1, 0, 0, 0, 660, 661, 1, 0, 0, 0, 661, 114, 1, 0, 0, 0, 662, 660, 1, 0, 0, 0, 663, 664, 5, 48, 0, 0, 664, 665, 7, 7, 0, 0, 665, 666, 3, 139, 69, 0, 666, 116, 1, 0, 0, 0, 667, 668, 7, 8, 0, 0, 668, 118, 1, 0, 0, 0, 669, 670, 7, 9, 0, 0, 670, 120, 1, 0, 0, 0, 671, 672, 7, 10, 0, 0, 672, 122, 1, 0, 0, 0, 673, 674, 3, 121, 60, 0, 674, 675, 3, 121, 60, 0, 675, 676, 3, 121, 60, 0, 676, 677, 3, 121, 60, 0, 677, 124, 1, 0, 0, 0, 678, 679, 5, 92, 0, 0, 679, 680, 5, 117, 0, 0, 680, 681, 1, 0, 0, 0, 681, 689, 3, 123, 61, 0, 682, 683, 5, 92, 0, 0, 683, 684, 5, 85, 0, 0, 684, 685, 1, 0, 0, 0, 685, 686, 3, 123, 61, 0, 686, 687, 3, 123, 61, 0, 687, 689, 1, 0, 0, 0, 688, 678, 1, 0, 0, 0, 688, 682, 1, 0, 0, 0, 689, 126, 1, 0, 0, 0, 690, 692, 3, 131, 65, 0, 691, 693, 3, 133, 66, 0, 692, 691, 1, 0, 0, 0, 692, 693, 1, 0, 0, 0, 693, 698, 1, 0, 0, 0, 694, 695, 3, 135, 67, 0, 695, 696, 3, 133, 66, 0, 696, 698, 1, 0, 0, 0, 697, 690, 1, 0, 0, 0, 697, 694, 1, 0, 0, 0, 698, 128, 1, 0, 0, 0, 699, 700, 5, 48, 0, 0, 700, 703, 7, 7, 0, 0, 701, 704, 3, 137, 68, 0, 702, 704, 3, 139, 69, 0, 703, 701, 1, 0, 0, 0, 703, 702, 1, 0, 0, 0, 704, 705, 1, 0, 0, 0, 705, 706, 3, 141, 70, 0, 706, 130, 1, 0, 0, 0, 707, 709, 3, 135, 67, 0, 708, 707, 1, 0, 0, 0, 708, 709, 1, 0, 0, 0, 709, 710, 1, 0, 0, 0, 710, 711, 5, 46, 0, 0, 711, 716, 3, 135, 67, 0, 712, 713, 3, 135, 67, 0, 713, 714, 5, 46, 0, 0, 714, 716, 1, 0, 0, 0, 715, 708, 1, 0, 0, 0, 715, 712, 1, 0, 0, 0, 716, 132, 1, 0, 0, 0, 717, 719, 7, 11, 0, 0, 718, 720, 7, 12, 0, 0, 719, 718, 1, 0, 0, 0, 719, 720, 1, 0, 0, 0, 720, 721, 1, 0, 0, 0, 721, 722, 3, 135, 67, 0, 722, 134, 1, 0, 0, 0, 723, 725, 3, 107, 53, 0, 724, 723, 1, 0, 0, 0, 725, 726, 1, 0, 0, 0, 726, 724, 1, 0, 0, 0, 726, 727, 1, 0, 0, 0, 727, 136, 1, 0, 0, 0, 728, 730, 3, 139, 69, 0, 729, 728, 1, 0, 0, 0, 729, 730, 1, 0, 0, 0, 730, 731, 1, 0, 0, 0, 731, 732, 5, 46, 0, 0, 732, 737, 3, 139, 69, 0, 733, 734, 3, 139, 69, 0, 734, 735, 5, 46, 0, 0, 735, 737, 1, 0, 0, 0, 736, 729, 1, 0, 0, 0, 736, 733, 1, 0, 0, 0, 737, 138, 1, 0, 0, 0, 738, 740, 3, 121, 60, 0, 739, 738, 1, 0, 0, 0, 740, 741, 1, 0, 0, 0, 741, 739, 1, 0, 0, 0, 741, 742, 1, 0, 0, 0, 742, 140, 1, 0, 0, 0, 743, 745, 7, 13, 0, 0, 744, 746, 7, 12, 0, 0, 745, 744, 1, 0, 0, 0, 745, 746, 1, 0, 0, 0, 746, 747, 1, 0, 0, 0, 747, 748, 3, 135, 67, 0, 748, 142, 1, 0, 0, 0, 749, 750, 5, 92, 0, 0, 750, 765, 7, 14, 0, 0, 751, 752, 5, 92, 0, 0, 752, 754, 3, 119, 59, 0, 753, 755, 3, 119, 59, 0, 754, 753, 1, 0, 0, 0, 754, 755, 1, 0, 0, 0, 755, 757, 1, 0, 0, 0, 756, 758, 3, 119, 59, 0, 757, 756, 1, 0, 0, 0, 757, 758, 1, 0, 0, 0, 758, 765, 1, 0, 0, 0, 759, 760, 5, 92, 0, 0, 760, 761, 5, 120, 0, 0, 761, 762, 1, 0, 0, 0, 762, 765, 3, 139, 69, 0, 763, 765, 3, 125, 62, 0, 764, 749, 1, 0, 0, 0, 764, 751, 1, 0, 0, 0, 764, 759, 1, 0, 0, 0, 764, 763, 1, 0, 0, 0, 765, 144, 1, 0, 0, 0, 766, 768, 7, 15, 0, 0, 767, 766, 1, 0, 0, 0, 768, 769, 1, 0, 0, 0, 769, 767, 1, 0, 0, 0, 769, 770, 1, 0, 0, 0, 770, 771, 1, 0, 0, 0, 771, 772, 6, 72, 0, 0, 772, 146, 1, 0, 0, 0, 773, 775, 5, 13, 0, 0, 774, 776, 5, 10, 0, 0, 775, 774, 1, 0, 0, 0, 775, 776, 1, 0, 0, 0, 776, 779, 1, 0, 0, 0, 777, 779, 5, 10, 0, 0, 778, 773, 1, 0, 0, 0, 778, 777, 1, 0, 0, 0, 779, 780, 1, 0, 0, 0, 780, 781, 6, 73, 0, 0, 781, 148, 1, 0, 0, 0, 56, 0, 187, 201, 223, 255, 261, 269, 275, 280, 282, 313, 349, 385, 415, 453, 491, 517, 546, 552, 556, 561, 563, 573, 577, 582, 585, 589, 594, 600, 605, 610, 615, 624, 633, 644, 650, 654, 660, 688, 692, 697, 703, 708, 715, 719, 726, 729, 736, 741, 745, 754, 757, 764, 769, 775, 778, 1, 6, 0, 0] \ No newline at end of file +[4, 0, 56, 956, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 202, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 216, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 238, 8, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 3, 27, 270, 8, 27, 1, 28, 1, 28, 1, 28, 1, 28, 3, 28, 276, 8, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 3, 30, 284, 8, 30, 1, 31, 1, 31, 1, 31, 1, 31, 3, 31, 290, 8, 31, 1, 32, 1, 32, 1, 32, 5, 32, 295, 8, 32, 10, 32, 12, 32, 298, 9, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 3, 33, 328, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 364, 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 3, 35, 400, 8, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 430, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 3, 37, 468, 8, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 506, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 3, 39, 532, 8, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 552, 8, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 574, 8, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 598, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 3, 43, 620, 8, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 3, 44, 644, 8, 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 3, 45, 672, 8, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 3, 46, 692, 8, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 3, 47, 721, 8, 47, 1, 48, 1, 48, 1, 48, 1, 48, 3, 48, 727, 8, 48, 1, 49, 1, 49, 3, 49, 731, 8, 49, 1, 50, 1, 50, 1, 50, 5, 50, 736, 8, 50, 10, 50, 12, 50, 739, 9, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 3, 52, 748, 8, 52, 1, 52, 1, 52, 3, 52, 752, 8, 52, 1, 52, 1, 52, 1, 52, 3, 52, 757, 8, 52, 1, 52, 3, 52, 760, 8, 52, 1, 53, 1, 53, 3, 53, 764, 8, 53, 1, 53, 1, 53, 1, 53, 3, 53, 769, 8, 53, 1, 53, 1, 53, 4, 53, 773, 8, 53, 11, 53, 12, 53, 774, 1, 54, 1, 54, 1, 54, 3, 54, 780, 8, 54, 1, 55, 4, 55, 783, 8, 55, 11, 55, 12, 55, 784, 1, 56, 4, 56, 788, 8, 56, 11, 56, 12, 56, 789, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 3, 57, 799, 8, 57, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 1, 58, 3, 58, 808, 8, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 4, 61, 817, 8, 61, 11, 61, 12, 61, 818, 1, 62, 1, 62, 5, 62, 823, 8, 62, 10, 62, 12, 62, 826, 9, 62, 1, 62, 3, 62, 829, 8, 62, 1, 63, 1, 63, 5, 63, 833, 8, 63, 10, 63, 12, 63, 836, 9, 63, 1, 64, 1, 64, 1, 64, 1, 64, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 68, 1, 68, 1, 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 3, 69, 863, 8, 69, 1, 70, 1, 70, 3, 70, 867, 8, 70, 1, 70, 1, 70, 1, 70, 3, 70, 872, 8, 70, 1, 71, 1, 71, 1, 71, 1, 71, 3, 71, 878, 8, 71, 1, 71, 1, 71, 1, 72, 3, 72, 883, 8, 72, 1, 72, 1, 72, 1, 72, 1, 72, 1, 72, 3, 72, 890, 8, 72, 1, 73, 1, 73, 3, 73, 894, 8, 73, 1, 73, 1, 73, 1, 74, 4, 74, 899, 8, 74, 11, 74, 12, 74, 900, 1, 75, 3, 75, 904, 8, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 3, 75, 911, 8, 75, 1, 76, 4, 76, 914, 8, 76, 11, 76, 12, 76, 915, 1, 77, 1, 77, 3, 77, 920, 8, 77, 1, 77, 1, 77, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 3, 78, 929, 8, 78, 1, 78, 3, 78, 932, 8, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 3, 78, 939, 8, 78, 1, 79, 4, 79, 942, 8, 79, 11, 79, 12, 79, 943, 1, 79, 1, 79, 1, 80, 1, 80, 3, 80, 950, 8, 80, 1, 80, 3, 80, 953, 8, 80, 1, 80, 1, 80, 0, 0, 81, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 48, 97, 49, 99, 50, 101, 51, 103, 52, 105, 53, 107, 54, 109, 0, 111, 0, 113, 0, 115, 0, 117, 0, 119, 0, 121, 0, 123, 0, 125, 0, 127, 0, 129, 0, 131, 0, 133, 0, 135, 0, 137, 0, 139, 0, 141, 0, 143, 0, 145, 0, 147, 0, 149, 0, 151, 0, 153, 0, 155, 0, 157, 0, 159, 55, 161, 56, 1, 0, 16, 3, 0, 76, 76, 85, 85, 117, 117, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 4, 0, 10, 10, 13, 13, 39, 39, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, 48, 57, 2, 0, 66, 66, 98, 98, 1, 0, 48, 49, 2, 0, 88, 88, 120, 120, 1, 0, 49, 57, 1, 0, 48, 55, 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, 101, 2, 0, 43, 43, 45, 45, 2, 0, 80, 80, 112, 112, 10, 0, 34, 34, 39, 39, 63, 63, 92, 92, 97, 98, 102, 102, 110, 110, 114, 114, 116, 116, 118, 118, 2, 0, 9, 9, 32, 32, 1004, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, 0, 0, 0, 0, 99, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 105, 1, 0, 0, 0, 0, 107, 1, 0, 0, 0, 0, 159, 1, 0, 0, 0, 0, 161, 1, 0, 0, 0, 1, 163, 1, 0, 0, 0, 3, 165, 1, 0, 0, 0, 5, 167, 1, 0, 0, 0, 7, 169, 1, 0, 0, 0, 9, 171, 1, 0, 0, 0, 11, 173, 1, 0, 0, 0, 13, 175, 1, 0, 0, 0, 15, 177, 1, 0, 0, 0, 17, 179, 1, 0, 0, 0, 19, 182, 1, 0, 0, 0, 21, 184, 1, 0, 0, 0, 23, 187, 1, 0, 0, 0, 25, 190, 1, 0, 0, 0, 27, 201, 1, 0, 0, 0, 29, 215, 1, 0, 0, 0, 31, 237, 1, 0, 0, 0, 33, 239, 1, 0, 0, 0, 35, 241, 1, 0, 0, 0, 37, 243, 1, 0, 0, 0, 39, 245, 1, 0, 0, 0, 41, 247, 1, 0, 0, 0, 43, 249, 1, 0, 0, 0, 45, 252, 1, 0, 0, 0, 47, 255, 1, 0, 0, 0, 49, 258, 1, 0, 0, 0, 51, 260, 1, 0, 0, 0, 53, 262, 1, 0, 0, 0, 55, 269, 1, 0, 0, 0, 57, 275, 1, 0, 0, 0, 59, 277, 1, 0, 0, 0, 61, 283, 1, 0, 0, 0, 63, 289, 1, 0, 0, 0, 65, 291, 1, 0, 0, 0, 67, 327, 1, 0, 0, 0, 69, 363, 1, 0, 0, 0, 71, 399, 1, 0, 0, 0, 73, 429, 1, 0, 0, 0, 75, 467, 1, 0, 0, 0, 77, 505, 1, 0, 0, 0, 79, 531, 1, 0, 0, 0, 81, 551, 1, 0, 0, 0, 83, 573, 1, 0, 0, 0, 85, 597, 1, 0, 0, 0, 87, 619, 1, 0, 0, 0, 89, 643, 1, 0, 0, 0, 91, 671, 1, 0, 0, 0, 93, 691, 1, 0, 0, 0, 95, 720, 1, 0, 0, 0, 97, 726, 1, 0, 0, 0, 99, 730, 1, 0, 0, 0, 101, 732, 1, 0, 0, 0, 103, 740, 1, 0, 0, 0, 105, 747, 1, 0, 0, 0, 107, 763, 1, 0, 0, 0, 109, 779, 1, 0, 0, 0, 111, 782, 1, 0, 0, 0, 113, 787, 1, 0, 0, 0, 115, 798, 1, 0, 0, 0, 117, 807, 1, 0, 0, 0, 119, 809, 1, 0, 0, 0, 121, 811, 1, 0, 0, 0, 123, 813, 1, 0, 0, 0, 125, 828, 1, 0, 0, 0, 127, 830, 1, 0, 0, 0, 129, 837, 1, 0, 0, 0, 131, 841, 1, 0, 0, 0, 133, 843, 1, 0, 0, 0, 135, 845, 1, 0, 0, 0, 137, 847, 1, 0, 0, 0, 139, 862, 1, 0, 0, 0, 141, 871, 1, 0, 0, 0, 143, 873, 1, 0, 0, 0, 145, 889, 1, 0, 0, 0, 147, 891, 1, 0, 0, 0, 149, 898, 1, 0, 0, 0, 151, 910, 1, 0, 0, 0, 153, 913, 1, 0, 0, 0, 155, 917, 1, 0, 0, 0, 157, 938, 1, 0, 0, 0, 159, 941, 1, 0, 0, 0, 161, 952, 1, 0, 0, 0, 163, 164, 5, 40, 0, 0, 164, 2, 1, 0, 0, 0, 165, 166, 5, 41, 0, 0, 166, 4, 1, 0, 0, 0, 167, 168, 5, 91, 0, 0, 168, 6, 1, 0, 0, 0, 169, 170, 5, 44, 0, 0, 170, 8, 1, 0, 0, 0, 171, 172, 5, 93, 0, 0, 172, 10, 1, 0, 0, 0, 173, 174, 5, 123, 0, 0, 174, 12, 1, 0, 0, 0, 175, 176, 5, 125, 0, 0, 176, 14, 1, 0, 0, 0, 177, 178, 5, 60, 0, 0, 178, 16, 1, 0, 0, 0, 179, 180, 5, 60, 0, 0, 180, 181, 5, 61, 0, 0, 181, 18, 1, 0, 0, 0, 182, 183, 5, 62, 0, 0, 183, 20, 1, 0, 0, 0, 184, 185, 5, 62, 0, 0, 185, 186, 5, 61, 0, 0, 186, 22, 1, 0, 0, 0, 187, 188, 5, 61, 0, 0, 188, 189, 5, 61, 0, 0, 189, 24, 1, 0, 0, 0, 190, 191, 5, 33, 0, 0, 191, 192, 5, 61, 0, 0, 192, 26, 1, 0, 0, 0, 193, 194, 5, 108, 0, 0, 194, 195, 5, 105, 0, 0, 195, 196, 5, 107, 0, 0, 196, 202, 5, 101, 0, 0, 197, 198, 5, 76, 0, 0, 198, 199, 5, 73, 0, 0, 199, 200, 5, 75, 0, 0, 200, 202, 5, 69, 0, 0, 201, 193, 1, 0, 0, 0, 201, 197, 1, 0, 0, 0, 202, 28, 1, 0, 0, 0, 203, 204, 5, 101, 0, 0, 204, 205, 5, 120, 0, 0, 205, 206, 5, 105, 0, 0, 206, 207, 5, 115, 0, 0, 207, 208, 5, 116, 0, 0, 208, 216, 5, 115, 0, 0, 209, 210, 5, 69, 0, 0, 210, 211, 5, 88, 0, 0, 211, 212, 5, 73, 0, 0, 212, 213, 5, 83, 0, 0, 213, 214, 5, 84, 0, 0, 214, 216, 5, 83, 0, 0, 215, 203, 1, 0, 0, 0, 215, 209, 1, 0, 0, 0, 216, 30, 1, 0, 0, 0, 217, 218, 5, 116, 0, 0, 218, 219, 5, 101, 0, 0, 219, 220, 5, 120, 0, 0, 220, 221, 5, 116, 0, 0, 221, 222, 5, 95, 0, 0, 222, 223, 5, 109, 0, 0, 223, 224, 5, 97, 0, 0, 224, 225, 5, 116, 0, 0, 225, 226, 5, 99, 0, 0, 226, 238, 5, 104, 0, 0, 227, 228, 5, 84, 0, 0, 228, 229, 5, 69, 0, 0, 229, 230, 5, 88, 0, 0, 230, 231, 5, 84, 0, 0, 231, 232, 5, 95, 0, 0, 232, 233, 5, 77, 0, 0, 233, 234, 5, 65, 0, 0, 234, 235, 5, 84, 0, 0, 235, 236, 5, 67, 0, 0, 236, 238, 5, 72, 0, 0, 237, 217, 1, 0, 0, 0, 237, 227, 1, 0, 0, 0, 238, 32, 1, 0, 0, 0, 239, 240, 5, 43, 0, 0, 240, 34, 1, 0, 0, 0, 241, 242, 5, 45, 0, 0, 242, 36, 1, 0, 0, 0, 243, 244, 5, 42, 0, 0, 244, 38, 1, 0, 0, 0, 245, 246, 5, 47, 0, 0, 246, 40, 1, 0, 0, 0, 247, 248, 5, 37, 0, 0, 248, 42, 1, 0, 0, 0, 249, 250, 5, 42, 0, 0, 250, 251, 5, 42, 0, 0, 251, 44, 1, 0, 0, 0, 252, 253, 5, 60, 0, 0, 253, 254, 5, 60, 0, 0, 254, 46, 1, 0, 0, 0, 255, 256, 5, 62, 0, 0, 256, 257, 5, 62, 0, 0, 257, 48, 1, 0, 0, 0, 258, 259, 5, 38, 0, 0, 259, 50, 1, 0, 0, 0, 260, 261, 5, 124, 0, 0, 261, 52, 1, 0, 0, 0, 262, 263, 5, 94, 0, 0, 263, 54, 1, 0, 0, 0, 264, 265, 5, 38, 0, 0, 265, 270, 5, 38, 0, 0, 266, 267, 5, 97, 0, 0, 267, 268, 5, 110, 0, 0, 268, 270, 5, 100, 0, 0, 269, 264, 1, 0, 0, 0, 269, 266, 1, 0, 0, 0, 270, 56, 1, 0, 0, 0, 271, 272, 5, 124, 0, 0, 272, 276, 5, 124, 0, 0, 273, 274, 5, 111, 0, 0, 274, 276, 5, 114, 0, 0, 275, 271, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 276, 58, 1, 0, 0, 0, 277, 278, 5, 126, 0, 0, 278, 60, 1, 0, 0, 0, 279, 284, 5, 33, 0, 0, 280, 281, 5, 110, 0, 0, 281, 282, 5, 111, 0, 0, 282, 284, 5, 116, 0, 0, 283, 279, 1, 0, 0, 0, 283, 280, 1, 0, 0, 0, 284, 62, 1, 0, 0, 0, 285, 286, 5, 105, 0, 0, 286, 290, 5, 110, 0, 0, 287, 288, 5, 73, 0, 0, 288, 290, 5, 78, 0, 0, 289, 285, 1, 0, 0, 0, 289, 287, 1, 0, 0, 0, 290, 64, 1, 0, 0, 0, 291, 296, 5, 91, 0, 0, 292, 295, 3, 159, 79, 0, 293, 295, 3, 161, 80, 0, 294, 292, 1, 0, 0, 0, 294, 293, 1, 0, 0, 0, 295, 298, 1, 0, 0, 0, 296, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 299, 1, 0, 0, 0, 298, 296, 1, 0, 0, 0, 299, 300, 5, 93, 0, 0, 300, 66, 1, 0, 0, 0, 301, 302, 5, 106, 0, 0, 302, 303, 5, 115, 0, 0, 303, 304, 5, 111, 0, 0, 304, 305, 5, 110, 0, 0, 305, 306, 5, 95, 0, 0, 306, 307, 5, 99, 0, 0, 307, 308, 5, 111, 0, 0, 308, 309, 5, 110, 0, 0, 309, 310, 5, 116, 0, 0, 310, 311, 5, 97, 0, 0, 311, 312, 5, 105, 0, 0, 312, 313, 5, 110, 0, 0, 313, 328, 5, 115, 0, 0, 314, 315, 5, 74, 0, 0, 315, 316, 5, 83, 0, 0, 316, 317, 5, 79, 0, 0, 317, 318, 5, 78, 0, 0, 318, 319, 5, 95, 0, 0, 319, 320, 5, 67, 0, 0, 320, 321, 5, 79, 0, 0, 321, 322, 5, 78, 0, 0, 322, 323, 5, 84, 0, 0, 323, 324, 5, 65, 0, 0, 324, 325, 5, 73, 0, 0, 325, 326, 5, 78, 0, 0, 326, 328, 5, 83, 0, 0, 327, 301, 1, 0, 0, 0, 327, 314, 1, 0, 0, 0, 328, 68, 1, 0, 0, 0, 329, 330, 5, 106, 0, 0, 330, 331, 5, 115, 0, 0, 331, 332, 5, 111, 0, 0, 332, 333, 5, 110, 0, 0, 333, 334, 5, 95, 0, 0, 334, 335, 5, 99, 0, 0, 335, 336, 5, 111, 0, 0, 336, 337, 5, 110, 0, 0, 337, 338, 5, 116, 0, 0, 338, 339, 5, 97, 0, 0, 339, 340, 5, 105, 0, 0, 340, 341, 5, 110, 0, 0, 341, 342, 5, 115, 0, 0, 342, 343, 5, 95, 0, 0, 343, 344, 5, 97, 0, 0, 344, 345, 5, 108, 0, 0, 345, 364, 5, 108, 0, 0, 346, 347, 5, 74, 0, 0, 347, 348, 5, 83, 0, 0, 348, 349, 5, 79, 0, 0, 349, 350, 5, 78, 0, 0, 350, 351, 5, 95, 0, 0, 351, 352, 5, 67, 0, 0, 352, 353, 5, 79, 0, 0, 353, 354, 5, 78, 0, 0, 354, 355, 5, 84, 0, 0, 355, 356, 5, 65, 0, 0, 356, 357, 5, 73, 0, 0, 357, 358, 5, 78, 0, 0, 358, 359, 5, 83, 0, 0, 359, 360, 5, 95, 0, 0, 360, 361, 5, 65, 0, 0, 361, 362, 5, 76, 0, 0, 362, 364, 5, 76, 0, 0, 363, 329, 1, 0, 0, 0, 363, 346, 1, 0, 0, 0, 364, 70, 1, 0, 0, 0, 365, 366, 5, 106, 0, 0, 366, 367, 5, 115, 0, 0, 367, 368, 5, 111, 0, 0, 368, 369, 5, 110, 0, 0, 369, 370, 5, 95, 0, 0, 370, 371, 5, 99, 0, 0, 371, 372, 5, 111, 0, 0, 372, 373, 5, 110, 0, 0, 373, 374, 5, 116, 0, 0, 374, 375, 5, 97, 0, 0, 375, 376, 5, 105, 0, 0, 376, 377, 5, 110, 0, 0, 377, 378, 5, 115, 0, 0, 378, 379, 5, 95, 0, 0, 379, 380, 5, 97, 0, 0, 380, 381, 5, 110, 0, 0, 381, 400, 5, 121, 0, 0, 382, 383, 5, 74, 0, 0, 383, 384, 5, 83, 0, 0, 384, 385, 5, 79, 0, 0, 385, 386, 5, 78, 0, 0, 386, 387, 5, 95, 0, 0, 387, 388, 5, 67, 0, 0, 388, 389, 5, 79, 0, 0, 389, 390, 5, 78, 0, 0, 390, 391, 5, 84, 0, 0, 391, 392, 5, 65, 0, 0, 392, 393, 5, 73, 0, 0, 393, 394, 5, 78, 0, 0, 394, 395, 5, 83, 0, 0, 395, 396, 5, 95, 0, 0, 396, 397, 5, 65, 0, 0, 397, 398, 5, 78, 0, 0, 398, 400, 5, 89, 0, 0, 399, 365, 1, 0, 0, 0, 399, 382, 1, 0, 0, 0, 400, 72, 1, 0, 0, 0, 401, 402, 5, 97, 0, 0, 402, 403, 5, 114, 0, 0, 403, 404, 5, 114, 0, 0, 404, 405, 5, 97, 0, 0, 405, 406, 5, 121, 0, 0, 406, 407, 5, 95, 0, 0, 407, 408, 5, 99, 0, 0, 408, 409, 5, 111, 0, 0, 409, 410, 5, 110, 0, 0, 410, 411, 5, 116, 0, 0, 411, 412, 5, 97, 0, 0, 412, 413, 5, 105, 0, 0, 413, 414, 5, 110, 0, 0, 414, 430, 5, 115, 0, 0, 415, 416, 5, 65, 0, 0, 416, 417, 5, 82, 0, 0, 417, 418, 5, 82, 0, 0, 418, 419, 5, 65, 0, 0, 419, 420, 5, 89, 0, 0, 420, 421, 5, 95, 0, 0, 421, 422, 5, 67, 0, 0, 422, 423, 5, 79, 0, 0, 423, 424, 5, 78, 0, 0, 424, 425, 5, 84, 0, 0, 425, 426, 5, 65, 0, 0, 426, 427, 5, 73, 0, 0, 427, 428, 5, 78, 0, 0, 428, 430, 5, 83, 0, 0, 429, 401, 1, 0, 0, 0, 429, 415, 1, 0, 0, 0, 430, 74, 1, 0, 0, 0, 431, 432, 5, 97, 0, 0, 432, 433, 5, 114, 0, 0, 433, 434, 5, 114, 0, 0, 434, 435, 5, 97, 0, 0, 435, 436, 5, 121, 0, 0, 436, 437, 5, 95, 0, 0, 437, 438, 5, 99, 0, 0, 438, 439, 5, 111, 0, 0, 439, 440, 5, 110, 0, 0, 440, 441, 5, 116, 0, 0, 441, 442, 5, 97, 0, 0, 442, 443, 5, 105, 0, 0, 443, 444, 5, 110, 0, 0, 444, 445, 5, 115, 0, 0, 445, 446, 5, 95, 0, 0, 446, 447, 5, 97, 0, 0, 447, 448, 5, 108, 0, 0, 448, 468, 5, 108, 0, 0, 449, 450, 5, 65, 0, 0, 450, 451, 5, 82, 0, 0, 451, 452, 5, 82, 0, 0, 452, 453, 5, 65, 0, 0, 453, 454, 5, 89, 0, 0, 454, 455, 5, 95, 0, 0, 455, 456, 5, 67, 0, 0, 456, 457, 5, 79, 0, 0, 457, 458, 5, 78, 0, 0, 458, 459, 5, 84, 0, 0, 459, 460, 5, 65, 0, 0, 460, 461, 5, 73, 0, 0, 461, 462, 5, 78, 0, 0, 462, 463, 5, 83, 0, 0, 463, 464, 5, 95, 0, 0, 464, 465, 5, 65, 0, 0, 465, 466, 5, 76, 0, 0, 466, 468, 5, 76, 0, 0, 467, 431, 1, 0, 0, 0, 467, 449, 1, 0, 0, 0, 468, 76, 1, 0, 0, 0, 469, 470, 5, 97, 0, 0, 470, 471, 5, 114, 0, 0, 471, 472, 5, 114, 0, 0, 472, 473, 5, 97, 0, 0, 473, 474, 5, 121, 0, 0, 474, 475, 5, 95, 0, 0, 475, 476, 5, 99, 0, 0, 476, 477, 5, 111, 0, 0, 477, 478, 5, 110, 0, 0, 478, 479, 5, 116, 0, 0, 479, 480, 5, 97, 0, 0, 480, 481, 5, 105, 0, 0, 481, 482, 5, 110, 0, 0, 482, 483, 5, 115, 0, 0, 483, 484, 5, 95, 0, 0, 484, 485, 5, 97, 0, 0, 485, 486, 5, 110, 0, 0, 486, 506, 5, 121, 0, 0, 487, 488, 5, 65, 0, 0, 488, 489, 5, 82, 0, 0, 489, 490, 5, 82, 0, 0, 490, 491, 5, 65, 0, 0, 491, 492, 5, 89, 0, 0, 492, 493, 5, 95, 0, 0, 493, 494, 5, 67, 0, 0, 494, 495, 5, 79, 0, 0, 495, 496, 5, 78, 0, 0, 496, 497, 5, 84, 0, 0, 497, 498, 5, 65, 0, 0, 498, 499, 5, 73, 0, 0, 499, 500, 5, 78, 0, 0, 500, 501, 5, 83, 0, 0, 501, 502, 5, 95, 0, 0, 502, 503, 5, 65, 0, 0, 503, 504, 5, 78, 0, 0, 504, 506, 5, 89, 0, 0, 505, 469, 1, 0, 0, 0, 505, 487, 1, 0, 0, 0, 506, 78, 1, 0, 0, 0, 507, 508, 5, 97, 0, 0, 508, 509, 5, 114, 0, 0, 509, 510, 5, 114, 0, 0, 510, 511, 5, 97, 0, 0, 511, 512, 5, 121, 0, 0, 512, 513, 5, 95, 0, 0, 513, 514, 5, 108, 0, 0, 514, 515, 5, 101, 0, 0, 515, 516, 5, 110, 0, 0, 516, 517, 5, 103, 0, 0, 517, 518, 5, 116, 0, 0, 518, 532, 5, 104, 0, 0, 519, 520, 5, 65, 0, 0, 520, 521, 5, 82, 0, 0, 521, 522, 5, 82, 0, 0, 522, 523, 5, 65, 0, 0, 523, 524, 5, 89, 0, 0, 524, 525, 5, 95, 0, 0, 525, 526, 5, 76, 0, 0, 526, 527, 5, 69, 0, 0, 527, 528, 5, 78, 0, 0, 528, 529, 5, 71, 0, 0, 529, 530, 5, 84, 0, 0, 530, 532, 5, 72, 0, 0, 531, 507, 1, 0, 0, 0, 531, 519, 1, 0, 0, 0, 532, 80, 1, 0, 0, 0, 533, 534, 5, 115, 0, 0, 534, 535, 5, 116, 0, 0, 535, 536, 5, 95, 0, 0, 536, 537, 5, 101, 0, 0, 537, 538, 5, 113, 0, 0, 538, 539, 5, 117, 0, 0, 539, 540, 5, 97, 0, 0, 540, 541, 5, 108, 0, 0, 541, 552, 5, 115, 0, 0, 542, 543, 5, 83, 0, 0, 543, 544, 5, 84, 0, 0, 544, 545, 5, 95, 0, 0, 545, 546, 5, 69, 0, 0, 546, 547, 5, 81, 0, 0, 547, 548, 5, 85, 0, 0, 548, 549, 5, 65, 0, 0, 549, 550, 5, 76, 0, 0, 550, 552, 5, 83, 0, 0, 551, 533, 1, 0, 0, 0, 551, 542, 1, 0, 0, 0, 552, 82, 1, 0, 0, 0, 553, 554, 5, 115, 0, 0, 554, 555, 5, 116, 0, 0, 555, 556, 5, 95, 0, 0, 556, 557, 5, 116, 0, 0, 557, 558, 5, 111, 0, 0, 558, 559, 5, 117, 0, 0, 559, 560, 5, 99, 0, 0, 560, 561, 5, 104, 0, 0, 561, 562, 5, 101, 0, 0, 562, 574, 5, 115, 0, 0, 563, 564, 5, 83, 0, 0, 564, 565, 5, 84, 0, 0, 565, 566, 5, 95, 0, 0, 566, 567, 5, 84, 0, 0, 567, 568, 5, 79, 0, 0, 568, 569, 5, 85, 0, 0, 569, 570, 5, 67, 0, 0, 570, 571, 5, 72, 0, 0, 571, 572, 5, 69, 0, 0, 572, 574, 5, 83, 0, 0, 573, 553, 1, 0, 0, 0, 573, 563, 1, 0, 0, 0, 574, 84, 1, 0, 0, 0, 575, 576, 5, 115, 0, 0, 576, 577, 5, 116, 0, 0, 577, 578, 5, 95, 0, 0, 578, 579, 5, 111, 0, 0, 579, 580, 5, 118, 0, 0, 580, 581, 5, 101, 0, 0, 581, 582, 5, 114, 0, 0, 582, 583, 5, 108, 0, 0, 583, 584, 5, 97, 0, 0, 584, 585, 5, 112, 0, 0, 585, 598, 5, 115, 0, 0, 586, 587, 5, 83, 0, 0, 587, 588, 5, 84, 0, 0, 588, 589, 5, 95, 0, 0, 589, 590, 5, 79, 0, 0, 590, 591, 5, 86, 0, 0, 591, 592, 5, 69, 0, 0, 592, 593, 5, 82, 0, 0, 593, 594, 5, 76, 0, 0, 594, 595, 5, 65, 0, 0, 595, 596, 5, 80, 0, 0, 596, 598, 5, 83, 0, 0, 597, 575, 1, 0, 0, 0, 597, 586, 1, 0, 0, 0, 598, 86, 1, 0, 0, 0, 599, 600, 5, 115, 0, 0, 600, 601, 5, 116, 0, 0, 601, 602, 5, 95, 0, 0, 602, 603, 5, 99, 0, 0, 603, 604, 5, 114, 0, 0, 604, 605, 5, 111, 0, 0, 605, 606, 5, 115, 0, 0, 606, 607, 5, 115, 0, 0, 607, 608, 5, 101, 0, 0, 608, 620, 5, 115, 0, 0, 609, 610, 5, 83, 0, 0, 610, 611, 5, 84, 0, 0, 611, 612, 5, 95, 0, 0, 612, 613, 5, 67, 0, 0, 613, 614, 5, 82, 0, 0, 614, 615, 5, 79, 0, 0, 615, 616, 5, 83, 0, 0, 616, 617, 5, 83, 0, 0, 617, 618, 5, 69, 0, 0, 618, 620, 5, 83, 0, 0, 619, 599, 1, 0, 0, 0, 619, 609, 1, 0, 0, 0, 620, 88, 1, 0, 0, 0, 621, 622, 5, 115, 0, 0, 622, 623, 5, 116, 0, 0, 623, 624, 5, 95, 0, 0, 624, 625, 5, 99, 0, 0, 625, 626, 5, 111, 0, 0, 626, 627, 5, 110, 0, 0, 627, 628, 5, 116, 0, 0, 628, 629, 5, 97, 0, 0, 629, 630, 5, 105, 0, 0, 630, 631, 5, 110, 0, 0, 631, 644, 5, 115, 0, 0, 632, 633, 5, 83, 0, 0, 633, 634, 5, 84, 0, 0, 634, 635, 5, 95, 0, 0, 635, 636, 5, 67, 0, 0, 636, 637, 5, 79, 0, 0, 637, 638, 5, 78, 0, 0, 638, 639, 5, 84, 0, 0, 639, 640, 5, 65, 0, 0, 640, 641, 5, 73, 0, 0, 641, 642, 5, 78, 0, 0, 642, 644, 5, 83, 0, 0, 643, 621, 1, 0, 0, 0, 643, 632, 1, 0, 0, 0, 644, 90, 1, 0, 0, 0, 645, 646, 5, 115, 0, 0, 646, 647, 5, 116, 0, 0, 647, 648, 5, 95, 0, 0, 648, 649, 5, 105, 0, 0, 649, 650, 5, 110, 0, 0, 650, 651, 5, 116, 0, 0, 651, 652, 5, 101, 0, 0, 652, 653, 5, 114, 0, 0, 653, 654, 5, 115, 0, 0, 654, 655, 5, 101, 0, 0, 655, 656, 5, 99, 0, 0, 656, 657, 5, 116, 0, 0, 657, 672, 5, 115, 0, 0, 658, 659, 5, 83, 0, 0, 659, 660, 5, 84, 0, 0, 660, 661, 5, 95, 0, 0, 661, 662, 5, 73, 0, 0, 662, 663, 5, 78, 0, 0, 663, 664, 5, 84, 0, 0, 664, 665, 5, 69, 0, 0, 665, 666, 5, 82, 0, 0, 666, 667, 5, 83, 0, 0, 667, 668, 5, 69, 0, 0, 668, 669, 5, 67, 0, 0, 669, 670, 5, 84, 0, 0, 670, 672, 5, 83, 0, 0, 671, 645, 1, 0, 0, 0, 671, 658, 1, 0, 0, 0, 672, 92, 1, 0, 0, 0, 673, 674, 5, 115, 0, 0, 674, 675, 5, 116, 0, 0, 675, 676, 5, 95, 0, 0, 676, 677, 5, 119, 0, 0, 677, 678, 5, 105, 0, 0, 678, 679, 5, 116, 0, 0, 679, 680, 5, 104, 0, 0, 680, 681, 5, 105, 0, 0, 681, 692, 5, 110, 0, 0, 682, 683, 5, 83, 0, 0, 683, 684, 5, 84, 0, 0, 684, 685, 5, 95, 0, 0, 685, 686, 5, 87, 0, 0, 686, 687, 5, 73, 0, 0, 687, 688, 5, 84, 0, 0, 688, 689, 5, 72, 0, 0, 689, 690, 5, 73, 0, 0, 690, 692, 5, 78, 0, 0, 691, 673, 1, 0, 0, 0, 691, 682, 1, 0, 0, 0, 692, 94, 1, 0, 0, 0, 693, 694, 5, 116, 0, 0, 694, 695, 5, 114, 0, 0, 695, 696, 5, 117, 0, 0, 696, 721, 5, 101, 0, 0, 697, 698, 5, 84, 0, 0, 698, 699, 5, 114, 0, 0, 699, 700, 5, 117, 0, 0, 700, 721, 5, 101, 0, 0, 701, 702, 5, 84, 0, 0, 702, 703, 5, 82, 0, 0, 703, 704, 5, 85, 0, 0, 704, 721, 5, 69, 0, 0, 705, 706, 5, 102, 0, 0, 706, 707, 5, 97, 0, 0, 707, 708, 5, 108, 0, 0, 708, 709, 5, 115, 0, 0, 709, 721, 5, 101, 0, 0, 710, 711, 5, 70, 0, 0, 711, 712, 5, 97, 0, 0, 712, 713, 5, 108, 0, 0, 713, 714, 5, 115, 0, 0, 714, 721, 5, 101, 0, 0, 715, 716, 5, 70, 0, 0, 716, 717, 5, 65, 0, 0, 717, 718, 5, 76, 0, 0, 718, 719, 5, 83, 0, 0, 719, 721, 5, 69, 0, 0, 720, 693, 1, 0, 0, 0, 720, 697, 1, 0, 0, 0, 720, 701, 1, 0, 0, 0, 720, 705, 1, 0, 0, 0, 720, 710, 1, 0, 0, 0, 720, 715, 1, 0, 0, 0, 721, 96, 1, 0, 0, 0, 722, 727, 3, 125, 62, 0, 723, 727, 3, 127, 63, 0, 724, 727, 3, 129, 64, 0, 725, 727, 3, 123, 61, 0, 726, 722, 1, 0, 0, 0, 726, 723, 1, 0, 0, 0, 726, 724, 1, 0, 0, 0, 726, 725, 1, 0, 0, 0, 727, 98, 1, 0, 0, 0, 728, 731, 3, 141, 70, 0, 729, 731, 3, 143, 71, 0, 730, 728, 1, 0, 0, 0, 730, 729, 1, 0, 0, 0, 731, 100, 1, 0, 0, 0, 732, 737, 3, 119, 59, 0, 733, 736, 3, 119, 59, 0, 734, 736, 3, 121, 60, 0, 735, 733, 1, 0, 0, 0, 735, 734, 1, 0, 0, 0, 736, 739, 1, 0, 0, 0, 737, 735, 1, 0, 0, 0, 737, 738, 1, 0, 0, 0, 738, 102, 1, 0, 0, 0, 739, 737, 1, 0, 0, 0, 740, 741, 5, 36, 0, 0, 741, 742, 5, 109, 0, 0, 742, 743, 5, 101, 0, 0, 743, 744, 5, 116, 0, 0, 744, 745, 5, 97, 0, 0, 745, 104, 1, 0, 0, 0, 746, 748, 3, 109, 54, 0, 747, 746, 1, 0, 0, 0, 747, 748, 1, 0, 0, 0, 748, 759, 1, 0, 0, 0, 749, 751, 5, 34, 0, 0, 750, 752, 3, 111, 55, 0, 751, 750, 1, 0, 0, 0, 751, 752, 1, 0, 0, 0, 752, 753, 1, 0, 0, 0, 753, 760, 5, 34, 0, 0, 754, 756, 5, 39, 0, 0, 755, 757, 3, 113, 56, 0, 756, 755, 1, 0, 0, 0, 756, 757, 1, 0, 0, 0, 757, 758, 1, 0, 0, 0, 758, 760, 5, 39, 0, 0, 759, 749, 1, 0, 0, 0, 759, 754, 1, 0, 0, 0, 760, 106, 1, 0, 0, 0, 761, 764, 3, 101, 50, 0, 762, 764, 3, 103, 51, 0, 763, 761, 1, 0, 0, 0, 763, 762, 1, 0, 0, 0, 764, 772, 1, 0, 0, 0, 765, 768, 5, 91, 0, 0, 766, 769, 3, 105, 52, 0, 767, 769, 3, 125, 62, 0, 768, 766, 1, 0, 0, 0, 768, 767, 1, 0, 0, 0, 769, 770, 1, 0, 0, 0, 770, 771, 5, 93, 0, 0, 771, 773, 1, 0, 0, 0, 772, 765, 1, 0, 0, 0, 773, 774, 1, 0, 0, 0, 774, 772, 1, 0, 0, 0, 774, 775, 1, 0, 0, 0, 775, 108, 1, 0, 0, 0, 776, 777, 5, 117, 0, 0, 777, 780, 5, 56, 0, 0, 778, 780, 7, 0, 0, 0, 779, 776, 1, 0, 0, 0, 779, 778, 1, 0, 0, 0, 780, 110, 1, 0, 0, 0, 781, 783, 3, 115, 57, 0, 782, 781, 1, 0, 0, 0, 783, 784, 1, 0, 0, 0, 784, 782, 1, 0, 0, 0, 784, 785, 1, 0, 0, 0, 785, 112, 1, 0, 0, 0, 786, 788, 3, 117, 58, 0, 787, 786, 1, 0, 0, 0, 788, 789, 1, 0, 0, 0, 789, 787, 1, 0, 0, 0, 789, 790, 1, 0, 0, 0, 790, 114, 1, 0, 0, 0, 791, 799, 8, 1, 0, 0, 792, 799, 3, 157, 78, 0, 793, 794, 5, 92, 0, 0, 794, 799, 5, 10, 0, 0, 795, 796, 5, 92, 0, 0, 796, 797, 5, 13, 0, 0, 797, 799, 5, 10, 0, 0, 798, 791, 1, 0, 0, 0, 798, 792, 1, 0, 0, 0, 798, 793, 1, 0, 0, 0, 798, 795, 1, 0, 0, 0, 799, 116, 1, 0, 0, 0, 800, 808, 8, 2, 0, 0, 801, 808, 3, 157, 78, 0, 802, 803, 5, 92, 0, 0, 803, 808, 5, 10, 0, 0, 804, 805, 5, 92, 0, 0, 805, 806, 5, 13, 0, 0, 806, 808, 5, 10, 0, 0, 807, 800, 1, 0, 0, 0, 807, 801, 1, 0, 0, 0, 807, 802, 1, 0, 0, 0, 807, 804, 1, 0, 0, 0, 808, 118, 1, 0, 0, 0, 809, 810, 7, 3, 0, 0, 810, 120, 1, 0, 0, 0, 811, 812, 7, 4, 0, 0, 812, 122, 1, 0, 0, 0, 813, 814, 5, 48, 0, 0, 814, 816, 7, 5, 0, 0, 815, 817, 7, 6, 0, 0, 816, 815, 1, 0, 0, 0, 817, 818, 1, 0, 0, 0, 818, 816, 1, 0, 0, 0, 818, 819, 1, 0, 0, 0, 819, 124, 1, 0, 0, 0, 820, 824, 3, 131, 65, 0, 821, 823, 3, 121, 60, 0, 822, 821, 1, 0, 0, 0, 823, 826, 1, 0, 0, 0, 824, 822, 1, 0, 0, 0, 824, 825, 1, 0, 0, 0, 825, 829, 1, 0, 0, 0, 826, 824, 1, 0, 0, 0, 827, 829, 5, 48, 0, 0, 828, 820, 1, 0, 0, 0, 828, 827, 1, 0, 0, 0, 829, 126, 1, 0, 0, 0, 830, 834, 5, 48, 0, 0, 831, 833, 3, 133, 66, 0, 832, 831, 1, 0, 0, 0, 833, 836, 1, 0, 0, 0, 834, 832, 1, 0, 0, 0, 834, 835, 1, 0, 0, 0, 835, 128, 1, 0, 0, 0, 836, 834, 1, 0, 0, 0, 837, 838, 5, 48, 0, 0, 838, 839, 7, 7, 0, 0, 839, 840, 3, 153, 76, 0, 840, 130, 1, 0, 0, 0, 841, 842, 7, 8, 0, 0, 842, 132, 1, 0, 0, 0, 843, 844, 7, 9, 0, 0, 844, 134, 1, 0, 0, 0, 845, 846, 7, 10, 0, 0, 846, 136, 1, 0, 0, 0, 847, 848, 3, 135, 67, 0, 848, 849, 3, 135, 67, 0, 849, 850, 3, 135, 67, 0, 850, 851, 3, 135, 67, 0, 851, 138, 1, 0, 0, 0, 852, 853, 5, 92, 0, 0, 853, 854, 5, 117, 0, 0, 854, 855, 1, 0, 0, 0, 855, 863, 3, 137, 68, 0, 856, 857, 5, 92, 0, 0, 857, 858, 5, 85, 0, 0, 858, 859, 1, 0, 0, 0, 859, 860, 3, 137, 68, 0, 860, 861, 3, 137, 68, 0, 861, 863, 1, 0, 0, 0, 862, 852, 1, 0, 0, 0, 862, 856, 1, 0, 0, 0, 863, 140, 1, 0, 0, 0, 864, 866, 3, 145, 72, 0, 865, 867, 3, 147, 73, 0, 866, 865, 1, 0, 0, 0, 866, 867, 1, 0, 0, 0, 867, 872, 1, 0, 0, 0, 868, 869, 3, 149, 74, 0, 869, 870, 3, 147, 73, 0, 870, 872, 1, 0, 0, 0, 871, 864, 1, 0, 0, 0, 871, 868, 1, 0, 0, 0, 872, 142, 1, 0, 0, 0, 873, 874, 5, 48, 0, 0, 874, 877, 7, 7, 0, 0, 875, 878, 3, 151, 75, 0, 876, 878, 3, 153, 76, 0, 877, 875, 1, 0, 0, 0, 877, 876, 1, 0, 0, 0, 878, 879, 1, 0, 0, 0, 879, 880, 3, 155, 77, 0, 880, 144, 1, 0, 0, 0, 881, 883, 3, 149, 74, 0, 882, 881, 1, 0, 0, 0, 882, 883, 1, 0, 0, 0, 883, 884, 1, 0, 0, 0, 884, 885, 5, 46, 0, 0, 885, 890, 3, 149, 74, 0, 886, 887, 3, 149, 74, 0, 887, 888, 5, 46, 0, 0, 888, 890, 1, 0, 0, 0, 889, 882, 1, 0, 0, 0, 889, 886, 1, 0, 0, 0, 890, 146, 1, 0, 0, 0, 891, 893, 7, 11, 0, 0, 892, 894, 7, 12, 0, 0, 893, 892, 1, 0, 0, 0, 893, 894, 1, 0, 0, 0, 894, 895, 1, 0, 0, 0, 895, 896, 3, 149, 74, 0, 896, 148, 1, 0, 0, 0, 897, 899, 3, 121, 60, 0, 898, 897, 1, 0, 0, 0, 899, 900, 1, 0, 0, 0, 900, 898, 1, 0, 0, 0, 900, 901, 1, 0, 0, 0, 901, 150, 1, 0, 0, 0, 902, 904, 3, 153, 76, 0, 903, 902, 1, 0, 0, 0, 903, 904, 1, 0, 0, 0, 904, 905, 1, 0, 0, 0, 905, 906, 5, 46, 0, 0, 906, 911, 3, 153, 76, 0, 907, 908, 3, 153, 76, 0, 908, 909, 5, 46, 0, 0, 909, 911, 1, 0, 0, 0, 910, 903, 1, 0, 0, 0, 910, 907, 1, 0, 0, 0, 911, 152, 1, 0, 0, 0, 912, 914, 3, 135, 67, 0, 913, 912, 1, 0, 0, 0, 914, 915, 1, 0, 0, 0, 915, 913, 1, 0, 0, 0, 915, 916, 1, 0, 0, 0, 916, 154, 1, 0, 0, 0, 917, 919, 7, 13, 0, 0, 918, 920, 7, 12, 0, 0, 919, 918, 1, 0, 0, 0, 919, 920, 1, 0, 0, 0, 920, 921, 1, 0, 0, 0, 921, 922, 3, 149, 74, 0, 922, 156, 1, 0, 0, 0, 923, 924, 5, 92, 0, 0, 924, 939, 7, 14, 0, 0, 925, 926, 5, 92, 0, 0, 926, 928, 3, 133, 66, 0, 927, 929, 3, 133, 66, 0, 928, 927, 1, 0, 0, 0, 928, 929, 1, 0, 0, 0, 929, 931, 1, 0, 0, 0, 930, 932, 3, 133, 66, 0, 931, 930, 1, 0, 0, 0, 931, 932, 1, 0, 0, 0, 932, 939, 1, 0, 0, 0, 933, 934, 5, 92, 0, 0, 934, 935, 5, 120, 0, 0, 935, 936, 1, 0, 0, 0, 936, 939, 3, 153, 76, 0, 937, 939, 3, 139, 69, 0, 938, 923, 1, 0, 0, 0, 938, 925, 1, 0, 0, 0, 938, 933, 1, 0, 0, 0, 938, 937, 1, 0, 0, 0, 939, 158, 1, 0, 0, 0, 940, 942, 7, 15, 0, 0, 941, 940, 1, 0, 0, 0, 942, 943, 1, 0, 0, 0, 943, 941, 1, 0, 0, 0, 943, 944, 1, 0, 0, 0, 944, 945, 1, 0, 0, 0, 945, 946, 6, 79, 0, 0, 946, 160, 1, 0, 0, 0, 947, 949, 5, 13, 0, 0, 948, 950, 5, 10, 0, 0, 949, 948, 1, 0, 0, 0, 949, 950, 1, 0, 0, 0, 950, 953, 1, 0, 0, 0, 951, 953, 5, 10, 0, 0, 952, 947, 1, 0, 0, 0, 952, 951, 1, 0, 0, 0, 953, 954, 1, 0, 0, 0, 954, 955, 6, 80, 0, 0, 955, 162, 1, 0, 0, 0, 63, 0, 201, 215, 237, 269, 275, 283, 289, 294, 296, 327, 363, 399, 429, 467, 505, 531, 551, 573, 597, 619, 643, 671, 691, 720, 726, 730, 735, 737, 747, 751, 756, 759, 763, 768, 774, 779, 784, 789, 798, 807, 818, 824, 828, 834, 862, 866, 871, 877, 882, 889, 893, 900, 903, 910, 915, 919, 928, 931, 938, 943, 949, 952, 1, 6, 0, 0] \ No newline at end of file diff --git a/internal/parser/planparserv2/generated/PlanLexer.tokens b/internal/parser/planparserv2/generated/PlanLexer.tokens index 0b084bff8ff8d..f19bc3be41e16 100644 --- a/internal/parser/planparserv2/generated/PlanLexer.tokens +++ b/internal/parser/planparserv2/generated/PlanLexer.tokens @@ -38,15 +38,22 @@ ArrayContains=37 ArrayContainsAll=38 ArrayContainsAny=39 ArrayLength=40 -BooleanConstant=41 -IntegerConstant=42 -FloatingConstant=43 -Identifier=44 -Meta=45 -StringLiteral=46 -JSONIdentifier=47 -Whitespace=48 -Newline=49 +STEuqals=41 +STTouches=42 +STOverlaps=43 +STCrosses=44 +STContains=45 +STIntersects=46 +STWithin=47 +BooleanConstant=48 +IntegerConstant=49 +FloatingConstant=50 +Identifier=51 +Meta=52 +StringLiteral=53 +JSONIdentifier=54 +Whitespace=55 +Newline=56 '('=1 ')'=2 '['=3 @@ -72,4 +79,4 @@ Newline=49 '|'=26 '^'=27 '~'=30 -'$meta'=45 +'$meta'=52 diff --git a/internal/parser/planparserv2/generated/plan_base_visitor.go b/internal/parser/planparserv2/generated/plan_base_visitor.go index bcf5a218fbc86..4134c473db2a4 100644 --- a/internal/parser/planparserv2/generated/plan_base_visitor.go +++ b/internal/parser/planparserv2/generated/plan_base_visitor.go @@ -39,6 +39,10 @@ func (v *BasePlanVisitor) VisitIdentifier(ctx *IdentifierContext) interface{} { return v.VisitChildren(ctx) } +func (v *BasePlanVisitor) VisitSTIntersects(ctx *STIntersectsContext) interface{} { + return v.VisitChildren(ctx) +} + func (v *BasePlanVisitor) VisitLike(ctx *LikeContext) interface{} { return v.VisitChildren(ctx) } @@ -67,6 +71,10 @@ func (v *BasePlanVisitor) VisitCall(ctx *CallContext) interface{} { return v.VisitChildren(ctx) } +func (v *BasePlanVisitor) VisitSTCrosses(ctx *STCrossesContext) interface{} { + return v.VisitChildren(ctx) +} + func (v *BasePlanVisitor) VisitReverseRange(ctx *ReverseRangeContext) interface{} { return v.VisitChildren(ctx) } @@ -95,6 +103,14 @@ func (v *BasePlanVisitor) VisitTextMatch(ctx *TextMatchContext) interface{} { return v.VisitChildren(ctx) } +func (v *BasePlanVisitor) VisitSTTouches(ctx *STTouchesContext) interface{} { + return v.VisitChildren(ctx) +} + +func (v *BasePlanVisitor) VisitSTContains(ctx *STContainsContext) interface{} { + return v.VisitChildren(ctx) +} + func (v *BasePlanVisitor) VisitTerm(ctx *TermContext) interface{} { return v.VisitChildren(ctx) } @@ -103,6 +119,10 @@ func (v *BasePlanVisitor) VisitJSONContains(ctx *JSONContainsContext) interface{ return v.VisitChildren(ctx) } +func (v *BasePlanVisitor) VisitSTWithin(ctx *STWithinContext) interface{} { + return v.VisitChildren(ctx) +} + func (v *BasePlanVisitor) VisitRange(ctx *RangeContext) interface{} { return v.VisitChildren(ctx) } @@ -135,6 +155,14 @@ func (v *BasePlanVisitor) VisitBitAnd(ctx *BitAndContext) interface{} { return v.VisitChildren(ctx) } +func (v *BasePlanVisitor) VisitSTEuqals(ctx *STEuqalsContext) interface{} { + return v.VisitChildren(ctx) +} + func (v *BasePlanVisitor) VisitPower(ctx *PowerContext) interface{} { return v.VisitChildren(ctx) } + +func (v *BasePlanVisitor) VisitSTOverlaps(ctx *STOverlapsContext) interface{} { + return v.VisitChildren(ctx) +} diff --git a/internal/parser/planparserv2/generated/plan_lexer.go b/internal/parser/planparserv2/generated/plan_lexer.go index 834faf117fd13..5d5f04c849a69 100644 --- a/internal/parser/planparserv2/generated/plan_lexer.go +++ b/internal/parser/planparserv2/generated/plan_lexer.go @@ -46,7 +46,8 @@ func planlexerLexerInit() { "", "'('", "')'", "'['", "','", "']'", "'{'", "'}'", "'<'", "'<='", "'>'", "'>='", "'=='", "'!='", "", "", "", "'+'", "'-'", "'*'", "'/'", "'%'", "'**'", "'<<'", "'>>'", "'&'", "'|'", "'^'", "", "", "'~'", "", - "", "", "", "", "", "", "", "", "", "", "", "", "", "'$meta'", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "", "", "", "'$meta'", } staticData.SymbolicNames = []string{ "", "", "", "", "", "", "LBRACE", "RBRACE", "LT", "LE", "GT", "GE", @@ -54,8 +55,10 @@ func planlexerLexerInit() { "MOD", "POW", "SHL", "SHR", "BAND", "BOR", "BXOR", "AND", "OR", "BNOT", "NOT", "IN", "EmptyArray", "JSONContains", "JSONContainsAll", "JSONContainsAny", "ArrayContains", "ArrayContainsAll", "ArrayContainsAny", "ArrayLength", - "BooleanConstant", "IntegerConstant", "FloatingConstant", "Identifier", - "Meta", "StringLiteral", "JSONIdentifier", "Whitespace", "Newline", + "STEuqals", "STTouches", "STOverlaps", "STCrosses", "STContains", "STIntersects", + "STWithin", "BooleanConstant", "IntegerConstant", "FloatingConstant", + "Identifier", "Meta", "StringLiteral", "JSONIdentifier", "Whitespace", + "Newline", } staticData.RuleNames = []string{ "T__0", "T__1", "T__2", "T__3", "T__4", "LBRACE", "RBRACE", "LT", "LE", @@ -63,7 +66,8 @@ func planlexerLexerInit() { "MUL", "DIV", "MOD", "POW", "SHL", "SHR", "BAND", "BOR", "BXOR", "AND", "OR", "BNOT", "NOT", "IN", "EmptyArray", "JSONContains", "JSONContainsAll", "JSONContainsAny", "ArrayContains", "ArrayContainsAll", "ArrayContainsAny", - "ArrayLength", "BooleanConstant", "IntegerConstant", "FloatingConstant", + "ArrayLength", "STEuqals", "STTouches", "STOverlaps", "STCrosses", "STContains", + "STIntersects", "STWithin", "BooleanConstant", "IntegerConstant", "FloatingConstant", "Identifier", "Meta", "StringLiteral", "JSONIdentifier", "EncodingPrefix", "DoubleSCharSequence", "SingleSCharSequence", "DoubleSChar", "SingleSChar", "Nondigit", "Digit", "BinaryConstant", "DecimalConstant", "OctalConstant", @@ -75,7 +79,7 @@ func planlexerLexerInit() { } staticData.PredictionContextCache = antlr.NewPredictionContextCache() staticData.serializedATN = []int32{ - 4, 0, 49, 782, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, + 4, 0, 56, 956, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, @@ -89,346 +93,423 @@ func planlexerLexerInit() { 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, - 73, 7, 73, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, - 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, - 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, - 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 188, 8, 13, 1, 14, 1, 14, - 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, - 14, 202, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, + 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, + 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, + 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, + 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, + 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 202, + 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, + 14, 1, 14, 1, 14, 3, 14, 216, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, - 15, 1, 15, 3, 15, 224, 8, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, - 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, - 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, - 1, 27, 1, 27, 1, 27, 3, 27, 256, 8, 27, 1, 28, 1, 28, 1, 28, 1, 28, 3, - 28, 262, 8, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 3, 30, 270, 8, - 30, 1, 31, 1, 31, 1, 31, 1, 31, 3, 31, 276, 8, 31, 1, 32, 1, 32, 1, 32, - 5, 32, 281, 8, 32, 10, 32, 12, 32, 284, 9, 32, 1, 32, 1, 32, 1, 33, 1, - 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, + 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 238, 8, 15, 1, 16, 1, 16, 1, 17, + 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, + 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, + 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 3, 27, 270, 8, 27, 1, 28, 1, + 28, 1, 28, 1, 28, 3, 28, 276, 8, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, + 1, 30, 3, 30, 284, 8, 30, 1, 31, 1, 31, 1, 31, 1, 31, 3, 31, 290, 8, 31, + 1, 32, 1, 32, 1, 32, 5, 32, 295, 8, 32, 10, 32, 12, 32, 298, 9, 32, 1, + 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, - 33, 1, 33, 1, 33, 1, 33, 3, 33, 314, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, + 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 3, 33, 328, 8, 33, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, - 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 350, - 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, - 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, + 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, 34, 1, + 34, 1, 34, 3, 34, 364, 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, - 35, 1, 35, 1, 35, 1, 35, 3, 35, 386, 8, 35, 1, 36, 1, 36, 1, 36, 1, 36, - 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, + 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, + 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 1, 35, 3, 35, 400, 8, 35, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, - 1, 36, 1, 36, 1, 36, 3, 36, 416, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, - 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, + 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, + 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 430, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, - 3, 37, 454, 8, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, + 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, 37, 1, + 37, 1, 37, 1, 37, 1, 37, 3, 37, 468, 8, 37, 1, 38, 1, 38, 1, 38, 1, 38, + 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, - 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 492, 8, 38, + 38, 3, 38, 506, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, - 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, - 1, 39, 1, 39, 1, 39, 3, 39, 518, 8, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, - 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, + 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 3, 39, 532, 8, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, - 40, 1, 40, 3, 40, 547, 8, 40, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 553, 8, - 41, 1, 42, 1, 42, 3, 42, 557, 8, 42, 1, 43, 1, 43, 1, 43, 5, 43, 562, 8, - 43, 10, 43, 12, 43, 565, 9, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, - 1, 45, 3, 45, 574, 8, 45, 1, 45, 1, 45, 3, 45, 578, 8, 45, 1, 45, 1, 45, - 1, 45, 3, 45, 583, 8, 45, 1, 45, 3, 45, 586, 8, 45, 1, 46, 1, 46, 3, 46, - 590, 8, 46, 1, 46, 1, 46, 1, 46, 3, 46, 595, 8, 46, 1, 46, 1, 46, 4, 46, - 599, 8, 46, 11, 46, 12, 46, 600, 1, 47, 1, 47, 1, 47, 3, 47, 606, 8, 47, - 1, 48, 4, 48, 609, 8, 48, 11, 48, 12, 48, 610, 1, 49, 4, 49, 614, 8, 49, - 11, 49, 12, 49, 615, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 3, - 50, 625, 8, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 3, 51, - 634, 8, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 4, 54, 643, - 8, 54, 11, 54, 12, 54, 644, 1, 55, 1, 55, 5, 55, 649, 8, 55, 10, 55, 12, - 55, 652, 9, 55, 1, 55, 3, 55, 655, 8, 55, 1, 56, 1, 56, 5, 56, 659, 8, - 56, 10, 56, 12, 56, 662, 9, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, - 1, 59, 1, 59, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, - 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 3, 62, 689, - 8, 62, 1, 63, 1, 63, 3, 63, 693, 8, 63, 1, 63, 1, 63, 1, 63, 3, 63, 698, - 8, 63, 1, 64, 1, 64, 1, 64, 1, 64, 3, 64, 704, 8, 64, 1, 64, 1, 64, 1, - 65, 3, 65, 709, 8, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 3, 65, 716, 8, - 65, 1, 66, 1, 66, 3, 66, 720, 8, 66, 1, 66, 1, 66, 1, 67, 4, 67, 725, 8, - 67, 11, 67, 12, 67, 726, 1, 68, 3, 68, 730, 8, 68, 1, 68, 1, 68, 1, 68, - 1, 68, 1, 68, 3, 68, 737, 8, 68, 1, 69, 4, 69, 740, 8, 69, 11, 69, 12, - 69, 741, 1, 70, 1, 70, 3, 70, 746, 8, 70, 1, 70, 1, 70, 1, 71, 1, 71, 1, - 71, 1, 71, 1, 71, 3, 71, 755, 8, 71, 1, 71, 3, 71, 758, 8, 71, 1, 71, 1, - 71, 1, 71, 1, 71, 1, 71, 3, 71, 765, 8, 71, 1, 72, 4, 72, 768, 8, 72, 11, - 72, 12, 72, 769, 1, 72, 1, 72, 1, 73, 1, 73, 3, 73, 776, 8, 73, 1, 73, - 3, 73, 779, 8, 73, 1, 73, 1, 73, 0, 0, 74, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, - 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, - 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, - 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, - 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, - 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, 95, 0, 97, 0, 99, 0, 101, 0, - 103, 0, 105, 0, 107, 0, 109, 0, 111, 0, 113, 0, 115, 0, 117, 0, 119, 0, - 121, 0, 123, 0, 125, 0, 127, 0, 129, 0, 131, 0, 133, 0, 135, 0, 137, 0, - 139, 0, 141, 0, 143, 0, 145, 48, 147, 49, 1, 0, 16, 3, 0, 76, 76, 85, 85, - 117, 117, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 4, 0, 10, 10, 13, 13, 39, - 39, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, 48, 57, 2, 0, 66, 66, - 98, 98, 1, 0, 48, 49, 2, 0, 88, 88, 120, 120, 1, 0, 49, 57, 1, 0, 48, 55, - 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, 101, 2, 0, 43, 43, 45, - 45, 2, 0, 80, 80, 112, 112, 10, 0, 34, 34, 39, 39, 63, 63, 92, 92, 97, - 98, 102, 102, 110, 110, 114, 114, 116, 116, 118, 118, 2, 0, 9, 9, 32, 32, - 823, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, - 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, - 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, - 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, - 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, - 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, - 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, - 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, - 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, - 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, - 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, - 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, 0, 0, 0, 91, 1, 0, 0, - 0, 0, 93, 1, 0, 0, 0, 0, 145, 1, 0, 0, 0, 0, 147, 1, 0, 0, 0, 1, 149, 1, - 0, 0, 0, 3, 151, 1, 0, 0, 0, 5, 153, 1, 0, 0, 0, 7, 155, 1, 0, 0, 0, 9, - 157, 1, 0, 0, 0, 11, 159, 1, 0, 0, 0, 13, 161, 1, 0, 0, 0, 15, 163, 1, - 0, 0, 0, 17, 165, 1, 0, 0, 0, 19, 168, 1, 0, 0, 0, 21, 170, 1, 0, 0, 0, - 23, 173, 1, 0, 0, 0, 25, 176, 1, 0, 0, 0, 27, 187, 1, 0, 0, 0, 29, 201, - 1, 0, 0, 0, 31, 223, 1, 0, 0, 0, 33, 225, 1, 0, 0, 0, 35, 227, 1, 0, 0, - 0, 37, 229, 1, 0, 0, 0, 39, 231, 1, 0, 0, 0, 41, 233, 1, 0, 0, 0, 43, 235, - 1, 0, 0, 0, 45, 238, 1, 0, 0, 0, 47, 241, 1, 0, 0, 0, 49, 244, 1, 0, 0, - 0, 51, 246, 1, 0, 0, 0, 53, 248, 1, 0, 0, 0, 55, 255, 1, 0, 0, 0, 57, 261, - 1, 0, 0, 0, 59, 263, 1, 0, 0, 0, 61, 269, 1, 0, 0, 0, 63, 275, 1, 0, 0, - 0, 65, 277, 1, 0, 0, 0, 67, 313, 1, 0, 0, 0, 69, 349, 1, 0, 0, 0, 71, 385, - 1, 0, 0, 0, 73, 415, 1, 0, 0, 0, 75, 453, 1, 0, 0, 0, 77, 491, 1, 0, 0, - 0, 79, 517, 1, 0, 0, 0, 81, 546, 1, 0, 0, 0, 83, 552, 1, 0, 0, 0, 85, 556, - 1, 0, 0, 0, 87, 558, 1, 0, 0, 0, 89, 566, 1, 0, 0, 0, 91, 573, 1, 0, 0, - 0, 93, 589, 1, 0, 0, 0, 95, 605, 1, 0, 0, 0, 97, 608, 1, 0, 0, 0, 99, 613, - 1, 0, 0, 0, 101, 624, 1, 0, 0, 0, 103, 633, 1, 0, 0, 0, 105, 635, 1, 0, - 0, 0, 107, 637, 1, 0, 0, 0, 109, 639, 1, 0, 0, 0, 111, 654, 1, 0, 0, 0, - 113, 656, 1, 0, 0, 0, 115, 663, 1, 0, 0, 0, 117, 667, 1, 0, 0, 0, 119, - 669, 1, 0, 0, 0, 121, 671, 1, 0, 0, 0, 123, 673, 1, 0, 0, 0, 125, 688, - 1, 0, 0, 0, 127, 697, 1, 0, 0, 0, 129, 699, 1, 0, 0, 0, 131, 715, 1, 0, - 0, 0, 133, 717, 1, 0, 0, 0, 135, 724, 1, 0, 0, 0, 137, 736, 1, 0, 0, 0, - 139, 739, 1, 0, 0, 0, 141, 743, 1, 0, 0, 0, 143, 764, 1, 0, 0, 0, 145, - 767, 1, 0, 0, 0, 147, 778, 1, 0, 0, 0, 149, 150, 5, 40, 0, 0, 150, 2, 1, - 0, 0, 0, 151, 152, 5, 41, 0, 0, 152, 4, 1, 0, 0, 0, 153, 154, 5, 91, 0, - 0, 154, 6, 1, 0, 0, 0, 155, 156, 5, 44, 0, 0, 156, 8, 1, 0, 0, 0, 157, - 158, 5, 93, 0, 0, 158, 10, 1, 0, 0, 0, 159, 160, 5, 123, 0, 0, 160, 12, - 1, 0, 0, 0, 161, 162, 5, 125, 0, 0, 162, 14, 1, 0, 0, 0, 163, 164, 5, 60, - 0, 0, 164, 16, 1, 0, 0, 0, 165, 166, 5, 60, 0, 0, 166, 167, 5, 61, 0, 0, - 167, 18, 1, 0, 0, 0, 168, 169, 5, 62, 0, 0, 169, 20, 1, 0, 0, 0, 170, 171, - 5, 62, 0, 0, 171, 172, 5, 61, 0, 0, 172, 22, 1, 0, 0, 0, 173, 174, 5, 61, - 0, 0, 174, 175, 5, 61, 0, 0, 175, 24, 1, 0, 0, 0, 176, 177, 5, 33, 0, 0, - 177, 178, 5, 61, 0, 0, 178, 26, 1, 0, 0, 0, 179, 180, 5, 108, 0, 0, 180, - 181, 5, 105, 0, 0, 181, 182, 5, 107, 0, 0, 182, 188, 5, 101, 0, 0, 183, - 184, 5, 76, 0, 0, 184, 185, 5, 73, 0, 0, 185, 186, 5, 75, 0, 0, 186, 188, - 5, 69, 0, 0, 187, 179, 1, 0, 0, 0, 187, 183, 1, 0, 0, 0, 188, 28, 1, 0, - 0, 0, 189, 190, 5, 101, 0, 0, 190, 191, 5, 120, 0, 0, 191, 192, 5, 105, - 0, 0, 192, 193, 5, 115, 0, 0, 193, 194, 5, 116, 0, 0, 194, 202, 5, 115, - 0, 0, 195, 196, 5, 69, 0, 0, 196, 197, 5, 88, 0, 0, 197, 198, 5, 73, 0, - 0, 198, 199, 5, 83, 0, 0, 199, 200, 5, 84, 0, 0, 200, 202, 5, 83, 0, 0, - 201, 189, 1, 0, 0, 0, 201, 195, 1, 0, 0, 0, 202, 30, 1, 0, 0, 0, 203, 204, - 5, 116, 0, 0, 204, 205, 5, 101, 0, 0, 205, 206, 5, 120, 0, 0, 206, 207, - 5, 116, 0, 0, 207, 208, 5, 95, 0, 0, 208, 209, 5, 109, 0, 0, 209, 210, - 5, 97, 0, 0, 210, 211, 5, 116, 0, 0, 211, 212, 5, 99, 0, 0, 212, 224, 5, - 104, 0, 0, 213, 214, 5, 84, 0, 0, 214, 215, 5, 69, 0, 0, 215, 216, 5, 88, - 0, 0, 216, 217, 5, 84, 0, 0, 217, 218, 5, 95, 0, 0, 218, 219, 5, 77, 0, - 0, 219, 220, 5, 65, 0, 0, 220, 221, 5, 84, 0, 0, 221, 222, 5, 67, 0, 0, - 222, 224, 5, 72, 0, 0, 223, 203, 1, 0, 0, 0, 223, 213, 1, 0, 0, 0, 224, - 32, 1, 0, 0, 0, 225, 226, 5, 43, 0, 0, 226, 34, 1, 0, 0, 0, 227, 228, 5, - 45, 0, 0, 228, 36, 1, 0, 0, 0, 229, 230, 5, 42, 0, 0, 230, 38, 1, 0, 0, - 0, 231, 232, 5, 47, 0, 0, 232, 40, 1, 0, 0, 0, 233, 234, 5, 37, 0, 0, 234, - 42, 1, 0, 0, 0, 235, 236, 5, 42, 0, 0, 236, 237, 5, 42, 0, 0, 237, 44, - 1, 0, 0, 0, 238, 239, 5, 60, 0, 0, 239, 240, 5, 60, 0, 0, 240, 46, 1, 0, - 0, 0, 241, 242, 5, 62, 0, 0, 242, 243, 5, 62, 0, 0, 243, 48, 1, 0, 0, 0, - 244, 245, 5, 38, 0, 0, 245, 50, 1, 0, 0, 0, 246, 247, 5, 124, 0, 0, 247, - 52, 1, 0, 0, 0, 248, 249, 5, 94, 0, 0, 249, 54, 1, 0, 0, 0, 250, 251, 5, - 38, 0, 0, 251, 256, 5, 38, 0, 0, 252, 253, 5, 97, 0, 0, 253, 254, 5, 110, - 0, 0, 254, 256, 5, 100, 0, 0, 255, 250, 1, 0, 0, 0, 255, 252, 1, 0, 0, - 0, 256, 56, 1, 0, 0, 0, 257, 258, 5, 124, 0, 0, 258, 262, 5, 124, 0, 0, - 259, 260, 5, 111, 0, 0, 260, 262, 5, 114, 0, 0, 261, 257, 1, 0, 0, 0, 261, - 259, 1, 0, 0, 0, 262, 58, 1, 0, 0, 0, 263, 264, 5, 126, 0, 0, 264, 60, - 1, 0, 0, 0, 265, 270, 5, 33, 0, 0, 266, 267, 5, 110, 0, 0, 267, 268, 5, - 111, 0, 0, 268, 270, 5, 116, 0, 0, 269, 265, 1, 0, 0, 0, 269, 266, 1, 0, - 0, 0, 270, 62, 1, 0, 0, 0, 271, 272, 5, 105, 0, 0, 272, 276, 5, 110, 0, - 0, 273, 274, 5, 73, 0, 0, 274, 276, 5, 78, 0, 0, 275, 271, 1, 0, 0, 0, - 275, 273, 1, 0, 0, 0, 276, 64, 1, 0, 0, 0, 277, 282, 5, 91, 0, 0, 278, - 281, 3, 145, 72, 0, 279, 281, 3, 147, 73, 0, 280, 278, 1, 0, 0, 0, 280, - 279, 1, 0, 0, 0, 281, 284, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 282, 283, - 1, 0, 0, 0, 283, 285, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 285, 286, 5, 93, - 0, 0, 286, 66, 1, 0, 0, 0, 287, 288, 5, 106, 0, 0, 288, 289, 5, 115, 0, - 0, 289, 290, 5, 111, 0, 0, 290, 291, 5, 110, 0, 0, 291, 292, 5, 95, 0, - 0, 292, 293, 5, 99, 0, 0, 293, 294, 5, 111, 0, 0, 294, 295, 5, 110, 0, - 0, 295, 296, 5, 116, 0, 0, 296, 297, 5, 97, 0, 0, 297, 298, 5, 105, 0, - 0, 298, 299, 5, 110, 0, 0, 299, 314, 5, 115, 0, 0, 300, 301, 5, 74, 0, - 0, 301, 302, 5, 83, 0, 0, 302, 303, 5, 79, 0, 0, 303, 304, 5, 78, 0, 0, - 304, 305, 5, 95, 0, 0, 305, 306, 5, 67, 0, 0, 306, 307, 5, 79, 0, 0, 307, - 308, 5, 78, 0, 0, 308, 309, 5, 84, 0, 0, 309, 310, 5, 65, 0, 0, 310, 311, - 5, 73, 0, 0, 311, 312, 5, 78, 0, 0, 312, 314, 5, 83, 0, 0, 313, 287, 1, - 0, 0, 0, 313, 300, 1, 0, 0, 0, 314, 68, 1, 0, 0, 0, 315, 316, 5, 106, 0, - 0, 316, 317, 5, 115, 0, 0, 317, 318, 5, 111, 0, 0, 318, 319, 5, 110, 0, - 0, 319, 320, 5, 95, 0, 0, 320, 321, 5, 99, 0, 0, 321, 322, 5, 111, 0, 0, - 322, 323, 5, 110, 0, 0, 323, 324, 5, 116, 0, 0, 324, 325, 5, 97, 0, 0, - 325, 326, 5, 105, 0, 0, 326, 327, 5, 110, 0, 0, 327, 328, 5, 115, 0, 0, - 328, 329, 5, 95, 0, 0, 329, 330, 5, 97, 0, 0, 330, 331, 5, 108, 0, 0, 331, - 350, 5, 108, 0, 0, 332, 333, 5, 74, 0, 0, 333, 334, 5, 83, 0, 0, 334, 335, - 5, 79, 0, 0, 335, 336, 5, 78, 0, 0, 336, 337, 5, 95, 0, 0, 337, 338, 5, - 67, 0, 0, 338, 339, 5, 79, 0, 0, 339, 340, 5, 78, 0, 0, 340, 341, 5, 84, - 0, 0, 341, 342, 5, 65, 0, 0, 342, 343, 5, 73, 0, 0, 343, 344, 5, 78, 0, - 0, 344, 345, 5, 83, 0, 0, 345, 346, 5, 95, 0, 0, 346, 347, 5, 65, 0, 0, - 347, 348, 5, 76, 0, 0, 348, 350, 5, 76, 0, 0, 349, 315, 1, 0, 0, 0, 349, - 332, 1, 0, 0, 0, 350, 70, 1, 0, 0, 0, 351, 352, 5, 106, 0, 0, 352, 353, - 5, 115, 0, 0, 353, 354, 5, 111, 0, 0, 354, 355, 5, 110, 0, 0, 355, 356, - 5, 95, 0, 0, 356, 357, 5, 99, 0, 0, 357, 358, 5, 111, 0, 0, 358, 359, 5, - 110, 0, 0, 359, 360, 5, 116, 0, 0, 360, 361, 5, 97, 0, 0, 361, 362, 5, - 105, 0, 0, 362, 363, 5, 110, 0, 0, 363, 364, 5, 115, 0, 0, 364, 365, 5, - 95, 0, 0, 365, 366, 5, 97, 0, 0, 366, 367, 5, 110, 0, 0, 367, 386, 5, 121, - 0, 0, 368, 369, 5, 74, 0, 0, 369, 370, 5, 83, 0, 0, 370, 371, 5, 79, 0, - 0, 371, 372, 5, 78, 0, 0, 372, 373, 5, 95, 0, 0, 373, 374, 5, 67, 0, 0, - 374, 375, 5, 79, 0, 0, 375, 376, 5, 78, 0, 0, 376, 377, 5, 84, 0, 0, 377, - 378, 5, 65, 0, 0, 378, 379, 5, 73, 0, 0, 379, 380, 5, 78, 0, 0, 380, 381, - 5, 83, 0, 0, 381, 382, 5, 95, 0, 0, 382, 383, 5, 65, 0, 0, 383, 384, 5, - 78, 0, 0, 384, 386, 5, 89, 0, 0, 385, 351, 1, 0, 0, 0, 385, 368, 1, 0, - 0, 0, 386, 72, 1, 0, 0, 0, 387, 388, 5, 97, 0, 0, 388, 389, 5, 114, 0, - 0, 389, 390, 5, 114, 0, 0, 390, 391, 5, 97, 0, 0, 391, 392, 5, 121, 0, - 0, 392, 393, 5, 95, 0, 0, 393, 394, 5, 99, 0, 0, 394, 395, 5, 111, 0, 0, - 395, 396, 5, 110, 0, 0, 396, 397, 5, 116, 0, 0, 397, 398, 5, 97, 0, 0, - 398, 399, 5, 105, 0, 0, 399, 400, 5, 110, 0, 0, 400, 416, 5, 115, 0, 0, - 401, 402, 5, 65, 0, 0, 402, 403, 5, 82, 0, 0, 403, 404, 5, 82, 0, 0, 404, - 405, 5, 65, 0, 0, 405, 406, 5, 89, 0, 0, 406, 407, 5, 95, 0, 0, 407, 408, - 5, 67, 0, 0, 408, 409, 5, 79, 0, 0, 409, 410, 5, 78, 0, 0, 410, 411, 5, - 84, 0, 0, 411, 412, 5, 65, 0, 0, 412, 413, 5, 73, 0, 0, 413, 414, 5, 78, - 0, 0, 414, 416, 5, 83, 0, 0, 415, 387, 1, 0, 0, 0, 415, 401, 1, 0, 0, 0, - 416, 74, 1, 0, 0, 0, 417, 418, 5, 97, 0, 0, 418, 419, 5, 114, 0, 0, 419, - 420, 5, 114, 0, 0, 420, 421, 5, 97, 0, 0, 421, 422, 5, 121, 0, 0, 422, - 423, 5, 95, 0, 0, 423, 424, 5, 99, 0, 0, 424, 425, 5, 111, 0, 0, 425, 426, - 5, 110, 0, 0, 426, 427, 5, 116, 0, 0, 427, 428, 5, 97, 0, 0, 428, 429, - 5, 105, 0, 0, 429, 430, 5, 110, 0, 0, 430, 431, 5, 115, 0, 0, 431, 432, - 5, 95, 0, 0, 432, 433, 5, 97, 0, 0, 433, 434, 5, 108, 0, 0, 434, 454, 5, - 108, 0, 0, 435, 436, 5, 65, 0, 0, 436, 437, 5, 82, 0, 0, 437, 438, 5, 82, - 0, 0, 438, 439, 5, 65, 0, 0, 439, 440, 5, 89, 0, 0, 440, 441, 5, 95, 0, - 0, 441, 442, 5, 67, 0, 0, 442, 443, 5, 79, 0, 0, 443, 444, 5, 78, 0, 0, - 444, 445, 5, 84, 0, 0, 445, 446, 5, 65, 0, 0, 446, 447, 5, 73, 0, 0, 447, - 448, 5, 78, 0, 0, 448, 449, 5, 83, 0, 0, 449, 450, 5, 95, 0, 0, 450, 451, - 5, 65, 0, 0, 451, 452, 5, 76, 0, 0, 452, 454, 5, 76, 0, 0, 453, 417, 1, - 0, 0, 0, 453, 435, 1, 0, 0, 0, 454, 76, 1, 0, 0, 0, 455, 456, 5, 97, 0, - 0, 456, 457, 5, 114, 0, 0, 457, 458, 5, 114, 0, 0, 458, 459, 5, 97, 0, - 0, 459, 460, 5, 121, 0, 0, 460, 461, 5, 95, 0, 0, 461, 462, 5, 99, 0, 0, - 462, 463, 5, 111, 0, 0, 463, 464, 5, 110, 0, 0, 464, 465, 5, 116, 0, 0, - 465, 466, 5, 97, 0, 0, 466, 467, 5, 105, 0, 0, 467, 468, 5, 110, 0, 0, - 468, 469, 5, 115, 0, 0, 469, 470, 5, 95, 0, 0, 470, 471, 5, 97, 0, 0, 471, - 472, 5, 110, 0, 0, 472, 492, 5, 121, 0, 0, 473, 474, 5, 65, 0, 0, 474, - 475, 5, 82, 0, 0, 475, 476, 5, 82, 0, 0, 476, 477, 5, 65, 0, 0, 477, 478, - 5, 89, 0, 0, 478, 479, 5, 95, 0, 0, 479, 480, 5, 67, 0, 0, 480, 481, 5, - 79, 0, 0, 481, 482, 5, 78, 0, 0, 482, 483, 5, 84, 0, 0, 483, 484, 5, 65, - 0, 0, 484, 485, 5, 73, 0, 0, 485, 486, 5, 78, 0, 0, 486, 487, 5, 83, 0, - 0, 487, 488, 5, 95, 0, 0, 488, 489, 5, 65, 0, 0, 489, 490, 5, 78, 0, 0, - 490, 492, 5, 89, 0, 0, 491, 455, 1, 0, 0, 0, 491, 473, 1, 0, 0, 0, 492, - 78, 1, 0, 0, 0, 493, 494, 5, 97, 0, 0, 494, 495, 5, 114, 0, 0, 495, 496, - 5, 114, 0, 0, 496, 497, 5, 97, 0, 0, 497, 498, 5, 121, 0, 0, 498, 499, - 5, 95, 0, 0, 499, 500, 5, 108, 0, 0, 500, 501, 5, 101, 0, 0, 501, 502, - 5, 110, 0, 0, 502, 503, 5, 103, 0, 0, 503, 504, 5, 116, 0, 0, 504, 518, - 5, 104, 0, 0, 505, 506, 5, 65, 0, 0, 506, 507, 5, 82, 0, 0, 507, 508, 5, - 82, 0, 0, 508, 509, 5, 65, 0, 0, 509, 510, 5, 89, 0, 0, 510, 511, 5, 95, - 0, 0, 511, 512, 5, 76, 0, 0, 512, 513, 5, 69, 0, 0, 513, 514, 5, 78, 0, - 0, 514, 515, 5, 71, 0, 0, 515, 516, 5, 84, 0, 0, 516, 518, 5, 72, 0, 0, - 517, 493, 1, 0, 0, 0, 517, 505, 1, 0, 0, 0, 518, 80, 1, 0, 0, 0, 519, 520, - 5, 116, 0, 0, 520, 521, 5, 114, 0, 0, 521, 522, 5, 117, 0, 0, 522, 547, - 5, 101, 0, 0, 523, 524, 5, 84, 0, 0, 524, 525, 5, 114, 0, 0, 525, 526, - 5, 117, 0, 0, 526, 547, 5, 101, 0, 0, 527, 528, 5, 84, 0, 0, 528, 529, - 5, 82, 0, 0, 529, 530, 5, 85, 0, 0, 530, 547, 5, 69, 0, 0, 531, 532, 5, - 102, 0, 0, 532, 533, 5, 97, 0, 0, 533, 534, 5, 108, 0, 0, 534, 535, 5, - 115, 0, 0, 535, 547, 5, 101, 0, 0, 536, 537, 5, 70, 0, 0, 537, 538, 5, - 97, 0, 0, 538, 539, 5, 108, 0, 0, 539, 540, 5, 115, 0, 0, 540, 547, 5, - 101, 0, 0, 541, 542, 5, 70, 0, 0, 542, 543, 5, 65, 0, 0, 543, 544, 5, 76, - 0, 0, 544, 545, 5, 83, 0, 0, 545, 547, 5, 69, 0, 0, 546, 519, 1, 0, 0, - 0, 546, 523, 1, 0, 0, 0, 546, 527, 1, 0, 0, 0, 546, 531, 1, 0, 0, 0, 546, - 536, 1, 0, 0, 0, 546, 541, 1, 0, 0, 0, 547, 82, 1, 0, 0, 0, 548, 553, 3, - 111, 55, 0, 549, 553, 3, 113, 56, 0, 550, 553, 3, 115, 57, 0, 551, 553, - 3, 109, 54, 0, 552, 548, 1, 0, 0, 0, 552, 549, 1, 0, 0, 0, 552, 550, 1, - 0, 0, 0, 552, 551, 1, 0, 0, 0, 553, 84, 1, 0, 0, 0, 554, 557, 3, 127, 63, - 0, 555, 557, 3, 129, 64, 0, 556, 554, 1, 0, 0, 0, 556, 555, 1, 0, 0, 0, - 557, 86, 1, 0, 0, 0, 558, 563, 3, 105, 52, 0, 559, 562, 3, 105, 52, 0, - 560, 562, 3, 107, 53, 0, 561, 559, 1, 0, 0, 0, 561, 560, 1, 0, 0, 0, 562, - 565, 1, 0, 0, 0, 563, 561, 1, 0, 0, 0, 563, 564, 1, 0, 0, 0, 564, 88, 1, - 0, 0, 0, 565, 563, 1, 0, 0, 0, 566, 567, 5, 36, 0, 0, 567, 568, 5, 109, - 0, 0, 568, 569, 5, 101, 0, 0, 569, 570, 5, 116, 0, 0, 570, 571, 5, 97, - 0, 0, 571, 90, 1, 0, 0, 0, 572, 574, 3, 95, 47, 0, 573, 572, 1, 0, 0, 0, - 573, 574, 1, 0, 0, 0, 574, 585, 1, 0, 0, 0, 575, 577, 5, 34, 0, 0, 576, - 578, 3, 97, 48, 0, 577, 576, 1, 0, 0, 0, 577, 578, 1, 0, 0, 0, 578, 579, - 1, 0, 0, 0, 579, 586, 5, 34, 0, 0, 580, 582, 5, 39, 0, 0, 581, 583, 3, - 99, 49, 0, 582, 581, 1, 0, 0, 0, 582, 583, 1, 0, 0, 0, 583, 584, 1, 0, - 0, 0, 584, 586, 5, 39, 0, 0, 585, 575, 1, 0, 0, 0, 585, 580, 1, 0, 0, 0, - 586, 92, 1, 0, 0, 0, 587, 590, 3, 87, 43, 0, 588, 590, 3, 89, 44, 0, 589, - 587, 1, 0, 0, 0, 589, 588, 1, 0, 0, 0, 590, 598, 1, 0, 0, 0, 591, 594, - 5, 91, 0, 0, 592, 595, 3, 91, 45, 0, 593, 595, 3, 111, 55, 0, 594, 592, - 1, 0, 0, 0, 594, 593, 1, 0, 0, 0, 595, 596, 1, 0, 0, 0, 596, 597, 5, 93, - 0, 0, 597, 599, 1, 0, 0, 0, 598, 591, 1, 0, 0, 0, 599, 600, 1, 0, 0, 0, - 600, 598, 1, 0, 0, 0, 600, 601, 1, 0, 0, 0, 601, 94, 1, 0, 0, 0, 602, 603, - 5, 117, 0, 0, 603, 606, 5, 56, 0, 0, 604, 606, 7, 0, 0, 0, 605, 602, 1, - 0, 0, 0, 605, 604, 1, 0, 0, 0, 606, 96, 1, 0, 0, 0, 607, 609, 3, 101, 50, - 0, 608, 607, 1, 0, 0, 0, 609, 610, 1, 0, 0, 0, 610, 608, 1, 0, 0, 0, 610, - 611, 1, 0, 0, 0, 611, 98, 1, 0, 0, 0, 612, 614, 3, 103, 51, 0, 613, 612, - 1, 0, 0, 0, 614, 615, 1, 0, 0, 0, 615, 613, 1, 0, 0, 0, 615, 616, 1, 0, - 0, 0, 616, 100, 1, 0, 0, 0, 617, 625, 8, 1, 0, 0, 618, 625, 3, 143, 71, - 0, 619, 620, 5, 92, 0, 0, 620, 625, 5, 10, 0, 0, 621, 622, 5, 92, 0, 0, - 622, 623, 5, 13, 0, 0, 623, 625, 5, 10, 0, 0, 624, 617, 1, 0, 0, 0, 624, - 618, 1, 0, 0, 0, 624, 619, 1, 0, 0, 0, 624, 621, 1, 0, 0, 0, 625, 102, - 1, 0, 0, 0, 626, 634, 8, 2, 0, 0, 627, 634, 3, 143, 71, 0, 628, 629, 5, - 92, 0, 0, 629, 634, 5, 10, 0, 0, 630, 631, 5, 92, 0, 0, 631, 632, 5, 13, - 0, 0, 632, 634, 5, 10, 0, 0, 633, 626, 1, 0, 0, 0, 633, 627, 1, 0, 0, 0, - 633, 628, 1, 0, 0, 0, 633, 630, 1, 0, 0, 0, 634, 104, 1, 0, 0, 0, 635, - 636, 7, 3, 0, 0, 636, 106, 1, 0, 0, 0, 637, 638, 7, 4, 0, 0, 638, 108, - 1, 0, 0, 0, 639, 640, 5, 48, 0, 0, 640, 642, 7, 5, 0, 0, 641, 643, 7, 6, - 0, 0, 642, 641, 1, 0, 0, 0, 643, 644, 1, 0, 0, 0, 644, 642, 1, 0, 0, 0, - 644, 645, 1, 0, 0, 0, 645, 110, 1, 0, 0, 0, 646, 650, 3, 117, 58, 0, 647, - 649, 3, 107, 53, 0, 648, 647, 1, 0, 0, 0, 649, 652, 1, 0, 0, 0, 650, 648, - 1, 0, 0, 0, 650, 651, 1, 0, 0, 0, 651, 655, 1, 0, 0, 0, 652, 650, 1, 0, - 0, 0, 653, 655, 5, 48, 0, 0, 654, 646, 1, 0, 0, 0, 654, 653, 1, 0, 0, 0, - 655, 112, 1, 0, 0, 0, 656, 660, 5, 48, 0, 0, 657, 659, 3, 119, 59, 0, 658, - 657, 1, 0, 0, 0, 659, 662, 1, 0, 0, 0, 660, 658, 1, 0, 0, 0, 660, 661, - 1, 0, 0, 0, 661, 114, 1, 0, 0, 0, 662, 660, 1, 0, 0, 0, 663, 664, 5, 48, - 0, 0, 664, 665, 7, 7, 0, 0, 665, 666, 3, 139, 69, 0, 666, 116, 1, 0, 0, - 0, 667, 668, 7, 8, 0, 0, 668, 118, 1, 0, 0, 0, 669, 670, 7, 9, 0, 0, 670, - 120, 1, 0, 0, 0, 671, 672, 7, 10, 0, 0, 672, 122, 1, 0, 0, 0, 673, 674, - 3, 121, 60, 0, 674, 675, 3, 121, 60, 0, 675, 676, 3, 121, 60, 0, 676, 677, - 3, 121, 60, 0, 677, 124, 1, 0, 0, 0, 678, 679, 5, 92, 0, 0, 679, 680, 5, - 117, 0, 0, 680, 681, 1, 0, 0, 0, 681, 689, 3, 123, 61, 0, 682, 683, 5, - 92, 0, 0, 683, 684, 5, 85, 0, 0, 684, 685, 1, 0, 0, 0, 685, 686, 3, 123, - 61, 0, 686, 687, 3, 123, 61, 0, 687, 689, 1, 0, 0, 0, 688, 678, 1, 0, 0, - 0, 688, 682, 1, 0, 0, 0, 689, 126, 1, 0, 0, 0, 690, 692, 3, 131, 65, 0, - 691, 693, 3, 133, 66, 0, 692, 691, 1, 0, 0, 0, 692, 693, 1, 0, 0, 0, 693, - 698, 1, 0, 0, 0, 694, 695, 3, 135, 67, 0, 695, 696, 3, 133, 66, 0, 696, - 698, 1, 0, 0, 0, 697, 690, 1, 0, 0, 0, 697, 694, 1, 0, 0, 0, 698, 128, - 1, 0, 0, 0, 699, 700, 5, 48, 0, 0, 700, 703, 7, 7, 0, 0, 701, 704, 3, 137, - 68, 0, 702, 704, 3, 139, 69, 0, 703, 701, 1, 0, 0, 0, 703, 702, 1, 0, 0, - 0, 704, 705, 1, 0, 0, 0, 705, 706, 3, 141, 70, 0, 706, 130, 1, 0, 0, 0, - 707, 709, 3, 135, 67, 0, 708, 707, 1, 0, 0, 0, 708, 709, 1, 0, 0, 0, 709, - 710, 1, 0, 0, 0, 710, 711, 5, 46, 0, 0, 711, 716, 3, 135, 67, 0, 712, 713, - 3, 135, 67, 0, 713, 714, 5, 46, 0, 0, 714, 716, 1, 0, 0, 0, 715, 708, 1, - 0, 0, 0, 715, 712, 1, 0, 0, 0, 716, 132, 1, 0, 0, 0, 717, 719, 7, 11, 0, - 0, 718, 720, 7, 12, 0, 0, 719, 718, 1, 0, 0, 0, 719, 720, 1, 0, 0, 0, 720, - 721, 1, 0, 0, 0, 721, 722, 3, 135, 67, 0, 722, 134, 1, 0, 0, 0, 723, 725, - 3, 107, 53, 0, 724, 723, 1, 0, 0, 0, 725, 726, 1, 0, 0, 0, 726, 724, 1, - 0, 0, 0, 726, 727, 1, 0, 0, 0, 727, 136, 1, 0, 0, 0, 728, 730, 3, 139, - 69, 0, 729, 728, 1, 0, 0, 0, 729, 730, 1, 0, 0, 0, 730, 731, 1, 0, 0, 0, - 731, 732, 5, 46, 0, 0, 732, 737, 3, 139, 69, 0, 733, 734, 3, 139, 69, 0, - 734, 735, 5, 46, 0, 0, 735, 737, 1, 0, 0, 0, 736, 729, 1, 0, 0, 0, 736, - 733, 1, 0, 0, 0, 737, 138, 1, 0, 0, 0, 738, 740, 3, 121, 60, 0, 739, 738, - 1, 0, 0, 0, 740, 741, 1, 0, 0, 0, 741, 739, 1, 0, 0, 0, 741, 742, 1, 0, - 0, 0, 742, 140, 1, 0, 0, 0, 743, 745, 7, 13, 0, 0, 744, 746, 7, 12, 0, - 0, 745, 744, 1, 0, 0, 0, 745, 746, 1, 0, 0, 0, 746, 747, 1, 0, 0, 0, 747, - 748, 3, 135, 67, 0, 748, 142, 1, 0, 0, 0, 749, 750, 5, 92, 0, 0, 750, 765, - 7, 14, 0, 0, 751, 752, 5, 92, 0, 0, 752, 754, 3, 119, 59, 0, 753, 755, - 3, 119, 59, 0, 754, 753, 1, 0, 0, 0, 754, 755, 1, 0, 0, 0, 755, 757, 1, - 0, 0, 0, 756, 758, 3, 119, 59, 0, 757, 756, 1, 0, 0, 0, 757, 758, 1, 0, - 0, 0, 758, 765, 1, 0, 0, 0, 759, 760, 5, 92, 0, 0, 760, 761, 5, 120, 0, - 0, 761, 762, 1, 0, 0, 0, 762, 765, 3, 139, 69, 0, 763, 765, 3, 125, 62, - 0, 764, 749, 1, 0, 0, 0, 764, 751, 1, 0, 0, 0, 764, 759, 1, 0, 0, 0, 764, - 763, 1, 0, 0, 0, 765, 144, 1, 0, 0, 0, 766, 768, 7, 15, 0, 0, 767, 766, - 1, 0, 0, 0, 768, 769, 1, 0, 0, 0, 769, 767, 1, 0, 0, 0, 769, 770, 1, 0, - 0, 0, 770, 771, 1, 0, 0, 0, 771, 772, 6, 72, 0, 0, 772, 146, 1, 0, 0, 0, - 773, 775, 5, 13, 0, 0, 774, 776, 5, 10, 0, 0, 775, 774, 1, 0, 0, 0, 775, - 776, 1, 0, 0, 0, 776, 779, 1, 0, 0, 0, 777, 779, 5, 10, 0, 0, 778, 773, - 1, 0, 0, 0, 778, 777, 1, 0, 0, 0, 779, 780, 1, 0, 0, 0, 780, 781, 6, 73, - 0, 0, 781, 148, 1, 0, 0, 0, 56, 0, 187, 201, 223, 255, 261, 269, 275, 280, - 282, 313, 349, 385, 415, 453, 491, 517, 546, 552, 556, 561, 563, 573, 577, - 582, 585, 589, 594, 600, 605, 610, 615, 624, 633, 644, 650, 654, 660, 688, - 692, 697, 703, 708, 715, 719, 726, 729, 736, 741, 745, 754, 757, 764, 769, - 775, 778, 1, 6, 0, 0, + 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 552, 8, 40, 1, 41, + 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, + 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 1, 41, 3, 41, 574, + 8, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, + 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, + 1, 42, 1, 42, 3, 42, 598, 8, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, + 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, 1, 43, + 1, 43, 1, 43, 1, 43, 1, 43, 3, 43, 620, 8, 43, 1, 44, 1, 44, 1, 44, 1, + 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, + 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 1, 44, 3, 44, 644, 8, + 44, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, + 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, + 45, 1, 45, 1, 45, 1, 45, 1, 45, 1, 45, 3, 45, 672, 8, 45, 1, 46, 1, 46, + 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, + 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 3, 46, 692, 8, 46, 1, 47, 1, 47, + 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, + 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, 1, 47, + 1, 47, 1, 47, 1, 47, 1, 47, 3, 47, 721, 8, 47, 1, 48, 1, 48, 1, 48, 1, + 48, 3, 48, 727, 8, 48, 1, 49, 1, 49, 3, 49, 731, 8, 49, 1, 50, 1, 50, 1, + 50, 5, 50, 736, 8, 50, 10, 50, 12, 50, 739, 9, 50, 1, 51, 1, 51, 1, 51, + 1, 51, 1, 51, 1, 51, 1, 52, 3, 52, 748, 8, 52, 1, 52, 1, 52, 3, 52, 752, + 8, 52, 1, 52, 1, 52, 1, 52, 3, 52, 757, 8, 52, 1, 52, 3, 52, 760, 8, 52, + 1, 53, 1, 53, 3, 53, 764, 8, 53, 1, 53, 1, 53, 1, 53, 3, 53, 769, 8, 53, + 1, 53, 1, 53, 4, 53, 773, 8, 53, 11, 53, 12, 53, 774, 1, 54, 1, 54, 1, + 54, 3, 54, 780, 8, 54, 1, 55, 4, 55, 783, 8, 55, 11, 55, 12, 55, 784, 1, + 56, 4, 56, 788, 8, 56, 11, 56, 12, 56, 789, 1, 57, 1, 57, 1, 57, 1, 57, + 1, 57, 1, 57, 1, 57, 3, 57, 799, 8, 57, 1, 58, 1, 58, 1, 58, 1, 58, 1, + 58, 1, 58, 1, 58, 3, 58, 808, 8, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 61, + 1, 61, 1, 61, 4, 61, 817, 8, 61, 11, 61, 12, 61, 818, 1, 62, 1, 62, 5, + 62, 823, 8, 62, 10, 62, 12, 62, 826, 9, 62, 1, 62, 3, 62, 829, 8, 62, 1, + 63, 1, 63, 5, 63, 833, 8, 63, 10, 63, 12, 63, 836, 9, 63, 1, 64, 1, 64, + 1, 64, 1, 64, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 68, 1, 68, 1, + 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, 1, 69, + 1, 69, 1, 69, 3, 69, 863, 8, 69, 1, 70, 1, 70, 3, 70, 867, 8, 70, 1, 70, + 1, 70, 1, 70, 3, 70, 872, 8, 70, 1, 71, 1, 71, 1, 71, 1, 71, 3, 71, 878, + 8, 71, 1, 71, 1, 71, 1, 72, 3, 72, 883, 8, 72, 1, 72, 1, 72, 1, 72, 1, + 72, 1, 72, 3, 72, 890, 8, 72, 1, 73, 1, 73, 3, 73, 894, 8, 73, 1, 73, 1, + 73, 1, 74, 4, 74, 899, 8, 74, 11, 74, 12, 74, 900, 1, 75, 3, 75, 904, 8, + 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 3, 75, 911, 8, 75, 1, 76, 4, 76, + 914, 8, 76, 11, 76, 12, 76, 915, 1, 77, 1, 77, 3, 77, 920, 8, 77, 1, 77, + 1, 77, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 3, 78, 929, 8, 78, 1, 78, 3, + 78, 932, 8, 78, 1, 78, 1, 78, 1, 78, 1, 78, 1, 78, 3, 78, 939, 8, 78, 1, + 79, 4, 79, 942, 8, 79, 11, 79, 12, 79, 943, 1, 79, 1, 79, 1, 80, 1, 80, + 3, 80, 950, 8, 80, 1, 80, 3, 80, 953, 8, 80, 1, 80, 1, 80, 0, 0, 81, 1, + 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, + 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, + 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, + 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, + 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 89, 45, 91, 46, 93, 47, + 95, 48, 97, 49, 99, 50, 101, 51, 103, 52, 105, 53, 107, 54, 109, 0, 111, + 0, 113, 0, 115, 0, 117, 0, 119, 0, 121, 0, 123, 0, 125, 0, 127, 0, 129, + 0, 131, 0, 133, 0, 135, 0, 137, 0, 139, 0, 141, 0, 143, 0, 145, 0, 147, + 0, 149, 0, 151, 0, 153, 0, 155, 0, 157, 0, 159, 55, 161, 56, 1, 0, 16, + 3, 0, 76, 76, 85, 85, 117, 117, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 4, + 0, 10, 10, 13, 13, 39, 39, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 1, 0, + 48, 57, 2, 0, 66, 66, 98, 98, 1, 0, 48, 49, 2, 0, 88, 88, 120, 120, 1, + 0, 49, 57, 1, 0, 48, 55, 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, + 101, 2, 0, 43, 43, 45, 45, 2, 0, 80, 80, 112, 112, 10, 0, 34, 34, 39, 39, + 63, 63, 92, 92, 97, 98, 102, 102, 110, 110, 114, 114, 116, 116, 118, 118, + 2, 0, 9, 9, 32, 32, 1004, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, + 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, + 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, + 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, + 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, + 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, + 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, + 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, + 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, + 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, + 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, + 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 0, 89, 1, 0, + 0, 0, 0, 91, 1, 0, 0, 0, 0, 93, 1, 0, 0, 0, 0, 95, 1, 0, 0, 0, 0, 97, 1, + 0, 0, 0, 0, 99, 1, 0, 0, 0, 0, 101, 1, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, + 105, 1, 0, 0, 0, 0, 107, 1, 0, 0, 0, 0, 159, 1, 0, 0, 0, 0, 161, 1, 0, + 0, 0, 1, 163, 1, 0, 0, 0, 3, 165, 1, 0, 0, 0, 5, 167, 1, 0, 0, 0, 7, 169, + 1, 0, 0, 0, 9, 171, 1, 0, 0, 0, 11, 173, 1, 0, 0, 0, 13, 175, 1, 0, 0, + 0, 15, 177, 1, 0, 0, 0, 17, 179, 1, 0, 0, 0, 19, 182, 1, 0, 0, 0, 21, 184, + 1, 0, 0, 0, 23, 187, 1, 0, 0, 0, 25, 190, 1, 0, 0, 0, 27, 201, 1, 0, 0, + 0, 29, 215, 1, 0, 0, 0, 31, 237, 1, 0, 0, 0, 33, 239, 1, 0, 0, 0, 35, 241, + 1, 0, 0, 0, 37, 243, 1, 0, 0, 0, 39, 245, 1, 0, 0, 0, 41, 247, 1, 0, 0, + 0, 43, 249, 1, 0, 0, 0, 45, 252, 1, 0, 0, 0, 47, 255, 1, 0, 0, 0, 49, 258, + 1, 0, 0, 0, 51, 260, 1, 0, 0, 0, 53, 262, 1, 0, 0, 0, 55, 269, 1, 0, 0, + 0, 57, 275, 1, 0, 0, 0, 59, 277, 1, 0, 0, 0, 61, 283, 1, 0, 0, 0, 63, 289, + 1, 0, 0, 0, 65, 291, 1, 0, 0, 0, 67, 327, 1, 0, 0, 0, 69, 363, 1, 0, 0, + 0, 71, 399, 1, 0, 0, 0, 73, 429, 1, 0, 0, 0, 75, 467, 1, 0, 0, 0, 77, 505, + 1, 0, 0, 0, 79, 531, 1, 0, 0, 0, 81, 551, 1, 0, 0, 0, 83, 573, 1, 0, 0, + 0, 85, 597, 1, 0, 0, 0, 87, 619, 1, 0, 0, 0, 89, 643, 1, 0, 0, 0, 91, 671, + 1, 0, 0, 0, 93, 691, 1, 0, 0, 0, 95, 720, 1, 0, 0, 0, 97, 726, 1, 0, 0, + 0, 99, 730, 1, 0, 0, 0, 101, 732, 1, 0, 0, 0, 103, 740, 1, 0, 0, 0, 105, + 747, 1, 0, 0, 0, 107, 763, 1, 0, 0, 0, 109, 779, 1, 0, 0, 0, 111, 782, + 1, 0, 0, 0, 113, 787, 1, 0, 0, 0, 115, 798, 1, 0, 0, 0, 117, 807, 1, 0, + 0, 0, 119, 809, 1, 0, 0, 0, 121, 811, 1, 0, 0, 0, 123, 813, 1, 0, 0, 0, + 125, 828, 1, 0, 0, 0, 127, 830, 1, 0, 0, 0, 129, 837, 1, 0, 0, 0, 131, + 841, 1, 0, 0, 0, 133, 843, 1, 0, 0, 0, 135, 845, 1, 0, 0, 0, 137, 847, + 1, 0, 0, 0, 139, 862, 1, 0, 0, 0, 141, 871, 1, 0, 0, 0, 143, 873, 1, 0, + 0, 0, 145, 889, 1, 0, 0, 0, 147, 891, 1, 0, 0, 0, 149, 898, 1, 0, 0, 0, + 151, 910, 1, 0, 0, 0, 153, 913, 1, 0, 0, 0, 155, 917, 1, 0, 0, 0, 157, + 938, 1, 0, 0, 0, 159, 941, 1, 0, 0, 0, 161, 952, 1, 0, 0, 0, 163, 164, + 5, 40, 0, 0, 164, 2, 1, 0, 0, 0, 165, 166, 5, 41, 0, 0, 166, 4, 1, 0, 0, + 0, 167, 168, 5, 91, 0, 0, 168, 6, 1, 0, 0, 0, 169, 170, 5, 44, 0, 0, 170, + 8, 1, 0, 0, 0, 171, 172, 5, 93, 0, 0, 172, 10, 1, 0, 0, 0, 173, 174, 5, + 123, 0, 0, 174, 12, 1, 0, 0, 0, 175, 176, 5, 125, 0, 0, 176, 14, 1, 0, + 0, 0, 177, 178, 5, 60, 0, 0, 178, 16, 1, 0, 0, 0, 179, 180, 5, 60, 0, 0, + 180, 181, 5, 61, 0, 0, 181, 18, 1, 0, 0, 0, 182, 183, 5, 62, 0, 0, 183, + 20, 1, 0, 0, 0, 184, 185, 5, 62, 0, 0, 185, 186, 5, 61, 0, 0, 186, 22, + 1, 0, 0, 0, 187, 188, 5, 61, 0, 0, 188, 189, 5, 61, 0, 0, 189, 24, 1, 0, + 0, 0, 190, 191, 5, 33, 0, 0, 191, 192, 5, 61, 0, 0, 192, 26, 1, 0, 0, 0, + 193, 194, 5, 108, 0, 0, 194, 195, 5, 105, 0, 0, 195, 196, 5, 107, 0, 0, + 196, 202, 5, 101, 0, 0, 197, 198, 5, 76, 0, 0, 198, 199, 5, 73, 0, 0, 199, + 200, 5, 75, 0, 0, 200, 202, 5, 69, 0, 0, 201, 193, 1, 0, 0, 0, 201, 197, + 1, 0, 0, 0, 202, 28, 1, 0, 0, 0, 203, 204, 5, 101, 0, 0, 204, 205, 5, 120, + 0, 0, 205, 206, 5, 105, 0, 0, 206, 207, 5, 115, 0, 0, 207, 208, 5, 116, + 0, 0, 208, 216, 5, 115, 0, 0, 209, 210, 5, 69, 0, 0, 210, 211, 5, 88, 0, + 0, 211, 212, 5, 73, 0, 0, 212, 213, 5, 83, 0, 0, 213, 214, 5, 84, 0, 0, + 214, 216, 5, 83, 0, 0, 215, 203, 1, 0, 0, 0, 215, 209, 1, 0, 0, 0, 216, + 30, 1, 0, 0, 0, 217, 218, 5, 116, 0, 0, 218, 219, 5, 101, 0, 0, 219, 220, + 5, 120, 0, 0, 220, 221, 5, 116, 0, 0, 221, 222, 5, 95, 0, 0, 222, 223, + 5, 109, 0, 0, 223, 224, 5, 97, 0, 0, 224, 225, 5, 116, 0, 0, 225, 226, + 5, 99, 0, 0, 226, 238, 5, 104, 0, 0, 227, 228, 5, 84, 0, 0, 228, 229, 5, + 69, 0, 0, 229, 230, 5, 88, 0, 0, 230, 231, 5, 84, 0, 0, 231, 232, 5, 95, + 0, 0, 232, 233, 5, 77, 0, 0, 233, 234, 5, 65, 0, 0, 234, 235, 5, 84, 0, + 0, 235, 236, 5, 67, 0, 0, 236, 238, 5, 72, 0, 0, 237, 217, 1, 0, 0, 0, + 237, 227, 1, 0, 0, 0, 238, 32, 1, 0, 0, 0, 239, 240, 5, 43, 0, 0, 240, + 34, 1, 0, 0, 0, 241, 242, 5, 45, 0, 0, 242, 36, 1, 0, 0, 0, 243, 244, 5, + 42, 0, 0, 244, 38, 1, 0, 0, 0, 245, 246, 5, 47, 0, 0, 246, 40, 1, 0, 0, + 0, 247, 248, 5, 37, 0, 0, 248, 42, 1, 0, 0, 0, 249, 250, 5, 42, 0, 0, 250, + 251, 5, 42, 0, 0, 251, 44, 1, 0, 0, 0, 252, 253, 5, 60, 0, 0, 253, 254, + 5, 60, 0, 0, 254, 46, 1, 0, 0, 0, 255, 256, 5, 62, 0, 0, 256, 257, 5, 62, + 0, 0, 257, 48, 1, 0, 0, 0, 258, 259, 5, 38, 0, 0, 259, 50, 1, 0, 0, 0, + 260, 261, 5, 124, 0, 0, 261, 52, 1, 0, 0, 0, 262, 263, 5, 94, 0, 0, 263, + 54, 1, 0, 0, 0, 264, 265, 5, 38, 0, 0, 265, 270, 5, 38, 0, 0, 266, 267, + 5, 97, 0, 0, 267, 268, 5, 110, 0, 0, 268, 270, 5, 100, 0, 0, 269, 264, + 1, 0, 0, 0, 269, 266, 1, 0, 0, 0, 270, 56, 1, 0, 0, 0, 271, 272, 5, 124, + 0, 0, 272, 276, 5, 124, 0, 0, 273, 274, 5, 111, 0, 0, 274, 276, 5, 114, + 0, 0, 275, 271, 1, 0, 0, 0, 275, 273, 1, 0, 0, 0, 276, 58, 1, 0, 0, 0, + 277, 278, 5, 126, 0, 0, 278, 60, 1, 0, 0, 0, 279, 284, 5, 33, 0, 0, 280, + 281, 5, 110, 0, 0, 281, 282, 5, 111, 0, 0, 282, 284, 5, 116, 0, 0, 283, + 279, 1, 0, 0, 0, 283, 280, 1, 0, 0, 0, 284, 62, 1, 0, 0, 0, 285, 286, 5, + 105, 0, 0, 286, 290, 5, 110, 0, 0, 287, 288, 5, 73, 0, 0, 288, 290, 5, + 78, 0, 0, 289, 285, 1, 0, 0, 0, 289, 287, 1, 0, 0, 0, 290, 64, 1, 0, 0, + 0, 291, 296, 5, 91, 0, 0, 292, 295, 3, 159, 79, 0, 293, 295, 3, 161, 80, + 0, 294, 292, 1, 0, 0, 0, 294, 293, 1, 0, 0, 0, 295, 298, 1, 0, 0, 0, 296, + 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 299, 1, 0, 0, 0, 298, 296, + 1, 0, 0, 0, 299, 300, 5, 93, 0, 0, 300, 66, 1, 0, 0, 0, 301, 302, 5, 106, + 0, 0, 302, 303, 5, 115, 0, 0, 303, 304, 5, 111, 0, 0, 304, 305, 5, 110, + 0, 0, 305, 306, 5, 95, 0, 0, 306, 307, 5, 99, 0, 0, 307, 308, 5, 111, 0, + 0, 308, 309, 5, 110, 0, 0, 309, 310, 5, 116, 0, 0, 310, 311, 5, 97, 0, + 0, 311, 312, 5, 105, 0, 0, 312, 313, 5, 110, 0, 0, 313, 328, 5, 115, 0, + 0, 314, 315, 5, 74, 0, 0, 315, 316, 5, 83, 0, 0, 316, 317, 5, 79, 0, 0, + 317, 318, 5, 78, 0, 0, 318, 319, 5, 95, 0, 0, 319, 320, 5, 67, 0, 0, 320, + 321, 5, 79, 0, 0, 321, 322, 5, 78, 0, 0, 322, 323, 5, 84, 0, 0, 323, 324, + 5, 65, 0, 0, 324, 325, 5, 73, 0, 0, 325, 326, 5, 78, 0, 0, 326, 328, 5, + 83, 0, 0, 327, 301, 1, 0, 0, 0, 327, 314, 1, 0, 0, 0, 328, 68, 1, 0, 0, + 0, 329, 330, 5, 106, 0, 0, 330, 331, 5, 115, 0, 0, 331, 332, 5, 111, 0, + 0, 332, 333, 5, 110, 0, 0, 333, 334, 5, 95, 0, 0, 334, 335, 5, 99, 0, 0, + 335, 336, 5, 111, 0, 0, 336, 337, 5, 110, 0, 0, 337, 338, 5, 116, 0, 0, + 338, 339, 5, 97, 0, 0, 339, 340, 5, 105, 0, 0, 340, 341, 5, 110, 0, 0, + 341, 342, 5, 115, 0, 0, 342, 343, 5, 95, 0, 0, 343, 344, 5, 97, 0, 0, 344, + 345, 5, 108, 0, 0, 345, 364, 5, 108, 0, 0, 346, 347, 5, 74, 0, 0, 347, + 348, 5, 83, 0, 0, 348, 349, 5, 79, 0, 0, 349, 350, 5, 78, 0, 0, 350, 351, + 5, 95, 0, 0, 351, 352, 5, 67, 0, 0, 352, 353, 5, 79, 0, 0, 353, 354, 5, + 78, 0, 0, 354, 355, 5, 84, 0, 0, 355, 356, 5, 65, 0, 0, 356, 357, 5, 73, + 0, 0, 357, 358, 5, 78, 0, 0, 358, 359, 5, 83, 0, 0, 359, 360, 5, 95, 0, + 0, 360, 361, 5, 65, 0, 0, 361, 362, 5, 76, 0, 0, 362, 364, 5, 76, 0, 0, + 363, 329, 1, 0, 0, 0, 363, 346, 1, 0, 0, 0, 364, 70, 1, 0, 0, 0, 365, 366, + 5, 106, 0, 0, 366, 367, 5, 115, 0, 0, 367, 368, 5, 111, 0, 0, 368, 369, + 5, 110, 0, 0, 369, 370, 5, 95, 0, 0, 370, 371, 5, 99, 0, 0, 371, 372, 5, + 111, 0, 0, 372, 373, 5, 110, 0, 0, 373, 374, 5, 116, 0, 0, 374, 375, 5, + 97, 0, 0, 375, 376, 5, 105, 0, 0, 376, 377, 5, 110, 0, 0, 377, 378, 5, + 115, 0, 0, 378, 379, 5, 95, 0, 0, 379, 380, 5, 97, 0, 0, 380, 381, 5, 110, + 0, 0, 381, 400, 5, 121, 0, 0, 382, 383, 5, 74, 0, 0, 383, 384, 5, 83, 0, + 0, 384, 385, 5, 79, 0, 0, 385, 386, 5, 78, 0, 0, 386, 387, 5, 95, 0, 0, + 387, 388, 5, 67, 0, 0, 388, 389, 5, 79, 0, 0, 389, 390, 5, 78, 0, 0, 390, + 391, 5, 84, 0, 0, 391, 392, 5, 65, 0, 0, 392, 393, 5, 73, 0, 0, 393, 394, + 5, 78, 0, 0, 394, 395, 5, 83, 0, 0, 395, 396, 5, 95, 0, 0, 396, 397, 5, + 65, 0, 0, 397, 398, 5, 78, 0, 0, 398, 400, 5, 89, 0, 0, 399, 365, 1, 0, + 0, 0, 399, 382, 1, 0, 0, 0, 400, 72, 1, 0, 0, 0, 401, 402, 5, 97, 0, 0, + 402, 403, 5, 114, 0, 0, 403, 404, 5, 114, 0, 0, 404, 405, 5, 97, 0, 0, + 405, 406, 5, 121, 0, 0, 406, 407, 5, 95, 0, 0, 407, 408, 5, 99, 0, 0, 408, + 409, 5, 111, 0, 0, 409, 410, 5, 110, 0, 0, 410, 411, 5, 116, 0, 0, 411, + 412, 5, 97, 0, 0, 412, 413, 5, 105, 0, 0, 413, 414, 5, 110, 0, 0, 414, + 430, 5, 115, 0, 0, 415, 416, 5, 65, 0, 0, 416, 417, 5, 82, 0, 0, 417, 418, + 5, 82, 0, 0, 418, 419, 5, 65, 0, 0, 419, 420, 5, 89, 0, 0, 420, 421, 5, + 95, 0, 0, 421, 422, 5, 67, 0, 0, 422, 423, 5, 79, 0, 0, 423, 424, 5, 78, + 0, 0, 424, 425, 5, 84, 0, 0, 425, 426, 5, 65, 0, 0, 426, 427, 5, 73, 0, + 0, 427, 428, 5, 78, 0, 0, 428, 430, 5, 83, 0, 0, 429, 401, 1, 0, 0, 0, + 429, 415, 1, 0, 0, 0, 430, 74, 1, 0, 0, 0, 431, 432, 5, 97, 0, 0, 432, + 433, 5, 114, 0, 0, 433, 434, 5, 114, 0, 0, 434, 435, 5, 97, 0, 0, 435, + 436, 5, 121, 0, 0, 436, 437, 5, 95, 0, 0, 437, 438, 5, 99, 0, 0, 438, 439, + 5, 111, 0, 0, 439, 440, 5, 110, 0, 0, 440, 441, 5, 116, 0, 0, 441, 442, + 5, 97, 0, 0, 442, 443, 5, 105, 0, 0, 443, 444, 5, 110, 0, 0, 444, 445, + 5, 115, 0, 0, 445, 446, 5, 95, 0, 0, 446, 447, 5, 97, 0, 0, 447, 448, 5, + 108, 0, 0, 448, 468, 5, 108, 0, 0, 449, 450, 5, 65, 0, 0, 450, 451, 5, + 82, 0, 0, 451, 452, 5, 82, 0, 0, 452, 453, 5, 65, 0, 0, 453, 454, 5, 89, + 0, 0, 454, 455, 5, 95, 0, 0, 455, 456, 5, 67, 0, 0, 456, 457, 5, 79, 0, + 0, 457, 458, 5, 78, 0, 0, 458, 459, 5, 84, 0, 0, 459, 460, 5, 65, 0, 0, + 460, 461, 5, 73, 0, 0, 461, 462, 5, 78, 0, 0, 462, 463, 5, 83, 0, 0, 463, + 464, 5, 95, 0, 0, 464, 465, 5, 65, 0, 0, 465, 466, 5, 76, 0, 0, 466, 468, + 5, 76, 0, 0, 467, 431, 1, 0, 0, 0, 467, 449, 1, 0, 0, 0, 468, 76, 1, 0, + 0, 0, 469, 470, 5, 97, 0, 0, 470, 471, 5, 114, 0, 0, 471, 472, 5, 114, + 0, 0, 472, 473, 5, 97, 0, 0, 473, 474, 5, 121, 0, 0, 474, 475, 5, 95, 0, + 0, 475, 476, 5, 99, 0, 0, 476, 477, 5, 111, 0, 0, 477, 478, 5, 110, 0, + 0, 478, 479, 5, 116, 0, 0, 479, 480, 5, 97, 0, 0, 480, 481, 5, 105, 0, + 0, 481, 482, 5, 110, 0, 0, 482, 483, 5, 115, 0, 0, 483, 484, 5, 95, 0, + 0, 484, 485, 5, 97, 0, 0, 485, 486, 5, 110, 0, 0, 486, 506, 5, 121, 0, + 0, 487, 488, 5, 65, 0, 0, 488, 489, 5, 82, 0, 0, 489, 490, 5, 82, 0, 0, + 490, 491, 5, 65, 0, 0, 491, 492, 5, 89, 0, 0, 492, 493, 5, 95, 0, 0, 493, + 494, 5, 67, 0, 0, 494, 495, 5, 79, 0, 0, 495, 496, 5, 78, 0, 0, 496, 497, + 5, 84, 0, 0, 497, 498, 5, 65, 0, 0, 498, 499, 5, 73, 0, 0, 499, 500, 5, + 78, 0, 0, 500, 501, 5, 83, 0, 0, 501, 502, 5, 95, 0, 0, 502, 503, 5, 65, + 0, 0, 503, 504, 5, 78, 0, 0, 504, 506, 5, 89, 0, 0, 505, 469, 1, 0, 0, + 0, 505, 487, 1, 0, 0, 0, 506, 78, 1, 0, 0, 0, 507, 508, 5, 97, 0, 0, 508, + 509, 5, 114, 0, 0, 509, 510, 5, 114, 0, 0, 510, 511, 5, 97, 0, 0, 511, + 512, 5, 121, 0, 0, 512, 513, 5, 95, 0, 0, 513, 514, 5, 108, 0, 0, 514, + 515, 5, 101, 0, 0, 515, 516, 5, 110, 0, 0, 516, 517, 5, 103, 0, 0, 517, + 518, 5, 116, 0, 0, 518, 532, 5, 104, 0, 0, 519, 520, 5, 65, 0, 0, 520, + 521, 5, 82, 0, 0, 521, 522, 5, 82, 0, 0, 522, 523, 5, 65, 0, 0, 523, 524, + 5, 89, 0, 0, 524, 525, 5, 95, 0, 0, 525, 526, 5, 76, 0, 0, 526, 527, 5, + 69, 0, 0, 527, 528, 5, 78, 0, 0, 528, 529, 5, 71, 0, 0, 529, 530, 5, 84, + 0, 0, 530, 532, 5, 72, 0, 0, 531, 507, 1, 0, 0, 0, 531, 519, 1, 0, 0, 0, + 532, 80, 1, 0, 0, 0, 533, 534, 5, 115, 0, 0, 534, 535, 5, 116, 0, 0, 535, + 536, 5, 95, 0, 0, 536, 537, 5, 101, 0, 0, 537, 538, 5, 113, 0, 0, 538, + 539, 5, 117, 0, 0, 539, 540, 5, 97, 0, 0, 540, 541, 5, 108, 0, 0, 541, + 552, 5, 115, 0, 0, 542, 543, 5, 83, 0, 0, 543, 544, 5, 84, 0, 0, 544, 545, + 5, 95, 0, 0, 545, 546, 5, 69, 0, 0, 546, 547, 5, 81, 0, 0, 547, 548, 5, + 85, 0, 0, 548, 549, 5, 65, 0, 0, 549, 550, 5, 76, 0, 0, 550, 552, 5, 83, + 0, 0, 551, 533, 1, 0, 0, 0, 551, 542, 1, 0, 0, 0, 552, 82, 1, 0, 0, 0, + 553, 554, 5, 115, 0, 0, 554, 555, 5, 116, 0, 0, 555, 556, 5, 95, 0, 0, + 556, 557, 5, 116, 0, 0, 557, 558, 5, 111, 0, 0, 558, 559, 5, 117, 0, 0, + 559, 560, 5, 99, 0, 0, 560, 561, 5, 104, 0, 0, 561, 562, 5, 101, 0, 0, + 562, 574, 5, 115, 0, 0, 563, 564, 5, 83, 0, 0, 564, 565, 5, 84, 0, 0, 565, + 566, 5, 95, 0, 0, 566, 567, 5, 84, 0, 0, 567, 568, 5, 79, 0, 0, 568, 569, + 5, 85, 0, 0, 569, 570, 5, 67, 0, 0, 570, 571, 5, 72, 0, 0, 571, 572, 5, + 69, 0, 0, 572, 574, 5, 83, 0, 0, 573, 553, 1, 0, 0, 0, 573, 563, 1, 0, + 0, 0, 574, 84, 1, 0, 0, 0, 575, 576, 5, 115, 0, 0, 576, 577, 5, 116, 0, + 0, 577, 578, 5, 95, 0, 0, 578, 579, 5, 111, 0, 0, 579, 580, 5, 118, 0, + 0, 580, 581, 5, 101, 0, 0, 581, 582, 5, 114, 0, 0, 582, 583, 5, 108, 0, + 0, 583, 584, 5, 97, 0, 0, 584, 585, 5, 112, 0, 0, 585, 598, 5, 115, 0, + 0, 586, 587, 5, 83, 0, 0, 587, 588, 5, 84, 0, 0, 588, 589, 5, 95, 0, 0, + 589, 590, 5, 79, 0, 0, 590, 591, 5, 86, 0, 0, 591, 592, 5, 69, 0, 0, 592, + 593, 5, 82, 0, 0, 593, 594, 5, 76, 0, 0, 594, 595, 5, 65, 0, 0, 595, 596, + 5, 80, 0, 0, 596, 598, 5, 83, 0, 0, 597, 575, 1, 0, 0, 0, 597, 586, 1, + 0, 0, 0, 598, 86, 1, 0, 0, 0, 599, 600, 5, 115, 0, 0, 600, 601, 5, 116, + 0, 0, 601, 602, 5, 95, 0, 0, 602, 603, 5, 99, 0, 0, 603, 604, 5, 114, 0, + 0, 604, 605, 5, 111, 0, 0, 605, 606, 5, 115, 0, 0, 606, 607, 5, 115, 0, + 0, 607, 608, 5, 101, 0, 0, 608, 620, 5, 115, 0, 0, 609, 610, 5, 83, 0, + 0, 610, 611, 5, 84, 0, 0, 611, 612, 5, 95, 0, 0, 612, 613, 5, 67, 0, 0, + 613, 614, 5, 82, 0, 0, 614, 615, 5, 79, 0, 0, 615, 616, 5, 83, 0, 0, 616, + 617, 5, 83, 0, 0, 617, 618, 5, 69, 0, 0, 618, 620, 5, 83, 0, 0, 619, 599, + 1, 0, 0, 0, 619, 609, 1, 0, 0, 0, 620, 88, 1, 0, 0, 0, 621, 622, 5, 115, + 0, 0, 622, 623, 5, 116, 0, 0, 623, 624, 5, 95, 0, 0, 624, 625, 5, 99, 0, + 0, 625, 626, 5, 111, 0, 0, 626, 627, 5, 110, 0, 0, 627, 628, 5, 116, 0, + 0, 628, 629, 5, 97, 0, 0, 629, 630, 5, 105, 0, 0, 630, 631, 5, 110, 0, + 0, 631, 644, 5, 115, 0, 0, 632, 633, 5, 83, 0, 0, 633, 634, 5, 84, 0, 0, + 634, 635, 5, 95, 0, 0, 635, 636, 5, 67, 0, 0, 636, 637, 5, 79, 0, 0, 637, + 638, 5, 78, 0, 0, 638, 639, 5, 84, 0, 0, 639, 640, 5, 65, 0, 0, 640, 641, + 5, 73, 0, 0, 641, 642, 5, 78, 0, 0, 642, 644, 5, 83, 0, 0, 643, 621, 1, + 0, 0, 0, 643, 632, 1, 0, 0, 0, 644, 90, 1, 0, 0, 0, 645, 646, 5, 115, 0, + 0, 646, 647, 5, 116, 0, 0, 647, 648, 5, 95, 0, 0, 648, 649, 5, 105, 0, + 0, 649, 650, 5, 110, 0, 0, 650, 651, 5, 116, 0, 0, 651, 652, 5, 101, 0, + 0, 652, 653, 5, 114, 0, 0, 653, 654, 5, 115, 0, 0, 654, 655, 5, 101, 0, + 0, 655, 656, 5, 99, 0, 0, 656, 657, 5, 116, 0, 0, 657, 672, 5, 115, 0, + 0, 658, 659, 5, 83, 0, 0, 659, 660, 5, 84, 0, 0, 660, 661, 5, 95, 0, 0, + 661, 662, 5, 73, 0, 0, 662, 663, 5, 78, 0, 0, 663, 664, 5, 84, 0, 0, 664, + 665, 5, 69, 0, 0, 665, 666, 5, 82, 0, 0, 666, 667, 5, 83, 0, 0, 667, 668, + 5, 69, 0, 0, 668, 669, 5, 67, 0, 0, 669, 670, 5, 84, 0, 0, 670, 672, 5, + 83, 0, 0, 671, 645, 1, 0, 0, 0, 671, 658, 1, 0, 0, 0, 672, 92, 1, 0, 0, + 0, 673, 674, 5, 115, 0, 0, 674, 675, 5, 116, 0, 0, 675, 676, 5, 95, 0, + 0, 676, 677, 5, 119, 0, 0, 677, 678, 5, 105, 0, 0, 678, 679, 5, 116, 0, + 0, 679, 680, 5, 104, 0, 0, 680, 681, 5, 105, 0, 0, 681, 692, 5, 110, 0, + 0, 682, 683, 5, 83, 0, 0, 683, 684, 5, 84, 0, 0, 684, 685, 5, 95, 0, 0, + 685, 686, 5, 87, 0, 0, 686, 687, 5, 73, 0, 0, 687, 688, 5, 84, 0, 0, 688, + 689, 5, 72, 0, 0, 689, 690, 5, 73, 0, 0, 690, 692, 5, 78, 0, 0, 691, 673, + 1, 0, 0, 0, 691, 682, 1, 0, 0, 0, 692, 94, 1, 0, 0, 0, 693, 694, 5, 116, + 0, 0, 694, 695, 5, 114, 0, 0, 695, 696, 5, 117, 0, 0, 696, 721, 5, 101, + 0, 0, 697, 698, 5, 84, 0, 0, 698, 699, 5, 114, 0, 0, 699, 700, 5, 117, + 0, 0, 700, 721, 5, 101, 0, 0, 701, 702, 5, 84, 0, 0, 702, 703, 5, 82, 0, + 0, 703, 704, 5, 85, 0, 0, 704, 721, 5, 69, 0, 0, 705, 706, 5, 102, 0, 0, + 706, 707, 5, 97, 0, 0, 707, 708, 5, 108, 0, 0, 708, 709, 5, 115, 0, 0, + 709, 721, 5, 101, 0, 0, 710, 711, 5, 70, 0, 0, 711, 712, 5, 97, 0, 0, 712, + 713, 5, 108, 0, 0, 713, 714, 5, 115, 0, 0, 714, 721, 5, 101, 0, 0, 715, + 716, 5, 70, 0, 0, 716, 717, 5, 65, 0, 0, 717, 718, 5, 76, 0, 0, 718, 719, + 5, 83, 0, 0, 719, 721, 5, 69, 0, 0, 720, 693, 1, 0, 0, 0, 720, 697, 1, + 0, 0, 0, 720, 701, 1, 0, 0, 0, 720, 705, 1, 0, 0, 0, 720, 710, 1, 0, 0, + 0, 720, 715, 1, 0, 0, 0, 721, 96, 1, 0, 0, 0, 722, 727, 3, 125, 62, 0, + 723, 727, 3, 127, 63, 0, 724, 727, 3, 129, 64, 0, 725, 727, 3, 123, 61, + 0, 726, 722, 1, 0, 0, 0, 726, 723, 1, 0, 0, 0, 726, 724, 1, 0, 0, 0, 726, + 725, 1, 0, 0, 0, 727, 98, 1, 0, 0, 0, 728, 731, 3, 141, 70, 0, 729, 731, + 3, 143, 71, 0, 730, 728, 1, 0, 0, 0, 730, 729, 1, 0, 0, 0, 731, 100, 1, + 0, 0, 0, 732, 737, 3, 119, 59, 0, 733, 736, 3, 119, 59, 0, 734, 736, 3, + 121, 60, 0, 735, 733, 1, 0, 0, 0, 735, 734, 1, 0, 0, 0, 736, 739, 1, 0, + 0, 0, 737, 735, 1, 0, 0, 0, 737, 738, 1, 0, 0, 0, 738, 102, 1, 0, 0, 0, + 739, 737, 1, 0, 0, 0, 740, 741, 5, 36, 0, 0, 741, 742, 5, 109, 0, 0, 742, + 743, 5, 101, 0, 0, 743, 744, 5, 116, 0, 0, 744, 745, 5, 97, 0, 0, 745, + 104, 1, 0, 0, 0, 746, 748, 3, 109, 54, 0, 747, 746, 1, 0, 0, 0, 747, 748, + 1, 0, 0, 0, 748, 759, 1, 0, 0, 0, 749, 751, 5, 34, 0, 0, 750, 752, 3, 111, + 55, 0, 751, 750, 1, 0, 0, 0, 751, 752, 1, 0, 0, 0, 752, 753, 1, 0, 0, 0, + 753, 760, 5, 34, 0, 0, 754, 756, 5, 39, 0, 0, 755, 757, 3, 113, 56, 0, + 756, 755, 1, 0, 0, 0, 756, 757, 1, 0, 0, 0, 757, 758, 1, 0, 0, 0, 758, + 760, 5, 39, 0, 0, 759, 749, 1, 0, 0, 0, 759, 754, 1, 0, 0, 0, 760, 106, + 1, 0, 0, 0, 761, 764, 3, 101, 50, 0, 762, 764, 3, 103, 51, 0, 763, 761, + 1, 0, 0, 0, 763, 762, 1, 0, 0, 0, 764, 772, 1, 0, 0, 0, 765, 768, 5, 91, + 0, 0, 766, 769, 3, 105, 52, 0, 767, 769, 3, 125, 62, 0, 768, 766, 1, 0, + 0, 0, 768, 767, 1, 0, 0, 0, 769, 770, 1, 0, 0, 0, 770, 771, 5, 93, 0, 0, + 771, 773, 1, 0, 0, 0, 772, 765, 1, 0, 0, 0, 773, 774, 1, 0, 0, 0, 774, + 772, 1, 0, 0, 0, 774, 775, 1, 0, 0, 0, 775, 108, 1, 0, 0, 0, 776, 777, + 5, 117, 0, 0, 777, 780, 5, 56, 0, 0, 778, 780, 7, 0, 0, 0, 779, 776, 1, + 0, 0, 0, 779, 778, 1, 0, 0, 0, 780, 110, 1, 0, 0, 0, 781, 783, 3, 115, + 57, 0, 782, 781, 1, 0, 0, 0, 783, 784, 1, 0, 0, 0, 784, 782, 1, 0, 0, 0, + 784, 785, 1, 0, 0, 0, 785, 112, 1, 0, 0, 0, 786, 788, 3, 117, 58, 0, 787, + 786, 1, 0, 0, 0, 788, 789, 1, 0, 0, 0, 789, 787, 1, 0, 0, 0, 789, 790, + 1, 0, 0, 0, 790, 114, 1, 0, 0, 0, 791, 799, 8, 1, 0, 0, 792, 799, 3, 157, + 78, 0, 793, 794, 5, 92, 0, 0, 794, 799, 5, 10, 0, 0, 795, 796, 5, 92, 0, + 0, 796, 797, 5, 13, 0, 0, 797, 799, 5, 10, 0, 0, 798, 791, 1, 0, 0, 0, + 798, 792, 1, 0, 0, 0, 798, 793, 1, 0, 0, 0, 798, 795, 1, 0, 0, 0, 799, + 116, 1, 0, 0, 0, 800, 808, 8, 2, 0, 0, 801, 808, 3, 157, 78, 0, 802, 803, + 5, 92, 0, 0, 803, 808, 5, 10, 0, 0, 804, 805, 5, 92, 0, 0, 805, 806, 5, + 13, 0, 0, 806, 808, 5, 10, 0, 0, 807, 800, 1, 0, 0, 0, 807, 801, 1, 0, + 0, 0, 807, 802, 1, 0, 0, 0, 807, 804, 1, 0, 0, 0, 808, 118, 1, 0, 0, 0, + 809, 810, 7, 3, 0, 0, 810, 120, 1, 0, 0, 0, 811, 812, 7, 4, 0, 0, 812, + 122, 1, 0, 0, 0, 813, 814, 5, 48, 0, 0, 814, 816, 7, 5, 0, 0, 815, 817, + 7, 6, 0, 0, 816, 815, 1, 0, 0, 0, 817, 818, 1, 0, 0, 0, 818, 816, 1, 0, + 0, 0, 818, 819, 1, 0, 0, 0, 819, 124, 1, 0, 0, 0, 820, 824, 3, 131, 65, + 0, 821, 823, 3, 121, 60, 0, 822, 821, 1, 0, 0, 0, 823, 826, 1, 0, 0, 0, + 824, 822, 1, 0, 0, 0, 824, 825, 1, 0, 0, 0, 825, 829, 1, 0, 0, 0, 826, + 824, 1, 0, 0, 0, 827, 829, 5, 48, 0, 0, 828, 820, 1, 0, 0, 0, 828, 827, + 1, 0, 0, 0, 829, 126, 1, 0, 0, 0, 830, 834, 5, 48, 0, 0, 831, 833, 3, 133, + 66, 0, 832, 831, 1, 0, 0, 0, 833, 836, 1, 0, 0, 0, 834, 832, 1, 0, 0, 0, + 834, 835, 1, 0, 0, 0, 835, 128, 1, 0, 0, 0, 836, 834, 1, 0, 0, 0, 837, + 838, 5, 48, 0, 0, 838, 839, 7, 7, 0, 0, 839, 840, 3, 153, 76, 0, 840, 130, + 1, 0, 0, 0, 841, 842, 7, 8, 0, 0, 842, 132, 1, 0, 0, 0, 843, 844, 7, 9, + 0, 0, 844, 134, 1, 0, 0, 0, 845, 846, 7, 10, 0, 0, 846, 136, 1, 0, 0, 0, + 847, 848, 3, 135, 67, 0, 848, 849, 3, 135, 67, 0, 849, 850, 3, 135, 67, + 0, 850, 851, 3, 135, 67, 0, 851, 138, 1, 0, 0, 0, 852, 853, 5, 92, 0, 0, + 853, 854, 5, 117, 0, 0, 854, 855, 1, 0, 0, 0, 855, 863, 3, 137, 68, 0, + 856, 857, 5, 92, 0, 0, 857, 858, 5, 85, 0, 0, 858, 859, 1, 0, 0, 0, 859, + 860, 3, 137, 68, 0, 860, 861, 3, 137, 68, 0, 861, 863, 1, 0, 0, 0, 862, + 852, 1, 0, 0, 0, 862, 856, 1, 0, 0, 0, 863, 140, 1, 0, 0, 0, 864, 866, + 3, 145, 72, 0, 865, 867, 3, 147, 73, 0, 866, 865, 1, 0, 0, 0, 866, 867, + 1, 0, 0, 0, 867, 872, 1, 0, 0, 0, 868, 869, 3, 149, 74, 0, 869, 870, 3, + 147, 73, 0, 870, 872, 1, 0, 0, 0, 871, 864, 1, 0, 0, 0, 871, 868, 1, 0, + 0, 0, 872, 142, 1, 0, 0, 0, 873, 874, 5, 48, 0, 0, 874, 877, 7, 7, 0, 0, + 875, 878, 3, 151, 75, 0, 876, 878, 3, 153, 76, 0, 877, 875, 1, 0, 0, 0, + 877, 876, 1, 0, 0, 0, 878, 879, 1, 0, 0, 0, 879, 880, 3, 155, 77, 0, 880, + 144, 1, 0, 0, 0, 881, 883, 3, 149, 74, 0, 882, 881, 1, 0, 0, 0, 882, 883, + 1, 0, 0, 0, 883, 884, 1, 0, 0, 0, 884, 885, 5, 46, 0, 0, 885, 890, 3, 149, + 74, 0, 886, 887, 3, 149, 74, 0, 887, 888, 5, 46, 0, 0, 888, 890, 1, 0, + 0, 0, 889, 882, 1, 0, 0, 0, 889, 886, 1, 0, 0, 0, 890, 146, 1, 0, 0, 0, + 891, 893, 7, 11, 0, 0, 892, 894, 7, 12, 0, 0, 893, 892, 1, 0, 0, 0, 893, + 894, 1, 0, 0, 0, 894, 895, 1, 0, 0, 0, 895, 896, 3, 149, 74, 0, 896, 148, + 1, 0, 0, 0, 897, 899, 3, 121, 60, 0, 898, 897, 1, 0, 0, 0, 899, 900, 1, + 0, 0, 0, 900, 898, 1, 0, 0, 0, 900, 901, 1, 0, 0, 0, 901, 150, 1, 0, 0, + 0, 902, 904, 3, 153, 76, 0, 903, 902, 1, 0, 0, 0, 903, 904, 1, 0, 0, 0, + 904, 905, 1, 0, 0, 0, 905, 906, 5, 46, 0, 0, 906, 911, 3, 153, 76, 0, 907, + 908, 3, 153, 76, 0, 908, 909, 5, 46, 0, 0, 909, 911, 1, 0, 0, 0, 910, 903, + 1, 0, 0, 0, 910, 907, 1, 0, 0, 0, 911, 152, 1, 0, 0, 0, 912, 914, 3, 135, + 67, 0, 913, 912, 1, 0, 0, 0, 914, 915, 1, 0, 0, 0, 915, 913, 1, 0, 0, 0, + 915, 916, 1, 0, 0, 0, 916, 154, 1, 0, 0, 0, 917, 919, 7, 13, 0, 0, 918, + 920, 7, 12, 0, 0, 919, 918, 1, 0, 0, 0, 919, 920, 1, 0, 0, 0, 920, 921, + 1, 0, 0, 0, 921, 922, 3, 149, 74, 0, 922, 156, 1, 0, 0, 0, 923, 924, 5, + 92, 0, 0, 924, 939, 7, 14, 0, 0, 925, 926, 5, 92, 0, 0, 926, 928, 3, 133, + 66, 0, 927, 929, 3, 133, 66, 0, 928, 927, 1, 0, 0, 0, 928, 929, 1, 0, 0, + 0, 929, 931, 1, 0, 0, 0, 930, 932, 3, 133, 66, 0, 931, 930, 1, 0, 0, 0, + 931, 932, 1, 0, 0, 0, 932, 939, 1, 0, 0, 0, 933, 934, 5, 92, 0, 0, 934, + 935, 5, 120, 0, 0, 935, 936, 1, 0, 0, 0, 936, 939, 3, 153, 76, 0, 937, + 939, 3, 139, 69, 0, 938, 923, 1, 0, 0, 0, 938, 925, 1, 0, 0, 0, 938, 933, + 1, 0, 0, 0, 938, 937, 1, 0, 0, 0, 939, 158, 1, 0, 0, 0, 940, 942, 7, 15, + 0, 0, 941, 940, 1, 0, 0, 0, 942, 943, 1, 0, 0, 0, 943, 941, 1, 0, 0, 0, + 943, 944, 1, 0, 0, 0, 944, 945, 1, 0, 0, 0, 945, 946, 6, 79, 0, 0, 946, + 160, 1, 0, 0, 0, 947, 949, 5, 13, 0, 0, 948, 950, 5, 10, 0, 0, 949, 948, + 1, 0, 0, 0, 949, 950, 1, 0, 0, 0, 950, 953, 1, 0, 0, 0, 951, 953, 5, 10, + 0, 0, 952, 947, 1, 0, 0, 0, 952, 951, 1, 0, 0, 0, 953, 954, 1, 0, 0, 0, + 954, 955, 6, 80, 0, 0, 955, 162, 1, 0, 0, 0, 63, 0, 201, 215, 237, 269, + 275, 283, 289, 294, 296, 327, 363, 399, 429, 467, 505, 531, 551, 573, 597, + 619, 643, 671, 691, 720, 726, 730, 735, 737, 747, 751, 756, 759, 763, 768, + 774, 779, 784, 789, 798, 807, 818, 824, 828, 834, 862, 866, 871, 877, 882, + 889, 893, 900, 903, 910, 915, 919, 928, 931, 938, 943, 949, 952, 1, 6, + 0, 0, } deserializer := antlr.NewATNDeserializer(nil) staticData.atn = deserializer.Deserialize(staticData.serializedATN) @@ -509,13 +590,20 @@ const ( PlanLexerArrayContainsAll = 38 PlanLexerArrayContainsAny = 39 PlanLexerArrayLength = 40 - PlanLexerBooleanConstant = 41 - PlanLexerIntegerConstant = 42 - PlanLexerFloatingConstant = 43 - PlanLexerIdentifier = 44 - PlanLexerMeta = 45 - PlanLexerStringLiteral = 46 - PlanLexerJSONIdentifier = 47 - PlanLexerWhitespace = 48 - PlanLexerNewline = 49 + PlanLexerSTEuqals = 41 + PlanLexerSTTouches = 42 + PlanLexerSTOverlaps = 43 + PlanLexerSTCrosses = 44 + PlanLexerSTContains = 45 + PlanLexerSTIntersects = 46 + PlanLexerSTWithin = 47 + PlanLexerBooleanConstant = 48 + PlanLexerIntegerConstant = 49 + PlanLexerFloatingConstant = 50 + PlanLexerIdentifier = 51 + PlanLexerMeta = 52 + PlanLexerStringLiteral = 53 + PlanLexerJSONIdentifier = 54 + PlanLexerWhitespace = 55 + PlanLexerNewline = 56 ) diff --git a/internal/parser/planparserv2/generated/plan_parser.go b/internal/parser/planparserv2/generated/plan_parser.go index 971e8f505bcd1..79273835579a7 100644 --- a/internal/parser/planparserv2/generated/plan_parser.go +++ b/internal/parser/planparserv2/generated/plan_parser.go @@ -35,7 +35,8 @@ func planParserInit() { "", "'('", "')'", "'['", "','", "']'", "'{'", "'}'", "'<'", "'<='", "'>'", "'>='", "'=='", "'!='", "", "", "", "'+'", "'-'", "'*'", "'/'", "'%'", "'**'", "'<<'", "'>>'", "'&'", "'|'", "'^'", "", "", "'~'", "", - "", "", "", "", "", "", "", "", "", "", "", "", "", "'$meta'", + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", + "", "", "", "'$meta'", } staticData.SymbolicNames = []string{ "", "", "", "", "", "", "LBRACE", "RBRACE", "LT", "LE", "GT", "GE", @@ -43,83 +44,104 @@ func planParserInit() { "MOD", "POW", "SHL", "SHR", "BAND", "BOR", "BXOR", "AND", "OR", "BNOT", "NOT", "IN", "EmptyArray", "JSONContains", "JSONContainsAll", "JSONContainsAny", "ArrayContains", "ArrayContainsAll", "ArrayContainsAny", "ArrayLength", - "BooleanConstant", "IntegerConstant", "FloatingConstant", "Identifier", - "Meta", "StringLiteral", "JSONIdentifier", "Whitespace", "Newline", + "STEuqals", "STTouches", "STOverlaps", "STCrosses", "STContains", "STIntersects", + "STWithin", "BooleanConstant", "IntegerConstant", "FloatingConstant", + "Identifier", "Meta", "StringLiteral", "JSONIdentifier", "Whitespace", + "Newline", } staticData.RuleNames = []string{ "expr", } staticData.PredictionContextCache = antlr.NewPredictionContextCache() staticData.serializedATN = []int32{ - 4, 1, 49, 142, 2, 0, 7, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, + 4, 1, 56, 184, 2, 0, 7, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 3, 0, 27, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 5, 0, 70, 8, 0, 10, 0, 12, 0, 73, 9, 0, 1, 0, 3, 0, 76, 8, 0, - 3, 0, 78, 8, 0, 1, 0, 1, 0, 1, 0, 3, 0, 83, 8, 0, 1, 0, 1, 0, 1, 0, 1, - 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 99, - 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 112, 8, 0, 10, 0, 12, + 0, 115, 9, 0, 1, 0, 3, 0, 118, 8, 0, 3, 0, 120, 8, 0, 1, 0, 1, 0, 1, 0, + 3, 0, 125, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 141, 8, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 5, 0, 137, 8, 0, 10, 0, 12, 0, 140, 9, 0, 1, 0, 0, 1, 0, 1, 0, 0, - 13, 1, 0, 44, 45, 2, 0, 17, 18, 30, 31, 2, 0, 34, 34, 37, 37, 2, 0, 35, - 35, 38, 38, 2, 0, 36, 36, 39, 39, 2, 0, 44, 44, 47, 47, 1, 0, 19, 21, 1, - 0, 17, 18, 1, 0, 23, 24, 1, 0, 8, 9, 1, 0, 10, 11, 1, 0, 8, 11, 1, 0, 12, - 13, 178, 0, 82, 1, 0, 0, 0, 2, 3, 6, 0, -1, 0, 3, 83, 5, 42, 0, 0, 4, 83, - 5, 43, 0, 0, 5, 83, 5, 41, 0, 0, 6, 83, 5, 46, 0, 0, 7, 83, 7, 0, 0, 0, - 8, 83, 5, 47, 0, 0, 9, 10, 5, 6, 0, 0, 10, 11, 5, 44, 0, 0, 11, 83, 5, - 7, 0, 0, 12, 13, 5, 1, 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 2, 0, 0, 15, - 83, 1, 0, 0, 0, 16, 17, 5, 3, 0, 0, 17, 22, 3, 0, 0, 0, 18, 19, 5, 4, 0, - 0, 19, 21, 3, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, - 1, 0, 0, 0, 22, 23, 1, 0, 0, 0, 23, 26, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, - 25, 27, 5, 4, 0, 0, 26, 25, 1, 0, 0, 0, 26, 27, 1, 0, 0, 0, 27, 28, 1, - 0, 0, 0, 28, 29, 5, 5, 0, 0, 29, 83, 1, 0, 0, 0, 30, 83, 5, 33, 0, 0, 31, - 32, 5, 16, 0, 0, 32, 33, 5, 1, 0, 0, 33, 34, 5, 44, 0, 0, 34, 35, 5, 4, - 0, 0, 35, 36, 5, 46, 0, 0, 36, 83, 5, 2, 0, 0, 37, 38, 7, 1, 0, 0, 38, - 83, 3, 0, 0, 20, 39, 40, 7, 2, 0, 0, 40, 41, 5, 1, 0, 0, 41, 42, 3, 0, - 0, 0, 42, 43, 5, 4, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 2, 0, 0, 45, 83, - 1, 0, 0, 0, 46, 47, 7, 3, 0, 0, 47, 48, 5, 1, 0, 0, 48, 49, 3, 0, 0, 0, - 49, 50, 5, 4, 0, 0, 50, 51, 3, 0, 0, 0, 51, 52, 5, 2, 0, 0, 52, 83, 1, - 0, 0, 0, 53, 54, 7, 4, 0, 0, 54, 55, 5, 1, 0, 0, 55, 56, 3, 0, 0, 0, 56, - 57, 5, 4, 0, 0, 57, 58, 3, 0, 0, 0, 58, 59, 5, 2, 0, 0, 59, 83, 1, 0, 0, - 0, 60, 61, 5, 40, 0, 0, 61, 62, 5, 1, 0, 0, 62, 63, 7, 5, 0, 0, 63, 83, - 5, 2, 0, 0, 64, 65, 5, 44, 0, 0, 65, 77, 5, 1, 0, 0, 66, 71, 3, 0, 0, 0, - 67, 68, 5, 4, 0, 0, 68, 70, 3, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 73, 1, - 0, 0, 0, 71, 69, 1, 0, 0, 0, 71, 72, 1, 0, 0, 0, 72, 75, 1, 0, 0, 0, 73, - 71, 1, 0, 0, 0, 74, 76, 5, 4, 0, 0, 75, 74, 1, 0, 0, 0, 75, 76, 1, 0, 0, - 0, 76, 78, 1, 0, 0, 0, 77, 66, 1, 0, 0, 0, 77, 78, 1, 0, 0, 0, 78, 79, - 1, 0, 0, 0, 79, 83, 5, 2, 0, 0, 80, 81, 5, 15, 0, 0, 81, 83, 3, 0, 0, 1, - 82, 2, 1, 0, 0, 0, 82, 4, 1, 0, 0, 0, 82, 5, 1, 0, 0, 0, 82, 6, 1, 0, 0, - 0, 82, 7, 1, 0, 0, 0, 82, 8, 1, 0, 0, 0, 82, 9, 1, 0, 0, 0, 82, 12, 1, - 0, 0, 0, 82, 16, 1, 0, 0, 0, 82, 30, 1, 0, 0, 0, 82, 31, 1, 0, 0, 0, 82, - 37, 1, 0, 0, 0, 82, 39, 1, 0, 0, 0, 82, 46, 1, 0, 0, 0, 82, 53, 1, 0, 0, - 0, 82, 60, 1, 0, 0, 0, 82, 64, 1, 0, 0, 0, 82, 80, 1, 0, 0, 0, 83, 138, - 1, 0, 0, 0, 84, 85, 10, 21, 0, 0, 85, 86, 5, 22, 0, 0, 86, 137, 3, 0, 0, - 22, 87, 88, 10, 19, 0, 0, 88, 89, 7, 6, 0, 0, 89, 137, 3, 0, 0, 20, 90, - 91, 10, 18, 0, 0, 91, 92, 7, 7, 0, 0, 92, 137, 3, 0, 0, 19, 93, 94, 10, - 17, 0, 0, 94, 95, 7, 8, 0, 0, 95, 137, 3, 0, 0, 18, 96, 98, 10, 16, 0, - 0, 97, 99, 5, 31, 0, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, - 1, 0, 0, 0, 100, 101, 5, 32, 0, 0, 101, 137, 3, 0, 0, 17, 102, 103, 10, - 10, 0, 0, 103, 104, 7, 9, 0, 0, 104, 105, 7, 5, 0, 0, 105, 106, 7, 9, 0, - 0, 106, 137, 3, 0, 0, 11, 107, 108, 10, 9, 0, 0, 108, 109, 7, 10, 0, 0, - 109, 110, 7, 5, 0, 0, 110, 111, 7, 10, 0, 0, 111, 137, 3, 0, 0, 10, 112, - 113, 10, 8, 0, 0, 113, 114, 7, 11, 0, 0, 114, 137, 3, 0, 0, 9, 115, 116, - 10, 7, 0, 0, 116, 117, 7, 12, 0, 0, 117, 137, 3, 0, 0, 8, 118, 119, 10, - 6, 0, 0, 119, 120, 5, 25, 0, 0, 120, 137, 3, 0, 0, 7, 121, 122, 10, 5, - 0, 0, 122, 123, 5, 27, 0, 0, 123, 137, 3, 0, 0, 6, 124, 125, 10, 4, 0, - 0, 125, 126, 5, 26, 0, 0, 126, 137, 3, 0, 0, 5, 127, 128, 10, 3, 0, 0, - 128, 129, 5, 28, 0, 0, 129, 137, 3, 0, 0, 4, 130, 131, 10, 2, 0, 0, 131, - 132, 5, 29, 0, 0, 132, 137, 3, 0, 0, 3, 133, 134, 10, 23, 0, 0, 134, 135, - 5, 14, 0, 0, 135, 137, 5, 46, 0, 0, 136, 84, 1, 0, 0, 0, 136, 87, 1, 0, - 0, 0, 136, 90, 1, 0, 0, 0, 136, 93, 1, 0, 0, 0, 136, 96, 1, 0, 0, 0, 136, - 102, 1, 0, 0, 0, 136, 107, 1, 0, 0, 0, 136, 112, 1, 0, 0, 0, 136, 115, - 1, 0, 0, 0, 136, 118, 1, 0, 0, 0, 136, 121, 1, 0, 0, 0, 136, 124, 1, 0, - 0, 0, 136, 127, 1, 0, 0, 0, 136, 130, 1, 0, 0, 0, 136, 133, 1, 0, 0, 0, - 137, 140, 1, 0, 0, 0, 138, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, - 1, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 9, 22, 26, 71, 75, 77, 82, 98, 136, - 138, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 179, 8, 0, 10, 0, + 12, 0, 182, 9, 0, 1, 0, 0, 1, 0, 1, 0, 0, 13, 1, 0, 51, 52, 2, 0, 17, 18, + 30, 31, 2, 0, 34, 34, 37, 37, 2, 0, 35, 35, 38, 38, 2, 0, 36, 36, 39, 39, + 2, 0, 51, 51, 54, 54, 1, 0, 19, 21, 1, 0, 17, 18, 1, 0, 23, 24, 1, 0, 8, + 9, 1, 0, 10, 11, 1, 0, 8, 11, 1, 0, 12, 13, 227, 0, 124, 1, 0, 0, 0, 2, + 3, 6, 0, -1, 0, 3, 125, 5, 49, 0, 0, 4, 125, 5, 50, 0, 0, 5, 125, 5, 48, + 0, 0, 6, 125, 5, 53, 0, 0, 7, 125, 7, 0, 0, 0, 8, 125, 5, 54, 0, 0, 9, + 10, 5, 6, 0, 0, 10, 11, 5, 51, 0, 0, 11, 125, 5, 7, 0, 0, 12, 13, 5, 1, + 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 2, 0, 0, 15, 125, 1, 0, 0, 0, 16, + 17, 5, 3, 0, 0, 17, 22, 3, 0, 0, 0, 18, 19, 5, 4, 0, 0, 19, 21, 3, 0, 0, + 0, 20, 18, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, + 1, 0, 0, 0, 23, 26, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 27, 5, 4, 0, 0, + 26, 25, 1, 0, 0, 0, 26, 27, 1, 0, 0, 0, 27, 28, 1, 0, 0, 0, 28, 29, 5, + 5, 0, 0, 29, 125, 1, 0, 0, 0, 30, 125, 5, 33, 0, 0, 31, 32, 5, 16, 0, 0, + 32, 33, 5, 1, 0, 0, 33, 34, 5, 51, 0, 0, 34, 35, 5, 4, 0, 0, 35, 36, 5, + 53, 0, 0, 36, 125, 5, 2, 0, 0, 37, 38, 7, 1, 0, 0, 38, 125, 3, 0, 0, 27, + 39, 40, 7, 2, 0, 0, 40, 41, 5, 1, 0, 0, 41, 42, 3, 0, 0, 0, 42, 43, 5, + 4, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 2, 0, 0, 45, 125, 1, 0, 0, 0, 46, + 47, 7, 3, 0, 0, 47, 48, 5, 1, 0, 0, 48, 49, 3, 0, 0, 0, 49, 50, 5, 4, 0, + 0, 50, 51, 3, 0, 0, 0, 51, 52, 5, 2, 0, 0, 52, 125, 1, 0, 0, 0, 53, 54, + 7, 4, 0, 0, 54, 55, 5, 1, 0, 0, 55, 56, 3, 0, 0, 0, 56, 57, 5, 4, 0, 0, + 57, 58, 3, 0, 0, 0, 58, 59, 5, 2, 0, 0, 59, 125, 1, 0, 0, 0, 60, 61, 5, + 41, 0, 0, 61, 62, 5, 1, 0, 0, 62, 63, 5, 51, 0, 0, 63, 64, 5, 4, 0, 0, + 64, 65, 5, 53, 0, 0, 65, 125, 5, 2, 0, 0, 66, 67, 5, 42, 0, 0, 67, 68, + 5, 1, 0, 0, 68, 69, 5, 51, 0, 0, 69, 70, 5, 4, 0, 0, 70, 71, 5, 53, 0, + 0, 71, 125, 5, 2, 0, 0, 72, 73, 5, 43, 0, 0, 73, 74, 5, 1, 0, 0, 74, 75, + 5, 51, 0, 0, 75, 76, 5, 4, 0, 0, 76, 77, 5, 53, 0, 0, 77, 125, 5, 2, 0, + 0, 78, 79, 5, 44, 0, 0, 79, 80, 5, 1, 0, 0, 80, 81, 5, 51, 0, 0, 81, 82, + 5, 4, 0, 0, 82, 83, 5, 53, 0, 0, 83, 125, 5, 2, 0, 0, 84, 85, 5, 45, 0, + 0, 85, 86, 5, 1, 0, 0, 86, 87, 5, 51, 0, 0, 87, 88, 5, 4, 0, 0, 88, 89, + 5, 53, 0, 0, 89, 125, 5, 2, 0, 0, 90, 91, 5, 46, 0, 0, 91, 92, 5, 1, 0, + 0, 92, 93, 5, 51, 0, 0, 93, 94, 5, 4, 0, 0, 94, 95, 5, 53, 0, 0, 95, 125, + 5, 2, 0, 0, 96, 97, 5, 47, 0, 0, 97, 98, 5, 1, 0, 0, 98, 99, 5, 51, 0, + 0, 99, 100, 5, 4, 0, 0, 100, 101, 5, 53, 0, 0, 101, 125, 5, 2, 0, 0, 102, + 103, 5, 40, 0, 0, 103, 104, 5, 1, 0, 0, 104, 105, 7, 5, 0, 0, 105, 125, + 5, 2, 0, 0, 106, 107, 5, 51, 0, 0, 107, 119, 5, 1, 0, 0, 108, 113, 3, 0, + 0, 0, 109, 110, 5, 4, 0, 0, 110, 112, 3, 0, 0, 0, 111, 109, 1, 0, 0, 0, + 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, + 117, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 118, 5, 4, 0, 0, 117, 116, + 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 120, 1, 0, 0, 0, 119, 108, 1, 0, + 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 125, 5, 2, 0, 0, + 122, 123, 5, 15, 0, 0, 123, 125, 3, 0, 0, 1, 124, 2, 1, 0, 0, 0, 124, 4, + 1, 0, 0, 0, 124, 5, 1, 0, 0, 0, 124, 6, 1, 0, 0, 0, 124, 7, 1, 0, 0, 0, + 124, 8, 1, 0, 0, 0, 124, 9, 1, 0, 0, 0, 124, 12, 1, 0, 0, 0, 124, 16, 1, + 0, 0, 0, 124, 30, 1, 0, 0, 0, 124, 31, 1, 0, 0, 0, 124, 37, 1, 0, 0, 0, + 124, 39, 1, 0, 0, 0, 124, 46, 1, 0, 0, 0, 124, 53, 1, 0, 0, 0, 124, 60, + 1, 0, 0, 0, 124, 66, 1, 0, 0, 0, 124, 72, 1, 0, 0, 0, 124, 78, 1, 0, 0, + 0, 124, 84, 1, 0, 0, 0, 124, 90, 1, 0, 0, 0, 124, 96, 1, 0, 0, 0, 124, + 102, 1, 0, 0, 0, 124, 106, 1, 0, 0, 0, 124, 122, 1, 0, 0, 0, 125, 180, + 1, 0, 0, 0, 126, 127, 10, 28, 0, 0, 127, 128, 5, 22, 0, 0, 128, 179, 3, + 0, 0, 29, 129, 130, 10, 26, 0, 0, 130, 131, 7, 6, 0, 0, 131, 179, 3, 0, + 0, 27, 132, 133, 10, 25, 0, 0, 133, 134, 7, 7, 0, 0, 134, 179, 3, 0, 0, + 26, 135, 136, 10, 24, 0, 0, 136, 137, 7, 8, 0, 0, 137, 179, 3, 0, 0, 25, + 138, 140, 10, 23, 0, 0, 139, 141, 5, 31, 0, 0, 140, 139, 1, 0, 0, 0, 140, + 141, 1, 0, 0, 0, 141, 142, 1, 0, 0, 0, 142, 143, 5, 32, 0, 0, 143, 179, + 3, 0, 0, 24, 144, 145, 10, 10, 0, 0, 145, 146, 7, 9, 0, 0, 146, 147, 7, + 5, 0, 0, 147, 148, 7, 9, 0, 0, 148, 179, 3, 0, 0, 11, 149, 150, 10, 9, + 0, 0, 150, 151, 7, 10, 0, 0, 151, 152, 7, 5, 0, 0, 152, 153, 7, 10, 0, + 0, 153, 179, 3, 0, 0, 10, 154, 155, 10, 8, 0, 0, 155, 156, 7, 11, 0, 0, + 156, 179, 3, 0, 0, 9, 157, 158, 10, 7, 0, 0, 158, 159, 7, 12, 0, 0, 159, + 179, 3, 0, 0, 8, 160, 161, 10, 6, 0, 0, 161, 162, 5, 25, 0, 0, 162, 179, + 3, 0, 0, 7, 163, 164, 10, 5, 0, 0, 164, 165, 5, 27, 0, 0, 165, 179, 3, + 0, 0, 6, 166, 167, 10, 4, 0, 0, 167, 168, 5, 26, 0, 0, 168, 179, 3, 0, + 0, 5, 169, 170, 10, 3, 0, 0, 170, 171, 5, 28, 0, 0, 171, 179, 3, 0, 0, + 4, 172, 173, 10, 2, 0, 0, 173, 174, 5, 29, 0, 0, 174, 179, 3, 0, 0, 3, + 175, 176, 10, 30, 0, 0, 176, 177, 5, 14, 0, 0, 177, 179, 5, 53, 0, 0, 178, + 126, 1, 0, 0, 0, 178, 129, 1, 0, 0, 0, 178, 132, 1, 0, 0, 0, 178, 135, + 1, 0, 0, 0, 178, 138, 1, 0, 0, 0, 178, 144, 1, 0, 0, 0, 178, 149, 1, 0, + 0, 0, 178, 154, 1, 0, 0, 0, 178, 157, 1, 0, 0, 0, 178, 160, 1, 0, 0, 0, + 178, 163, 1, 0, 0, 0, 178, 166, 1, 0, 0, 0, 178, 169, 1, 0, 0, 0, 178, + 172, 1, 0, 0, 0, 178, 175, 1, 0, 0, 0, 179, 182, 1, 0, 0, 0, 180, 178, + 1, 0, 0, 0, 180, 181, 1, 0, 0, 0, 181, 1, 1, 0, 0, 0, 182, 180, 1, 0, 0, + 0, 9, 22, 26, 113, 117, 119, 124, 140, 178, 180, } deserializer := antlr.NewATNDeserializer(nil) staticData.atn = deserializer.Deserialize(staticData.serializedATN) @@ -198,15 +220,22 @@ const ( PlanParserArrayContainsAll = 38 PlanParserArrayContainsAny = 39 PlanParserArrayLength = 40 - PlanParserBooleanConstant = 41 - PlanParserIntegerConstant = 42 - PlanParserFloatingConstant = 43 - PlanParserIdentifier = 44 - PlanParserMeta = 45 - PlanParserStringLiteral = 46 - PlanParserJSONIdentifier = 47 - PlanParserWhitespace = 48 - PlanParserNewline = 49 + PlanParserSTEuqals = 41 + PlanParserSTTouches = 42 + PlanParserSTOverlaps = 43 + PlanParserSTCrosses = 44 + PlanParserSTContains = 45 + PlanParserSTIntersects = 46 + PlanParserSTWithin = 47 + PlanParserBooleanConstant = 48 + PlanParserIntegerConstant = 49 + PlanParserFloatingConstant = 50 + PlanParserIdentifier = 51 + PlanParserMeta = 52 + PlanParserStringLiteral = 53 + PlanParserJSONIdentifier = 54 + PlanParserWhitespace = 55 + PlanParserNewline = 56 ) // PlanParserRULE_expr is the PlanParser rule. @@ -678,6 +707,46 @@ func (s *IdentifierContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { } } +type STIntersectsContext struct { + ExprContext +} + +func NewSTIntersectsContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STIntersectsContext { + var p = new(STIntersectsContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STIntersectsContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STIntersectsContext) STIntersects() antlr.TerminalNode { + return s.GetToken(PlanParserSTIntersects, 0) +} + +func (s *STIntersectsContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STIntersectsContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STIntersectsContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTIntersects(s) + + default: + return t.VisitChildren(s) + } +} + type LikeContext struct { ExprContext } @@ -1112,6 +1181,46 @@ func (s *CallContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { } } +type STCrossesContext struct { + ExprContext +} + +func NewSTCrossesContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STCrossesContext { + var p = new(STCrossesContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STCrossesContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STCrossesContext) STCrosses() antlr.TerminalNode { + return s.GetToken(PlanParserSTCrosses, 0) +} + +func (s *STCrossesContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STCrossesContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STCrossesContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTCrosses(s) + + default: + return t.VisitChildren(s) + } +} + type ReverseRangeContext struct { ExprContext op1 antlr.Token @@ -1572,6 +1681,86 @@ func (s *TextMatchContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { } } +type STTouchesContext struct { + ExprContext +} + +func NewSTTouchesContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STTouchesContext { + var p = new(STTouchesContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STTouchesContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STTouchesContext) STTouches() antlr.TerminalNode { + return s.GetToken(PlanParserSTTouches, 0) +} + +func (s *STTouchesContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STTouchesContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STTouchesContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTTouches(s) + + default: + return t.VisitChildren(s) + } +} + +type STContainsContext struct { + ExprContext +} + +func NewSTContainsContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STContainsContext { + var p = new(STContainsContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STContainsContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STContainsContext) STContains() antlr.TerminalNode { + return s.GetToken(PlanParserSTContains, 0) +} + +func (s *STContainsContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STContainsContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STContainsContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTContains(s) + + default: + return t.VisitChildren(s) + } +} + type TermContext struct { ExprContext op antlr.Token @@ -1731,6 +1920,46 @@ func (s *JSONContainsContext) Accept(visitor antlr.ParseTreeVisitor) interface{} } } +type STWithinContext struct { + ExprContext +} + +func NewSTWithinContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STWithinContext { + var p = new(STWithinContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STWithinContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STWithinContext) STWithin() antlr.TerminalNode { + return s.GetToken(PlanParserSTWithin, 0) +} + +func (s *STWithinContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STWithinContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STWithinContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTWithin(s) + + default: + return t.VisitChildren(s) + } +} + type RangeContext struct { ExprContext op1 antlr.Token @@ -2271,6 +2500,46 @@ func (s *BitAndContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { } } +type STEuqalsContext struct { + ExprContext +} + +func NewSTEuqalsContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STEuqalsContext { + var p = new(STEuqalsContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STEuqalsContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STEuqalsContext) STEuqals() antlr.TerminalNode { + return s.GetToken(PlanParserSTEuqals, 0) +} + +func (s *STEuqalsContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STEuqalsContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STEuqalsContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTEuqals(s) + + default: + return t.VisitChildren(s) + } +} + type PowerContext struct { ExprContext } @@ -2344,6 +2613,46 @@ func (s *PowerContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { } } +type STOverlapsContext struct { + ExprContext +} + +func NewSTOverlapsContext(parser antlr.Parser, ctx antlr.ParserRuleContext) *STOverlapsContext { + var p = new(STOverlapsContext) + + InitEmptyExprContext(&p.ExprContext) + p.parser = parser + p.CopyAll(ctx.(*ExprContext)) + + return p +} + +func (s *STOverlapsContext) GetRuleContext() antlr.RuleContext { + return s +} + +func (s *STOverlapsContext) STOverlaps() antlr.TerminalNode { + return s.GetToken(PlanParserSTOverlaps, 0) +} + +func (s *STOverlapsContext) Identifier() antlr.TerminalNode { + return s.GetToken(PlanParserIdentifier, 0) +} + +func (s *STOverlapsContext) StringLiteral() antlr.TerminalNode { + return s.GetToken(PlanParserStringLiteral, 0) +} + +func (s *STOverlapsContext) Accept(visitor antlr.ParseTreeVisitor) interface{} { + switch t := visitor.(type) { + case PlanVisitor: + return t.VisitSTOverlaps(s) + + default: + return t.VisitChildren(s) + } +} + func (p *PlanParser) Expr() (localctx IExprContext) { return p.expr(0) } @@ -2362,7 +2671,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { var _alt int p.EnterOuterAlt(localctx, 1) - p.SetState(82) + p.SetState(124) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -2673,7 +2982,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } { p.SetState(38) - p.expr(20) + p.expr(27) } case 13: @@ -2821,12 +3130,12 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } case 16: - localctx = NewArrayLengthContext(p, localctx) + localctx = NewSTEuqalsContext(p, localctx) p.SetParserRuleContext(localctx) _prevctx = localctx { p.SetState(60) - p.Match(PlanParserArrayLength) + p.Match(PlanParserSTEuqals) if p.HasError() { // Recognition error - abort rule goto errorExit @@ -2842,31 +3151,23 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } { p.SetState(62) - _la = p.GetTokenStream().LA(1) - - if !(_la == PlanParserIdentifier || _la == PlanParserJSONIdentifier) { - p.GetErrorHandler().RecoverInline(p) - } else { - p.GetErrorHandler().ReportMatch(p) - p.Consume() + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit } } { p.SetState(63) - p.Match(PlanParserT__1) + p.Match(PlanParserT__3) if p.HasError() { // Recognition error - abort rule goto errorExit } } - - case 17: - localctx = NewCallContext(p, localctx) - p.SetParserRuleContext(localctx) - _prevctx = localctx { p.SetState(64) - p.Match(PlanParserIdentifier) + p.Match(PlanParserStringLiteral) if p.HasError() { // Recognition error - abort rule goto errorExit @@ -2874,37 +3175,416 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } { p.SetState(65) - p.Match(PlanParserT__0) + p.Match(PlanParserT__1) if p.HasError() { // Recognition error - abort rule goto errorExit } } - p.SetState(77) - p.GetErrorHandler().Sync(p) - if p.HasError() { - goto errorExit - } - _la = p.GetTokenStream().LA(1) - if (int64(_la) & ^0x3f) == 0 && ((int64(1)<<_la)&281469608493130) != 0 { - { - p.SetState(66) - p.expr(0) - } - p.SetState(71) - p.GetErrorHandler().Sync(p) + case 17: + localctx = NewSTTouchesContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(66) + p.Match(PlanParserSTTouches) if p.HasError() { + // Recognition error - abort rule goto errorExit } - _alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 2, p.GetParserRuleContext()) + } + { + p.SetState(67) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(68) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(69) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(70) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(71) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 18: + localctx = NewSTOverlapsContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(72) + p.Match(PlanParserSTOverlaps) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(73) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(74) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(75) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(76) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(77) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 19: + localctx = NewSTCrossesContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(78) + p.Match(PlanParserSTCrosses) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(79) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(80) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(81) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(82) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(83) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 20: + localctx = NewSTContainsContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(84) + p.Match(PlanParserSTContains) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(85) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(86) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(87) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(88) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(89) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 21: + localctx = NewSTIntersectsContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(90) + p.Match(PlanParserSTIntersects) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(91) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(92) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(93) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(94) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(95) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 22: + localctx = NewSTWithinContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(96) + p.Match(PlanParserSTWithin) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(97) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(98) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(99) + p.Match(PlanParserT__3) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(100) + p.Match(PlanParserStringLiteral) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(101) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 23: + localctx = NewArrayLengthContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(102) + p.Match(PlanParserArrayLength) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(103) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(104) + _la = p.GetTokenStream().LA(1) + + if !(_la == PlanParserIdentifier || _la == PlanParserJSONIdentifier) { + p.GetErrorHandler().RecoverInline(p) + } else { + p.GetErrorHandler().ReportMatch(p) + p.Consume() + } + } + { + p.SetState(105) + p.Match(PlanParserT__1) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + + case 24: + localctx = NewCallContext(p, localctx) + p.SetParserRuleContext(localctx) + _prevctx = localctx + { + p.SetState(106) + p.Match(PlanParserIdentifier) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + { + p.SetState(107) + p.Match(PlanParserT__0) + if p.HasError() { + // Recognition error - abort rule + goto errorExit + } + } + p.SetState(119) + p.GetErrorHandler().Sync(p) + if p.HasError() { + goto errorExit + } + _la = p.GetTokenStream().LA(1) + + if (int64(_la) & ^0x3f) == 0 && ((int64(1)<<_la)&36028791650746442) != 0 { + { + p.SetState(108) + p.expr(0) + } + p.SetState(113) + p.GetErrorHandler().Sync(p) + if p.HasError() { + goto errorExit + } + _alt = p.GetInterpreter().AdaptivePredict(p.BaseParser, p.GetTokenStream(), 2, p.GetParserRuleContext()) if p.HasError() { goto errorExit } for _alt != 2 && _alt != antlr.ATNInvalidAltNumber { if _alt == 1 { { - p.SetState(67) + p.SetState(109) p.Match(PlanParserT__3) if p.HasError() { // Recognition error - abort rule @@ -2912,12 +3592,12 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(68) + p.SetState(110) p.expr(0) } } - p.SetState(73) + p.SetState(115) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -2927,7 +3607,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { goto errorExit } } - p.SetState(75) + p.SetState(117) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -2936,7 +3616,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { if _la == PlanParserT__3 { { - p.SetState(74) + p.SetState(116) p.Match(PlanParserT__3) if p.HasError() { // Recognition error - abort rule @@ -2948,7 +3628,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } { - p.SetState(79) + p.SetState(121) p.Match(PlanParserT__1) if p.HasError() { // Recognition error - abort rule @@ -2956,12 +3636,12 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } - case 18: + case 25: localctx = NewExistsContext(p, localctx) p.SetParserRuleContext(localctx) _prevctx = localctx { - p.SetState(80) + p.SetState(122) p.Match(PlanParserEXISTS) if p.HasError() { // Recognition error - abort rule @@ -2969,7 +3649,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(81) + p.SetState(123) p.expr(1) } @@ -2977,7 +3657,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { goto errorExit } p.GetParserRuleContext().SetStop(p.GetTokenStream().LT(-1)) - p.SetState(138) + p.SetState(180) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -2992,7 +3672,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { p.TriggerExitRuleEvent() } _prevctx = localctx - p.SetState(136) + p.SetState(178) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -3002,14 +3682,14 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { case 1: localctx = NewPowerContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(84) + p.SetState(126) - if !(p.Precpred(p.GetParserRuleContext(), 21)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 21)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 28)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 28)", "")) goto errorExit } { - p.SetState(85) + p.SetState(127) p.Match(PlanParserPOW) if p.HasError() { // Recognition error - abort rule @@ -3017,21 +3697,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(86) - p.expr(22) + p.SetState(128) + p.expr(29) } case 2: localctx = NewMulDivModContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(87) + p.SetState(129) - if !(p.Precpred(p.GetParserRuleContext(), 19)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 19)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 26)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 26)", "")) goto errorExit } { - p.SetState(88) + p.SetState(130) var _lt = p.GetTokenStream().LT(1) @@ -3049,21 +3729,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(89) - p.expr(20) + p.SetState(131) + p.expr(27) } case 3: localctx = NewAddSubContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(90) + p.SetState(132) - if !(p.Precpred(p.GetParserRuleContext(), 18)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 18)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 25)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 25)", "")) goto errorExit } { - p.SetState(91) + p.SetState(133) var _lt = p.GetTokenStream().LT(1) @@ -3081,21 +3761,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(92) - p.expr(19) + p.SetState(134) + p.expr(26) } case 4: localctx = NewShiftContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(93) + p.SetState(135) - if !(p.Precpred(p.GetParserRuleContext(), 17)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 17)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 24)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 24)", "")) goto errorExit } { - p.SetState(94) + p.SetState(136) var _lt = p.GetTokenStream().LT(1) @@ -3113,20 +3793,20 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(95) - p.expr(18) + p.SetState(137) + p.expr(25) } case 5: localctx = NewTermContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(96) + p.SetState(138) - if !(p.Precpred(p.GetParserRuleContext(), 16)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 16)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 23)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 23)", "")) goto errorExit } - p.SetState(98) + p.SetState(140) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -3135,7 +3815,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { if _la == PlanParserNOT { { - p.SetState(97) + p.SetState(139) var _m = p.Match(PlanParserNOT) @@ -3148,7 +3828,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } { - p.SetState(100) + p.SetState(142) p.Match(PlanParserIN) if p.HasError() { // Recognition error - abort rule @@ -3156,21 +3836,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(101) - p.expr(17) + p.SetState(143) + p.expr(24) } case 6: localctx = NewRangeContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(102) + p.SetState(144) if !(p.Precpred(p.GetParserRuleContext(), 10)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 10)", "")) goto errorExit } { - p.SetState(103) + p.SetState(145) var _lt = p.GetTokenStream().LT(1) @@ -3188,7 +3868,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(104) + p.SetState(146) _la = p.GetTokenStream().LA(1) if !(_la == PlanParserIdentifier || _la == PlanParserJSONIdentifier) { @@ -3199,7 +3879,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(105) + p.SetState(147) var _lt = p.GetTokenStream().LT(1) @@ -3217,21 +3897,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(106) + p.SetState(148) p.expr(11) } case 7: localctx = NewReverseRangeContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(107) + p.SetState(149) if !(p.Precpred(p.GetParserRuleContext(), 9)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 9)", "")) goto errorExit } { - p.SetState(108) + p.SetState(150) var _lt = p.GetTokenStream().LT(1) @@ -3249,7 +3929,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(109) + p.SetState(151) _la = p.GetTokenStream().LA(1) if !(_la == PlanParserIdentifier || _la == PlanParserJSONIdentifier) { @@ -3260,7 +3940,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(110) + p.SetState(152) var _lt = p.GetTokenStream().LT(1) @@ -3278,21 +3958,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(111) + p.SetState(153) p.expr(10) } case 8: localctx = NewRelationalContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(112) + p.SetState(154) if !(p.Precpred(p.GetParserRuleContext(), 8)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 8)", "")) goto errorExit } { - p.SetState(113) + p.SetState(155) var _lt = p.GetTokenStream().LT(1) @@ -3310,21 +3990,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(114) + p.SetState(156) p.expr(9) } case 9: localctx = NewEqualityContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(115) + p.SetState(157) if !(p.Precpred(p.GetParserRuleContext(), 7)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 7)", "")) goto errorExit } { - p.SetState(116) + p.SetState(158) var _lt = p.GetTokenStream().LT(1) @@ -3342,21 +4022,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(117) + p.SetState(159) p.expr(8) } case 10: localctx = NewBitAndContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(118) + p.SetState(160) if !(p.Precpred(p.GetParserRuleContext(), 6)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 6)", "")) goto errorExit } { - p.SetState(119) + p.SetState(161) p.Match(PlanParserBAND) if p.HasError() { // Recognition error - abort rule @@ -3364,21 +4044,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(120) + p.SetState(162) p.expr(7) } case 11: localctx = NewBitXorContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(121) + p.SetState(163) if !(p.Precpred(p.GetParserRuleContext(), 5)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 5)", "")) goto errorExit } { - p.SetState(122) + p.SetState(164) p.Match(PlanParserBXOR) if p.HasError() { // Recognition error - abort rule @@ -3386,21 +4066,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(123) + p.SetState(165) p.expr(6) } case 12: localctx = NewBitOrContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(124) + p.SetState(166) if !(p.Precpred(p.GetParserRuleContext(), 4)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 4)", "")) goto errorExit } { - p.SetState(125) + p.SetState(167) p.Match(PlanParserBOR) if p.HasError() { // Recognition error - abort rule @@ -3408,21 +4088,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(126) + p.SetState(168) p.expr(5) } case 13: localctx = NewLogicalAndContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(127) + p.SetState(169) if !(p.Precpred(p.GetParserRuleContext(), 3)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 3)", "")) goto errorExit } { - p.SetState(128) + p.SetState(170) p.Match(PlanParserAND) if p.HasError() { // Recognition error - abort rule @@ -3430,21 +4110,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(129) + p.SetState(171) p.expr(4) } case 14: localctx = NewLogicalOrContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(130) + p.SetState(172) if !(p.Precpred(p.GetParserRuleContext(), 2)) { p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 2)", "")) goto errorExit } { - p.SetState(131) + p.SetState(173) p.Match(PlanParserOR) if p.HasError() { // Recognition error - abort rule @@ -3452,21 +4132,21 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(132) + p.SetState(174) p.expr(3) } case 15: localctx = NewLikeContext(p, NewExprContext(p, _parentctx, _parentState)) p.PushNewRecursionContext(localctx, _startState, PlanParserRULE_expr) - p.SetState(133) + p.SetState(175) - if !(p.Precpred(p.GetParserRuleContext(), 23)) { - p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 23)", "")) + if !(p.Precpred(p.GetParserRuleContext(), 30)) { + p.SetError(antlr.NewFailedPredicateException(p, "p.Precpred(p.GetParserRuleContext(), 30)", "")) goto errorExit } { - p.SetState(134) + p.SetState(176) p.Match(PlanParserLIKE) if p.HasError() { // Recognition error - abort rule @@ -3474,7 +4154,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } { - p.SetState(135) + p.SetState(177) p.Match(PlanParserStringLiteral) if p.HasError() { // Recognition error - abort rule @@ -3487,7 +4167,7 @@ func (p *PlanParser) expr(_p int) (localctx IExprContext) { } } - p.SetState(140) + p.SetState(182) p.GetErrorHandler().Sync(p) if p.HasError() { goto errorExit @@ -3528,19 +4208,19 @@ func (p *PlanParser) Sempred(localctx antlr.RuleContext, ruleIndex, predIndex in func (p *PlanParser) Expr_Sempred(localctx antlr.RuleContext, predIndex int) bool { switch predIndex { case 0: - return p.Precpred(p.GetParserRuleContext(), 21) + return p.Precpred(p.GetParserRuleContext(), 28) case 1: - return p.Precpred(p.GetParserRuleContext(), 19) + return p.Precpred(p.GetParserRuleContext(), 26) case 2: - return p.Precpred(p.GetParserRuleContext(), 18) + return p.Precpred(p.GetParserRuleContext(), 25) case 3: - return p.Precpred(p.GetParserRuleContext(), 17) + return p.Precpred(p.GetParserRuleContext(), 24) case 4: - return p.Precpred(p.GetParserRuleContext(), 16) + return p.Precpred(p.GetParserRuleContext(), 23) case 5: return p.Precpred(p.GetParserRuleContext(), 10) @@ -3570,7 +4250,7 @@ func (p *PlanParser) Expr_Sempred(localctx antlr.RuleContext, predIndex int) boo return p.Precpred(p.GetParserRuleContext(), 2) case 14: - return p.Precpred(p.GetParserRuleContext(), 23) + return p.Precpred(p.GetParserRuleContext(), 30) default: panic("No predicate with index: " + fmt.Sprint(predIndex)) diff --git a/internal/parser/planparserv2/generated/plan_visitor.go b/internal/parser/planparserv2/generated/plan_visitor.go index d62ade6de018b..c1cbe2bd1b250 100644 --- a/internal/parser/planparserv2/generated/plan_visitor.go +++ b/internal/parser/planparserv2/generated/plan_visitor.go @@ -31,6 +31,9 @@ type PlanVisitor interface { // Visit a parse tree produced by PlanParser#Identifier. VisitIdentifier(ctx *IdentifierContext) interface{} + // Visit a parse tree produced by PlanParser#STIntersects. + VisitSTIntersects(ctx *STIntersectsContext) interface{} + // Visit a parse tree produced by PlanParser#Like. VisitLike(ctx *LikeContext) interface{} @@ -52,6 +55,9 @@ type PlanVisitor interface { // Visit a parse tree produced by PlanParser#Call. VisitCall(ctx *CallContext) interface{} + // Visit a parse tree produced by PlanParser#STCrosses. + VisitSTCrosses(ctx *STCrossesContext) interface{} + // Visit a parse tree produced by PlanParser#ReverseRange. VisitReverseRange(ctx *ReverseRangeContext) interface{} @@ -73,12 +79,21 @@ type PlanVisitor interface { // Visit a parse tree produced by PlanParser#TextMatch. VisitTextMatch(ctx *TextMatchContext) interface{} + // Visit a parse tree produced by PlanParser#STTouches. + VisitSTTouches(ctx *STTouchesContext) interface{} + + // Visit a parse tree produced by PlanParser#STContains. + VisitSTContains(ctx *STContainsContext) interface{} + // Visit a parse tree produced by PlanParser#Term. VisitTerm(ctx *TermContext) interface{} // Visit a parse tree produced by PlanParser#JSONContains. VisitJSONContains(ctx *JSONContainsContext) interface{} + // Visit a parse tree produced by PlanParser#STWithin. + VisitSTWithin(ctx *STWithinContext) interface{} + // Visit a parse tree produced by PlanParser#Range. VisitRange(ctx *RangeContext) interface{} @@ -103,6 +118,12 @@ type PlanVisitor interface { // Visit a parse tree produced by PlanParser#BitAnd. VisitBitAnd(ctx *BitAndContext) interface{} + // Visit a parse tree produced by PlanParser#STEuqals. + VisitSTEuqals(ctx *STEuqalsContext) interface{} + // Visit a parse tree produced by PlanParser#Power. VisitPower(ctx *PowerContext) interface{} + + // Visit a parse tree produced by PlanParser#STOverlaps. + VisitSTOverlaps(ctx *STOverlapsContext) interface{} } diff --git a/internal/parser/planparserv2/parser_visitor.go b/internal/parser/planparserv2/parser_visitor.go index ffc4f13623459..cca7342da9f54 100644 --- a/internal/parser/planparserv2/parser_visitor.go +++ b/internal/parser/planparserv2/parser_visitor.go @@ -1381,3 +1381,218 @@ func (v *ParserVisitor) VisitTemplateVariable(ctx *parser.TemplateVariableContex }, } } + +func (v *ParserVisitor) VisitSTEuqals(ctx *parser.STEuqalsContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STEuqals operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Equals, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTTouches(ctx *parser.STTouchesContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STTouches operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Touches, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTOverlaps(ctx *parser.STOverlapsContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STOverlaps operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() + // log.Warn(element) + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Overlaps, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTCrosses(ctx *parser.STCrossesContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STCrosses operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() + // log.Warn(element) + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Crosses, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTContains(ctx *parser.STContainsContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STContains operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() // the wkt input + // log.Warn(element) + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Contains, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTIntersects(ctx *parser.STIntersectsContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STIntersects operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() // the wkt input + // log.Warn(element) + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Intersects, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} + +func (v *ParserVisitor) VisitSTWithin(ctx *parser.STWithinContext) interface{} { + childExpr, err := v.translateIdentifier(ctx.Identifier().GetText()) + if err != nil { + return err + } + columnInfo := toColumnInfo(childExpr) + if columnInfo == nil || + (!typeutil.IsGeometryType(columnInfo.GetDataType())) { + return fmt.Errorf( + "STWithin operation are only supported on geometry fields now, got: %s", ctx.GetText()) + } + element := ctx.StringLiteral().GetText() // the wkt input + // log.Warn(element) + if err := getError(element); err != nil { + return err + } + expr := &planpb.Expr{ + Expr: &planpb.Expr_GisfunctionFilterExpr{ + GisfunctionFilterExpr: &planpb.GISFunctionFilterExpr{ + ColumnInfo: columnInfo, + WktString: element[1 : len(element)-1], + Op: planpb.GISFunctionFilterExpr_Within, + }, + }, + } + return &ExprWithType{ + expr: expr, + dataType: schemapb.DataType_Bool, + } +} diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go index 61eeca1b86875..50cf9bc9eba20 100644 --- a/internal/parser/planparserv2/utils.go +++ b/internal/parser/planparserv2/utils.go @@ -152,6 +152,11 @@ func getTargetType(lDataType, rDataType schemapb.DataType) (schemapb.DataType, e return schemapb.DataType_Int64, nil } } + if typeutil.IsGeometryType(lDataType) { + if typeutil.IsGeometryType(rDataType) || typeutil.IsJSONType(rDataType) { + return schemapb.DataType_Geometry, nil + } + } if typeutil.IsFloatingType(lDataType) { if typeutil.IsJSONType(rDataType) || typeutil.IsArithmetic(rDataType) { return schemapb.DataType_Double, nil diff --git a/internal/proto/plan.proto b/internal/proto/plan.proto index 8a65a891b3274..bd69d2196f171 100644 --- a/internal/proto/plan.proto +++ b/internal/proto/plan.proto @@ -145,6 +145,22 @@ message JSONContainsExpr { string template_variable_name = 5; } +message GISFunctionFilterExpr{ + ColumnInfo column_info = 1; + string wkt_string = 2; + enum GISOp { + Invalid = 0; + Equals = 1; + Touches = 2; + Overlaps = 3; + Crosses = 4; + Contains = 5; + Intersects = 6; + Within = 7; + } + GISOp op = 3; +} + message UnaryExpr { enum UnaryOp { Invalid = 0; @@ -205,6 +221,7 @@ message Expr { AlwaysTrueExpr always_true_expr = 12; JSONContainsExpr json_contains_expr = 13; CallExpr call_expr = 14; + GISFunctionFilterExpr gisfunction_filter_expr = 15; }; bool is_template = 20; } diff --git a/internal/proxy/task_index.go b/internal/proxy/task_index.go index 914b752807980..ae5bb6d7143fb 100644 --- a/internal/proxy/task_index.go +++ b/internal/proxy/task_index.go @@ -231,7 +231,7 @@ func (cit *createIndexTask) parseIndexParams() error { return "", fmt.Errorf("create auto index on type:%s is not supported", dataType.String()) }() if err != nil { - return merr.WrapErrParameterInvalid("supported field", err.Error()) + return err } indexParamsMap[common.IndexTypeKey] = indexType diff --git a/internal/proxy/task_insert_test.go b/internal/proxy/task_insert_test.go index cdf90290567ce..edd3e54ced980 100644 --- a/internal/proxy/task_insert_test.go +++ b/internal/proxy/task_insert_test.go @@ -47,6 +47,7 @@ func TestInsertTask_CheckAligned(t *testing.T) { float16VectorFieldSchema := &schemapb.FieldSchema{DataType: schemapb.DataType_Float16Vector} bfloat16VectorFieldSchema := &schemapb.FieldSchema{DataType: schemapb.DataType_BFloat16Vector} varCharFieldSchema := &schemapb.FieldSchema{DataType: schemapb.DataType_VarChar} + geometryFieldSchema := &schemapb.FieldSchema{DataType: schemapb.DataType_Geometry} numRows := 20 dim := 128 @@ -78,6 +79,7 @@ func TestInsertTask_CheckAligned(t *testing.T) { float16VectorFieldSchema, bfloat16VectorFieldSchema, varCharFieldSchema, + geometryFieldSchema, }, }, } @@ -97,6 +99,7 @@ func TestInsertTask_CheckAligned(t *testing.T) { newFloat16VectorFieldData("Float16Vector", numRows, dim), newBFloat16VectorFieldData("BFloat16Vector", numRows, dim), newScalarFieldData(varCharFieldSchema, "VarChar", numRows), + newScalarFieldData(geometryFieldSchema, "Geometry", numRows), } err = case2.insertMsg.CheckAligned() assert.NoError(t, err) diff --git a/internal/proxy/task_query.go b/internal/proxy/task_query.go index 3bbdaffd9ae29..0479b830b7fcc 100644 --- a/internal/proxy/task_query.go +++ b/internal/proxy/task_query.go @@ -544,6 +544,7 @@ func (t *queryTask) PostExecute(ctx context.Context) error { log.Warn("fail to reduce query result", zap.Error(err)) return err } + validateGeometryFieldSearchResult(&t.result.FieldsData) t.result.OutputFields = t.userOutputFields metrics.ProxyReduceResultLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10), metrics.QueryLabel).Observe(float64(tr.RecordSpan().Milliseconds())) diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go index 511bbf74855e2..0a71a2db61e76 100644 --- a/internal/proxy/task_search.go +++ b/internal/proxy/task_search.go @@ -719,6 +719,7 @@ func (t *searchTask) PostExecute(ctx context.Context) error { } } + validateGeometryFieldSearchResult(&t.result.Results.FieldsData) // reduce done, get final result limit := t.SearchRequest.GetTopk() - t.SearchRequest.GetOffset() resultSizeInsufficient := false diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index fbc9c93717d89..cff6324cacecc 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -69,6 +69,7 @@ const ( testBinaryVecField = "bvec" testFloat16VecField = "f16vec" testBFloat16VecField = "bf16vec" + testGeometryField = "geometry" testVecDim = 128 testMaxVarCharLength = 100 ) @@ -84,6 +85,7 @@ func genCollectionSchema(collectionName string) *schemapb.CollectionSchema { testBinaryVecField, testFloat16VecField, testBFloat16VecField, + testGeometryField, testVecDim, collectionName) } @@ -226,6 +228,7 @@ func constructCollectionSchemaByDataType(collectionName string, fieldName2DataTy func constructCollectionSchemaWithAllType( boolField, int32Field, int64Field, floatField, doubleField string, floatVecField, binaryVecField, float16VecField, bfloat16VecField string, + geometryField string, dim int, collectionName string, ) *schemapb.CollectionSchema { @@ -339,6 +342,16 @@ func constructCollectionSchemaWithAllType( IndexParams: nil, AutoID: false, } + g := &schemapb.FieldSchema{ + FieldID: 0, + Name: geometryField, + IsPrimaryKey: false, + Description: "", + DataType: schemapb.DataType_Geometry, + TypeParams: nil, + IndexParams: nil, + AutoID: false, + } if enableMultipleVectorFields { return &schemapb.CollectionSchema{ @@ -355,6 +368,7 @@ func constructCollectionSchemaWithAllType( bVec, f16Vec, bf16Vec, + g, }, } } @@ -371,6 +385,7 @@ func constructCollectionSchemaWithAllType( d, fVec, // bVec, + g, }, } } diff --git a/internal/proxy/validate_util.go b/internal/proxy/validate_util.go index 33bc9c2b63a03..1fcc79852c94e 100644 --- a/internal/proxy/validate_util.go +++ b/internal/proxy/validate_util.go @@ -5,7 +5,10 @@ import ( "fmt" "math" "reflect" + "strings" + "github.com/twpayne/go-geom/encoding/wkb" + "github.com/twpayne/go-geom/encoding/wkt" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" @@ -52,6 +55,43 @@ func withMaxCapCheck() validateOption { } } +func validateGeometryFieldSearchResult(array *[]*schemapb.FieldData) error { + for idx, fieldData := range *array { + if fieldData.Type == schemapb.DataType_Geometry { + wkbArray := fieldData.GetScalars().GetGeometryData().Data + wktArray := make([][]byte, len(wkbArray)) + for i, data := range wkbArray { + geomT, err := wkb.Unmarshal(data) + if err != nil { + log.Warn("translate the wkb format search result into geometry failed") + return err + } + // now remove MaxDecimalDigits limit + wktStr, err := wkt.Marshal(geomT) + if err != nil { + log.Warn("translate the geomery into its wkt failed") + return err + } + wktArray[i] = []byte(wktStr) + } + // modify the field data + (*array)[idx] = &schemapb.FieldData{ + Type: fieldData.GetType(), + FieldName: fieldData.GetFieldName(), + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{GeometryData: &schemapb.GeometryArray{Data: wktArray}}, + }, + }, + FieldId: fieldData.GetFieldId(), + IsDynamic: fieldData.GetIsDynamic(), + } + } + } + + return nil +} + func (v *validateUtil) apply(opts ...validateOption) { for _, opt := range opts { opt(v) @@ -93,6 +133,10 @@ func (v *validateUtil) Validate(data []*schemapb.FieldData, helper *typeutil.Sch if err := v.checkVarCharFieldData(field, fieldSchema); err != nil { return err } + case schemapb.DataType_Geometry: + if err := v.checkGeometryFieldData(field, fieldSchema); err != nil { + return err + } case schemapb.DataType_JSON: if err := v.checkJSONFieldData(field, fieldSchema); err != nil { return err @@ -369,6 +413,13 @@ func (v *validateUtil) fillWithNullValue(field *schemapb.FieldData, fieldSchema } } + case *schemapb.ScalarField_GeometryData: + if fieldSchema.GetNullable() { + sd.GeometryData.Data, err = fillWithNullValueImpl(sd.GeometryData.Data, field.GetValidData()) + if err != nil { + return err + } + } default: return merr.WrapErrParameterInvalidMsg(fmt.Sprintf("undefined data type:%s", field.Type.String())) } @@ -468,6 +519,17 @@ func (v *validateUtil) fillWithDefaultValue(field *schemapb.FieldData, fieldSche return err } + case *schemapb.ScalarField_GeometryData: + if len(field.GetValidData()) != numRows { + msg := fmt.Sprintf("the length of valid_data of field(%s) is wrong", field.GetFieldName()) + return merr.WrapErrParameterInvalid(numRows, len(field.GetValidData()), msg) + } + defaultValue := fieldSchema.GetDefaultValue().GetBytesData() + sd.GeometryData.Data, err = fillWithDefaultValueImpl(sd.GeometryData.Data, defaultValue, field.GetValidData()) + if err != nil { + return err + } + default: return merr.WrapErrParameterInvalidMsg(fmt.Sprintf("undefined data type:%s", field.Type.String())) } @@ -637,6 +699,42 @@ func (v *validateUtil) checkVarCharFieldData(field *schemapb.FieldData, fieldSch return nil } +func (v *validateUtil) checkGeometryFieldData(field *schemapb.FieldData, fieldSchema *schemapb.FieldSchema) error { + geometryArray := field.GetScalars().GetGeometryData().GetData() + if geometryArray == nil { + msg := fmt.Sprintf("geometry field '%v' is illegal, array type mismatch", field.GetFieldName()) + return merr.WrapErrParameterInvalid("need geometry array", "got nil", msg) + } + + for index, wktdata := range geometryArray { + // ignore parsed geom, the check is during insert task pre execute,so geo data became wkb + // fmt.Println(strings.Trim(string(wktdata), "\"")) + geomT, err := wkt.Unmarshal(strings.Trim(string(wktdata), "\"")) + if err != nil { + log.Warn("insert invalid Geometry data!! The wkt data has errors", zap.Error(err)) + return merr.WrapErrIoFailedReason(err.Error()) + } + geometryArray[index], err = wkb.Marshal(geomT, wkb.NDR) + if err != nil { + log.Warn("insert invalid Geometry data!! Transform to wkb failed, has errors", zap.Error(err)) + return merr.WrapErrIoFailedReason(err.Error()) + } + } + // replace the field data with wkb data array + field = &schemapb.FieldData{ + Type: field.GetType(), + FieldName: field.GetFieldName(), + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{GeometryData: &schemapb.GeometryArray{Data: geometryArray}}, + }, + }, + FieldId: field.GetFieldId(), + IsDynamic: field.GetIsDynamic(), + } + return nil +} + func (v *validateUtil) checkJSONFieldData(field *schemapb.FieldData, fieldSchema *schemapb.FieldSchema) error { jsonArray := field.GetScalars().GetJsonData().GetData() if jsonArray == nil && fieldSchema.GetDefaultValue() == nil && !fieldSchema.GetNullable() { diff --git a/internal/storage/data_codec.go b/internal/storage/data_codec.go index 460e042458582..3267b048ad7de 100644 --- a/internal/storage/data_codec.go +++ b/internal/storage/data_codec.go @@ -367,6 +367,16 @@ func AddFieldDataToPayload(eventWriter *insertEventWriter, dataType schemapb.Dat return err } } + case schemapb.DataType_Geometry: + for i, singleGeometry := range singleData.(*GeometryFieldData).Data { + isValid := true + if len(singleData.(*GeometryFieldData).ValidData) != 0 { + isValid = singleData.(*GeometryFieldData).ValidData[i] + } + if err = eventWriter.AddOneGeometryToPayload(singleGeometry, isValid); err != nil { + return err + } + } case schemapb.DataType_BinaryVector: if err = eventWriter.AddBinaryVectorToPayload(singleData.(*BinaryVectorFieldData).Data, singleData.(*BinaryVectorFieldData).Dim); err != nil { return err @@ -600,6 +610,17 @@ func AddInsertData(dataType schemapb.DataType, data interface{}, insertData *Ins jsonFieldData.ValidData = append(jsonFieldData.ValidData, validData...) insertData.Data[fieldID] = jsonFieldData return len(singleData), nil + case schemapb.DataType_Geometry: + singleData := data.([][]byte) + if fieldData == nil { + fieldData = &GeometryFieldData{Data: make([][]byte, 0, rowNum)} + } + geometryFieldData := fieldData.(*GeometryFieldData) + + geometryFieldData.Data = append(geometryFieldData.Data, singleData...) + geometryFieldData.ValidData = append(geometryFieldData.ValidData, validData...) + insertData.Data[fieldID] = geometryFieldData + return len(singleData), nil case schemapb.DataType_BinaryVector: singleData := data.([]byte) diff --git a/internal/storage/data_sorter.go b/internal/storage/data_sorter.go index c7e1d3dd884a9..5ef56b65dc19d 100644 --- a/internal/storage/data_sorter.go +++ b/internal/storage/data_sorter.go @@ -114,6 +114,9 @@ func (ds *DataSorter) Swap(i, j int) { case schemapb.DataType_JSON: data := singleData.(*JSONFieldData).Data data[i], data[j] = data[j], data[i] + case schemapb.DataType_Geometry: + data := singleData.(*GeometryFieldData).Data + data[i], data[j] = data[j], data[i] case schemapb.DataType_SparseFloatVector: fieldData := singleData.(*SparseFloatVectorFieldData) fieldData.Contents[i], fieldData.Contents[j] = fieldData.Contents[j], fieldData.Contents[i] diff --git a/internal/storage/insert_data.go b/internal/storage/insert_data.go index dc46be9884a4a..c24a0b281577b 100644 --- a/internal/storage/insert_data.go +++ b/internal/storage/insert_data.go @@ -309,6 +309,16 @@ func NewFieldData(dataType schemapb.DataType, fieldSchema *schemapb.FieldSchema, data.ValidData = make([]bool, 0, cap) } return data, nil + + case schemapb.DataType_Geometry: + data := &GeometryFieldData{ + Data: make([][]byte, 0, cap), + Nullable: fieldSchema.GetNullable(), + } + if fieldSchema.GetNullable() { + data.ValidData = make([]bool, 0, cap) + } + return data, nil case schemapb.DataType_Array: data := &ArrayFieldData{ Data: make([]*schemapb.ScalarField, 0, cap), @@ -386,6 +396,11 @@ type JSONFieldData struct { ValidData []bool Nullable bool } +type GeometryFieldData struct { + Data [][]byte + ValidData []bool + Nullable bool +} type BinaryVectorFieldData struct { Data []byte Dim int @@ -428,6 +443,7 @@ func (data *DoubleFieldData) RowNum() int { return len(data.Data) } func (data *StringFieldData) RowNum() int { return len(data.Data) } func (data *ArrayFieldData) RowNum() int { return len(data.Data) } func (data *JSONFieldData) RowNum() int { return len(data.Data) } +func (data *GeometryFieldData) RowNum() int { return len(data.Data) } func (data *BinaryVectorFieldData) RowNum() int { return len(data.Data) * 8 / data.Dim } func (data *FloatVectorFieldData) RowNum() int { return len(data.Data) / data.Dim } func (data *Float16VectorFieldData) RowNum() int { return len(data.Data) / 2 / data.Dim } @@ -507,6 +523,13 @@ func (data *JSONFieldData) GetRow(i int) any { return data.Data[i] } +func (data *GeometryFieldData) GetRow(i int) any { + if data.GetNullable() && !data.ValidData[i] { + return nil + } + return data.Data[i] +} + func (data *BinaryVectorFieldData) GetRow(i int) any { return data.Data[i*data.Dim/8 : (i+1)*data.Dim/8] } @@ -537,6 +560,7 @@ func (data *DoubleFieldData) GetDataRows() any { return data.Data } func (data *StringFieldData) GetDataRows() any { return data.Data } func (data *ArrayFieldData) GetDataRows() any { return data.Data } func (data *JSONFieldData) GetDataRows() any { return data.Data } +func (data *GeometryFieldData) GetDataRows() any { return data.Data } func (data *BinaryVectorFieldData) GetDataRows() any { return data.Data } func (data *FloatVectorFieldData) GetDataRows() any { return data.Data } func (data *Float16VectorFieldData) GetDataRows() any { return data.Data } @@ -714,6 +738,23 @@ func (data *JSONFieldData) AppendRow(row interface{}) error { return nil } +func (data *GeometryFieldData) AppendRow(row interface{}) error { + if data.GetNullable() && row == nil { + data.Data = append(data.Data, make([][]byte, 1)...) + data.ValidData = append(data.ValidData, false) + return nil + } + v, ok := row.([]byte) + if !ok { + return merr.WrapErrParameterInvalid("[]byte", row, "Wrong row type") + } + if data.GetNullable() { + data.ValidData = append(data.ValidData, true) + } + data.Data = append(data.Data, v) + return nil +} + func (data *BinaryVectorFieldData) AppendRow(row interface{}) error { v, ok := row.([]byte) if !ok || len(v) != data.Dim/8 { @@ -846,6 +887,14 @@ func (data *JSONFieldData) AppendRows(dataRows interface{}, validDataRows interf return data.AppendValidDataRows(validDataRows) } +func (data *GeometryFieldData) AppendRows(dataRows interface{}, validDataRows interface{}) error { + err := data.AppendDataRows(dataRows) + if err != nil { + return err + } + return data.AppendValidDataRows(validDataRows) +} + // AppendDataRows appends FLATTEN vectors to field data. func (data *BinaryVectorFieldData) AppendRows(dataRows interface{}, validDataRows interface{}) error { err := data.AppendDataRows(dataRows) @@ -980,6 +1029,15 @@ func (data *JSONFieldData) AppendDataRows(rows interface{}) error { return nil } +func (data *GeometryFieldData) AppendDataRows(rows interface{}) error { + v, ok := rows.([][]byte) + if !ok { + return merr.WrapErrParameterInvalid("[][]byte", rows, "Wrong rows type") + } + data.Data = append(data.Data, v...) + return nil +} + // AppendDataRows appends FLATTEN vectors to field data. func (data *BinaryVectorFieldData) AppendDataRows(rows interface{}) error { v, ok := rows.([]byte) @@ -1164,6 +1222,18 @@ func (data *JSONFieldData) AppendValidDataRows(rows interface{}) error { return nil } +func (data *GeometryFieldData) AppendValidDataRows(rows interface{}) error { + if rows == nil { + return nil + } + v, ok := rows.([]bool) + if !ok { + return merr.WrapErrParameterInvalid("[]bool", rows, "Wrong rows type") + } + data.ValidData = append(data.ValidData, v...) + return nil +} + // AppendValidDataRows appends FLATTEN vectors to field data. func (data *BinaryVectorFieldData) AppendValidDataRows(rows interface{}) error { if rows != nil { @@ -1282,6 +1352,10 @@ func (data *DoubleFieldData) GetDataType() schemapb.DataType { return schemapb.D func (data *StringFieldData) GetDataType() schemapb.DataType { return data.DataType } func (data *ArrayFieldData) GetDataType() schemapb.DataType { return schemapb.DataType_Array } func (data *JSONFieldData) GetDataType() schemapb.DataType { return schemapb.DataType_JSON } +func (data *GeometryFieldData) GetDataType() schemapb.DataType { + return schemapb.DataType_Geometry +} + func (data *BinaryVectorFieldData) GetDataType() schemapb.DataType { return schemapb.DataType_BinaryVector } @@ -1347,6 +1421,15 @@ func (data *JSONFieldData) GetMemorySize() int { return size + binary.Size(data.ValidData) + binary.Size(data.Nullable) } +func (data *GeometryFieldData) GetMemorySize() int { + var size int + // what's the meaning of 16? + for _, val := range data.Data { + size += len(val) + 16 + } + return size + binary.Size(data.ValidData) + binary.Size(data.Nullable) +} + func (data *BoolFieldData) GetRowSize(i int) int { return 1 } func (data *Int8FieldData) GetRowSize(i int) int { return 1 } func (data *Int16FieldData) GetRowSize(i int) int { return 2 } @@ -1360,6 +1443,7 @@ func (data *Float16VectorFieldData) GetRowSize(i int) int { return data.Dim * 2 func (data *BFloat16VectorFieldData) GetRowSize(i int) int { return data.Dim * 2 } func (data *StringFieldData) GetRowSize(i int) int { return len(data.Data[i]) + 16 } func (data *JSONFieldData) GetRowSize(i int) int { return len(data.Data[i]) + 16 } +func (data *GeometryFieldData) GetRowSize(i int) int { return len(data.Data[i]) + 16 } func (data *ArrayFieldData) GetRowSize(i int) int { switch data.ElementType { case schemapb.DataType_Bool: @@ -1445,3 +1529,7 @@ func (data *ArrayFieldData) GetNullable() bool { func (data *JSONFieldData) GetNullable() bool { return data.Nullable } + +func (data *GeometryFieldData) GetNullable() bool { + return data.Nullable +} diff --git a/internal/storage/payload.go b/internal/storage/payload.go index f62a569fc0a99..e97c6f5b147ae 100644 --- a/internal/storage/payload.go +++ b/internal/storage/payload.go @@ -38,6 +38,7 @@ type PayloadWriterInterface interface { AddOneStringToPayload(msgs string, isValid bool) error AddOneArrayToPayload(msg *schemapb.ScalarField, isValid bool) error AddOneJSONToPayload(msg []byte, isValid bool) error + AddOneGeometryToPayload(msg []byte, isValid bool) error AddBinaryVectorToPayload(binVec []byte, dim int) error AddFloatVectorToPayload(binVec []float32, dim int) error AddFloat16VectorToPayload(binVec []byte, dim int) error @@ -65,6 +66,7 @@ type PayloadReaderInterface interface { GetStringFromPayload() ([]string, []bool, error) GetArrayFromPayload() ([]*schemapb.ScalarField, []bool, error) GetJSONFromPayload() ([][]byte, []bool, error) + GetGeometryFromPayload() ([][]byte, []bool, error) GetBinaryVectorFromPayload() ([]byte, int, error) GetFloat16VectorFromPayload() ([]byte, int, error) GetBFloat16VectorFromPayload() ([]byte, int, error) diff --git a/internal/storage/payload_reader.go b/internal/storage/payload_reader.go index f3fdd94984459..e220af320ce1d 100644 --- a/internal/storage/payload_reader.go +++ b/internal/storage/payload_reader.go @@ -98,6 +98,9 @@ func (r *PayloadReader) GetDataFromPayload() (interface{}, []bool, int, error) { case schemapb.DataType_JSON: val, validData, err := r.GetJSONFromPayload() return val, validData, 0, err + case schemapb.DataType_Geometry: + val, validData, err := r.GetGeometryFromPayload() + return val, validData, 0, err default: return nil, nil, 0, merr.WrapErrParameterInvalidMsg("unknown type") } @@ -432,6 +435,25 @@ func (r *PayloadReader) GetJSONFromPayload() ([][]byte, []bool, error) { return value, nil, nil } +func (r *PayloadReader) GetGeometryFromPayload() ([][]byte, []bool, error) { + if r.colType != schemapb.DataType_Geometry { + return nil, nil, merr.WrapErrParameterInvalidMsg(fmt.Sprintf("failed to get Geometry from datatype %v", r.colType.String())) + } + + if r.nullable { + return readNullableByteAndConvert(r, func(bytes []byte) []byte { + return bytes + }) + } + value, err := readByteAndConvert(r, func(bytes parquet.ByteArray) []byte { + return bytes + }) + if err != nil { + return nil, nil, err + } + return value, nil, nil +} + func (r *PayloadReader) GetByteArrayDataSet() (*DataSet[parquet.ByteArray, *file.ByteArrayColumnChunkReader], error) { if r.colType != schemapb.DataType_String && r.colType != schemapb.DataType_VarChar { return nil, fmt.Errorf("failed to get string from datatype %v", r.colType.String()) diff --git a/internal/storage/payload_writer.go b/internal/storage/payload_writer.go index 054c129e05885..323190dcee8de 100644 --- a/internal/storage/payload_writer.go +++ b/internal/storage/payload_writer.go @@ -206,6 +206,25 @@ func (w *NativePayloadWriter) AddDataToPayload(data interface{}, validData []boo isValid = validData[0] } return w.AddOneJSONToPayload(val, isValid) + case schemapb.DataType_Geometry: + val, ok := data.([]byte) + if !ok { + return merr.WrapErrParameterInvalidMsg("incorrect data type") + } + isValid := true + if len(validData) > 1 { + return merr.WrapErrParameterInvalidMsg("wrong input length when add data to payload") + } + if len(validData) == 0 && w.nullable { + return merr.WrapErrParameterInvalidMsg("need pass valid_data when nullable==true") + } + if len(validData) == 1 { + if !w.nullable { + return merr.WrapErrParameterInvalidMsg("no need pass valid_data when nullable==false") + } + isValid = validData[0] + } + return w.AddOneGeometryToPayload(val, isValid) case schemapb.DataType_BinaryVector: val, ok := data.([]byte) if !ok { @@ -546,6 +565,29 @@ func (w *NativePayloadWriter) AddOneJSONToPayload(data []byte, isValid bool) err return nil } +func (w *NativePayloadWriter) AddOneGeometryToPayload(data []byte, isValid bool) error { + if w.finished { + return errors.New("can't append data to finished geometry payload") + } + + if !w.nullable && !isValid { + return merr.WrapErrParameterInvalidMsg("not support null when nullable is false") + } + + builder, ok := w.builder.(*array.BinaryBuilder) + if !ok { + return errors.New("failed to cast geometryBuilder") + } + + if !isValid { + builder.AppendNull() + } else { + builder.Append(data) + } + + return nil +} + func (w *NativePayloadWriter) AddBinaryVectorToPayload(data []byte, dim int) error { if w.finished { return errors.New("can't append data to finished binary vector payload") @@ -752,6 +794,8 @@ func milvusDataTypeToArrowType(dataType schemapb.DataType, dim int) arrow.DataTy return &arrow.BinaryType{} case schemapb.DataType_JSON: return &arrow.BinaryType{} + case schemapb.DataType_Geometry: + return &arrow.BinaryType{} case schemapb.DataType_FloatVector: return &arrow.FixedSizeBinaryType{ ByteWidth: dim * 4, diff --git a/internal/storage/print_binlog.go b/internal/storage/print_binlog.go index ab5d15930447c..4f7f62153b93e 100644 --- a/internal/storage/print_binlog.go +++ b/internal/storage/print_binlog.go @@ -22,6 +22,8 @@ import ( "os" "github.com/cockroachdb/errors" + "github.com/twpayne/go-geom/encoding/wkb" + "github.com/twpayne/go-geom/encoding/wkt" "golang.org/x/exp/mmap" "google.golang.org/protobuf/proto" @@ -368,6 +370,24 @@ func printPayloadValues(colType schemapb.DataType, reader PayloadReaderInterface for i, v := range valids { fmt.Printf("\t\t%d : %v\n", i, v) } + // print the wkb bytes + case schemapb.DataType_Geometry: + rows, err := reader.GetPayloadLengthFromReader() + if err != nil { + return err + } + val, valids, err := reader.GetGeometryFromPayload() + if err != nil { + return err + } + for i := 0; i < rows; i++ { + geomT, _ := wkb.Unmarshal(val[i]) + wktStr, _ := wkt.Marshal(geomT) + fmt.Printf("\t\t%d : %s\n", i, wktStr) + } + for i, v := range valids { + fmt.Printf("\t\t%d : %v\n", i, v) + } case schemapb.DataType_SparseFloatVector: sparseData, _, err := reader.GetSparseFloatVectorFromPayload() if err != nil { diff --git a/internal/storage/print_binlog_test.go b/internal/storage/print_binlog_test.go index 5c302965d0e32..22e0d3e2ab423 100644 --- a/internal/storage/print_binlog_test.go +++ b/internal/storage/print_binlog_test.go @@ -210,6 +210,13 @@ func TestPrintBinlogFiles(t *testing.T) { {Key: common.DimKey, Value: "4"}, }, }, + { + FieldID: 113, + Name: "field_geometry", + IsPrimaryKey: false, + Description: "description_15", + DataType: schemapb.DataType_Geometry, + }, }, }, } @@ -268,6 +275,13 @@ func TestPrintBinlogFiles(t *testing.T) { Data: []byte("12345678"), Dim: 4, }, + 113: &GeometryFieldData{ + Data: [][]byte{ + // POINT (30.123 -10.456) and LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890) + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, + }, }, } @@ -325,6 +339,13 @@ func TestPrintBinlogFiles(t *testing.T) { Data: []byte("abcdefgh"), Dim: 4, }, + 113: &GeometryFieldData{ + Data: [][]byte{ + // POINT (30.123 -10.456) and LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890) + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, + }, }, } firstBlobs, err := insertCodec.Serialize(1, 1, insertDataFirst) diff --git a/internal/storage/serde.go b/internal/storage/serde.go index 3a5b12e274b96..6f127ad6eed1d 100644 --- a/internal/storage/serde.go +++ b/internal/storage/serde.go @@ -416,6 +416,7 @@ var serdeMap = func() map[schemapb.DataType]serdeEntry { m[schemapb.DataType_Array] = byteEntry m[schemapb.DataType_JSON] = byteEntry + m[schemapb.DataType_Geometry] = byteEntry fixedSizeDeserializer := func(a arrow.Array, i int) (any, bool) { if a.IsNull(i) { diff --git a/internal/storage/utils.go b/internal/storage/utils.go index 5e444027dcc48..3ffb85ae7842d 100644 --- a/internal/storage/utils.go +++ b/internal/storage/utils.go @@ -673,6 +673,13 @@ func ColumnBasedInsertMsgToInsertData(msg *msgstream.InsertMsg, collSchema *sche Data: lo.Map(srcData, func(v []byte, _ int) []byte { return v }), ValidData: lo.Map(validData, func(v bool, _ int) bool { return v }), } + case schemapb.DataType_Geometry: + srcData := srcField.GetScalars().GetGeometryData().GetData() + validData := srcField.GetValidData() + fieldData = &GeometryFieldData{ + Data: lo.Map(srcData, func(v []byte, _ int) []byte { return v }), + ValidData: lo.Map(validData, func(v bool, _ int) bool { return v }), + } default: return nil, merr.WrapErrServiceInternal("data type not handled", field.GetDataType().String()) @@ -1193,6 +1200,21 @@ func TransferInsertDataToInsertRecord(insertData *InsertData) (*segcorepb.Insert }, ValidData: rawData.ValidData, } + case *GeometryFieldData: + fieldData = &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldId: fieldID, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: rawData.Data, + }, + }, + }, + }, + ValidData: rawData.ValidData, + } case *FloatVectorFieldData: fieldData = &schemapb.FieldData{ Type: schemapb.DataType_FloatVector, diff --git a/internal/storage/utils_test.go b/internal/storage/utils_test.go index 03d6847754ae6..d262913dc9390 100644 --- a/internal/storage/utils_test.go +++ b/internal/storage/utils_test.go @@ -1003,7 +1003,7 @@ func genColumnBasedInsertMsg(schema *schemapb.CollectionSchema, numRows, fVecDim case schemapb.DataType_JSON: data := testutils.GenerateBytesArray(numRows) f := &schemapb.FieldData{ - Type: schemapb.DataType_Array, + Type: schemapb.DataType_JSON, FieldName: field.GetName(), Field: &schemapb.FieldData_Scalars{ Scalars: &schemapb.ScalarField{ @@ -1023,6 +1023,29 @@ func genColumnBasedInsertMsg(schema *schemapb.CollectionSchema, numRows, fVecDim for _, d := range data { columns[idx] = append(columns[idx], d) } + case schemapb.DataType_Geometry: + data := testutils.GenerateGeometryWktArray(numRows) + f := &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: field.GetName(), + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: data, + }, + }, + }, + }, + FieldId: field.FieldID, + } + if field.GetNullable() { + f.ValidData = testutils.GenerateBoolArray(numRows) + } + msg.FieldsData = append(msg.FieldsData, f) + for _, d := range data { + columns[idx] = append(columns[idx], d) + } } } diff --git a/internal/util/importutilv2/parquet/field_reader.go b/internal/util/importutilv2/parquet/field_reader.go index e291ba16d4cb9..0780903c92dab 100644 --- a/internal/util/importutilv2/parquet/field_reader.go +++ b/internal/util/importutilv2/parquet/field_reader.go @@ -150,6 +150,12 @@ func (c *FieldReader) Next(count int64) (any, any, error) { } data, err := ReadJSONData(c, count) return data, nil, err + case schemapb.DataType_Geometry: + if c.field.GetNullable() { + return ReadNullableGeometryData(c, count) + } + data, err := ReadGeometryData(c, count) + return data, nil, err case schemapb.DataType_BinaryVector, schemapb.DataType_Float16Vector, schemapb.DataType_BFloat16Vector: // vector not support default_value if c.field.GetNullable() { @@ -620,6 +626,42 @@ func ReadNullableJSONData(pcr *FieldReader, count int64) (any, []bool, error) { return byteArr, validData, nil } +func ReadNullableGeometryData(pcr *FieldReader, count int64) (any, []bool, error) { + // Geometry field read data from string array Parquet + data, validData, err := ReadNullableStringData(pcr, count) + if err != nil { + return nil, nil, err + } + if data == nil { + return nil, nil, nil + } + byteArr := make([][]byte, 0) + for i, str := range data.([]string) { + if !validData[i] { + byteArr = append(byteArr, []byte(nil)) + continue + } + byteArr = append(byteArr, []byte(str)) + } + return byteArr, validData, nil +} + +func ReadGeometryData(pcr *FieldReader, count int64) (any, error) { + // Geometry field read data from string array Parquet + data, err := ReadStringData(pcr, count) + if err != nil { + return nil, err + } + if data == nil { + return nil, nil + } + byteArr := make([][]byte, 0) + for _, str := range data.([]string) { + byteArr = append(byteArr, []byte(str)) + } + return byteArr, nil +} + func ReadBinaryData(pcr *FieldReader, count int64) (any, error) { dataType := pcr.field.GetDataType() chunked, err := pcr.columnReader.NextBatch(count) diff --git a/internal/util/importutilv2/parquet/reader_test.go b/internal/util/importutilv2/parquet/reader_test.go index 30ec59d19efd3..d70701090cee4 100644 --- a/internal/util/importutilv2/parquet/reader_test.go +++ b/internal/util/importutilv2/parquet/reader_test.go @@ -426,6 +426,7 @@ func (s *ReaderSuite) TestReadScalarFields() { s.run(schemapb.DataType_String, schemapb.DataType_None, false, 0) s.run(schemapb.DataType_VarChar, schemapb.DataType_None, false, 0) s.run(schemapb.DataType_JSON, schemapb.DataType_None, false, 0) + s.run(schemapb.DataType_Geometry, schemapb.DataType_None, false, 0) s.run(schemapb.DataType_Array, schemapb.DataType_Bool, false, 0) s.run(schemapb.DataType_Array, schemapb.DataType_Int8, false, 0) @@ -464,6 +465,7 @@ func (s *ReaderSuite) TestReadScalarFields() { s.run(schemapb.DataType_String, schemapb.DataType_None, true, 100) s.run(schemapb.DataType_VarChar, schemapb.DataType_None, true, 100) s.run(schemapb.DataType_JSON, schemapb.DataType_None, true, 100) + s.run(schemapb.DataType_Geometry, schemapb.DataType_None, true, 100) s.run(schemapb.DataType_Array, schemapb.DataType_Bool, true, 100) s.run(schemapb.DataType_Array, schemapb.DataType_Int8, true, 100) diff --git a/internal/util/importutilv2/parquet/util.go b/internal/util/importutilv2/parquet/util.go index f4b252abf4cd2..d021e94fc7dcc 100644 --- a/internal/util/importutilv2/parquet/util.go +++ b/internal/util/importutilv2/parquet/util.go @@ -175,6 +175,8 @@ func convertToArrowDataType(field *schemapb.FieldSchema, isArray bool) (arrow.Da return &arrow.StringType{}, nil case schemapb.DataType_JSON: return &arrow.StringType{}, nil + case schemapb.DataType_Geometry: + return &arrow.StringType{}, nil case schemapb.DataType_Array: elemType, err := convertToArrowDataType(field, true) if err != nil { diff --git a/internal/util/indexparamcheck/inverted_checker_test.go b/internal/util/indexparamcheck/inverted_checker_test.go index 68afa3903b3d9..7571cd744d7db 100644 --- a/internal/util/indexparamcheck/inverted_checker_test.go +++ b/internal/util/indexparamcheck/inverted_checker_test.go @@ -20,6 +20,7 @@ func Test_INVERTEDIndexChecker(t *testing.T) { assert.NoError(t, c.CheckValidDataType(IndexINVERTED, &schemapb.FieldSchema{DataType: schemapb.DataType_Float})) assert.NoError(t, c.CheckValidDataType(IndexINVERTED, &schemapb.FieldSchema{DataType: schemapb.DataType_Array})) + assert.Error(t, c.CheckValidDataType(IndexINVERTED, &schemapb.FieldSchema{DataType: schemapb.DataType_Geometry})) assert.Error(t, c.CheckValidDataType(IndexINVERTED, &schemapb.FieldSchema{DataType: schemapb.DataType_JSON})) assert.Error(t, c.CheckValidDataType(IndexINVERTED, &schemapb.FieldSchema{DataType: schemapb.DataType_FloatVector})) } diff --git a/internal/util/testutil/test_util.go b/internal/util/testutil/test_util.go index 5182a331dd255..d73504eb99dfa 100644 --- a/internal/util/testutil/test_util.go +++ b/internal/util/testutil/test_util.go @@ -175,6 +175,9 @@ func CreateInsertData(schema *schemapb.CollectionSchema, rows int, nullPercent . insertData.Data[f.FieldID].AppendDataRows(testutils.GenerateStringArray(rows)) case schemapb.DataType_JSON: insertData.Data[f.FieldID].AppendDataRows(testutils.GenerateJSONArray(rows)) + case schemapb.DataType_Geometry: + // wkb bytes array + insertData.Data[f.FieldID].AppendDataRows(testutils.GenerateGeometryArray(rows)) case schemapb.DataType_Array: switch f.GetElementType() { case schemapb.DataType_Bool: @@ -427,6 +430,14 @@ func BuildArrayData(schema *schemapb.CollectionSchema, insertData *storage.Inser return string(bs) }), validData) columns = append(columns, builder.NewStringArray()) + case schemapb.DataType_Geometry: + builder := array.NewStringBuilder(mem) + wkbData := insertData.Data[fieldID].(*storage.GeometryFieldData).Data + validData := insertData.Data[fieldID].(*storage.GeometryFieldData).ValidData + builder.AppendValues(lo.Map(wkbData, func(bs []byte, _ int) string { + return string(bs) + }), validData) + columns = append(columns, builder.NewStringArray()) case schemapb.DataType_Array: data := insertData.Data[fieldID].(*storage.ArrayFieldData).Data validData := insertData.Data[fieldID].(*storage.ArrayFieldData).ValidData diff --git a/internal/util/typeutil/schema.go b/internal/util/typeutil/schema.go index 6854b311491c9..298ee66baf1c4 100644 --- a/internal/util/typeutil/schema.go +++ b/internal/util/typeutil/schema.go @@ -62,6 +62,11 @@ func ConvertToArrowSchema(fields []*schemapb.FieldSchema) (*arrow.Schema, error) Name: field.Name, Type: arrow.BinaryTypes.Binary, }) + case schemapb.DataType_Geometry: + arrowFields = append(arrowFields, arrow.Field{ + Name: field.Name, + Type: arrow.BinaryTypes.Binary, + }) case schemapb.DataType_BinaryVector: dim, err := storage.GetDimFromParams(field.TypeParams) if err != nil { diff --git a/internal/util/typeutil/storage.go b/internal/util/typeutil/storage.go index 984de5e4878f2..8f5415cd0e369 100644 --- a/internal/util/typeutil/storage.go +++ b/internal/util/typeutil/storage.go @@ -77,6 +77,8 @@ func BuildRecord(b *array.RecordBuilder, data *storage.InsertData, fields []*sch } case schemapb.DataType_JSON: fBuilder.(*array.BinaryBuilder).AppendValues(data.Data[field.FieldID].(*storage.JSONFieldData).Data, nil) + case schemapb.DataType_Geometry: + fBuilder.(*array.BinaryBuilder).AppendValues(data.Data[field.FieldID].(*storage.GeometryFieldData).Data, nil) case schemapb.DataType_BinaryVector: vecData := data.Data[field.FieldID].(*storage.BinaryVectorFieldData) for i := 0; i < len(vecData.Data); i += vecData.Dim / 8 { diff --git a/pkg/go.mod b/pkg/go.mod index 6a44630938a2a..8e145e1a800f1 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -23,14 +23,15 @@ require ( github.com/remeh/sizedwaitgroup v1.0.0 github.com/samber/lo v1.27.0 github.com/sasha-s/go-deadlock v0.3.1 - github.com/shirou/gopsutil/v3 v3.22.9 - github.com/sirupsen/logrus v1.9.0 + github.com/shirou/gopsutil/v3 v3.24.2 + github.com/sirupsen/logrus v1.9.3 github.com/spaolacci/murmur3 v1.1.0 github.com/streamnative/pulsarctl v0.5.0 github.com/stretchr/testify v1.9.0 github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c github.com/tidwall/gjson v1.17.0 github.com/tikv/client-go/v2 v2.0.4 + github.com/twpayne/go-geom v1.5.7 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/x448/float16 v0.8.4 go.etcd.io/etcd/api/v3 v3.5.5 @@ -48,7 +49,7 @@ require ( go.uber.org/automaxprocs v1.5.3 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.25.0 - golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 golang.org/x/net v0.27.0 golang.org/x/sync v0.7.0 golang.org/x/sys v0.22.0 @@ -78,7 +79,7 @@ require ( github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect @@ -88,7 +89,7 @@ require ( github.com/getsentry/sentry-go v0.12.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/godbus/dbus/v5 v5.0.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -109,7 +110,7 @@ require ( github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/linkedin/goavro/v2 v2.11.1 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.8 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect @@ -131,12 +132,13 @@ require ( github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stathat/consistent v1.0.0 // indirect @@ -145,12 +147,12 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.13 // indirect + github.com/tklauser/numcpus v0.7.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/twmb/murmur3 v1.1.3 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/client/v2 v2.305.5 // indirect diff --git a/pkg/go.sum b/pkg/go.sum index 583d5b7198052..d03e5c8f6430e 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -50,6 +50,8 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= @@ -61,6 +63,10 @@ github.com/actgardner/gogen-avro/v10 v10.1.0/go.mod h1:o+ybmVjEa27AAr35FRqU98DJu github.com/actgardner/gogen-avro/v10 v10.2.1/go.mod h1:QUhjeHPchheYmMDni/Nx7VB0RsT/ee8YIgGY/xpEQgQ= github.com/actgardner/gogen-avro/v9 v9.1.0/go.mod h1:nyTj6wPqDJoxM3qdnjcLv+EnMDSDFqE0qDpva2QRmKc= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= +github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -159,8 +165,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA2EjTY= @@ -224,8 +230,9 @@ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= @@ -378,6 +385,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/heetch/avro v0.3.1/go.mod h1:4xn38Oz/+hiEUTpbVfGVLfvOg0yKLlRP7Q9+gJJILgA= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= @@ -456,12 +465,13 @@ github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF github.com/linkedin/goavro/v2 v2.10.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= github.com/linkedin/goavro/v2 v2.11.1 h1:4cuAtbDfqkKnBXp9E+tRkIJGa6W6iAjwonwt8O1f4U0= github.com/linkedin/goavro/v2 v2.11.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a h1:3Bm7EwfUQUvhNeKIkUct/gl9eod1TcXuj8stxvi/GoI= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -575,8 +585,9 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -637,15 +648,19 @@ github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtm github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA= -github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -685,6 +700,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -702,15 +718,19 @@ github.com/tikv/client-go/v2 v2.0.4 h1:cPtMXTExqjzk8L40qhrgB/mXiBXKP5LRU0vwjtI2X github.com/tikv/client-go/v2 v2.0.4/go.mod h1:v52O5zDtv2BBus4lm5yrSQhxGW4Z4RaXWfg0U1Kuyqo= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= +github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= +github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA= github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= +github.com/twpayne/go-geom v1.5.7 h1:7fdceDUr03/MP7rAKOaTV6x9njMiQdxB/D0PDzMTCDc= +github.com/twpayne/go-geom v1.5.7/go.mod h1:y4fTAQtLedXW8eG2Yo4tYrIGN1yIwwKkmA+K3iSHKBA= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -742,8 +762,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= @@ -849,8 +869,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1023,11 +1043,13 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/pkg/util/funcutil/func.go b/pkg/util/funcutil/func.go index acd9aeb062455..1fb9c11677cfd 100644 --- a/pkg/util/funcutil/func.go +++ b/pkg/util/funcutil/func.go @@ -370,6 +370,8 @@ func GetNumRowOfFieldDataWithSchema(fieldData *schemapb.FieldData, helper *typeu fieldNumRows = getNumRowsOfScalarField(fieldData.GetScalars().GetArrayData().GetData()) case schemapb.DataType_JSON: fieldNumRows = getNumRowsOfScalarField(fieldData.GetScalars().GetJsonData().GetData()) + case schemapb.DataType_Geometry: + fieldNumRows = getNumRowsOfScalarField(fieldData.GetScalars().GetGeometryData().GetData()) case schemapb.DataType_FloatVector: dim := fieldData.GetVectors().GetDim() fieldNumRows, err = GetNumRowsOfFloatVectorField(fieldData.GetVectors().GetFloatVector().GetData(), dim) @@ -427,6 +429,8 @@ func GetNumRowOfFieldData(fieldData *schemapb.FieldData) (uint64, error) { fieldNumRows = getNumRowsOfScalarField(scalarField.GetArrayData().Data) case *schemapb.ScalarField_JsonData: fieldNumRows = getNumRowsOfScalarField(scalarField.GetJsonData().Data) + case *schemapb.ScalarField_GeometryData: + fieldNumRows = getNumRowsOfScalarField(scalarField.GetGeometryData().Data) default: return 0, fmt.Errorf("%s is not supported now", scalarType) } diff --git a/pkg/util/testutils/gen_data.go b/pkg/util/testutils/gen_data.go index bf2f91c7f6911..3c569343cd890 100644 --- a/pkg/util/testutils/gen_data.go +++ b/pkg/util/testutils/gen_data.go @@ -26,6 +26,8 @@ import ( "strconv" "strings" + "github.com/twpayne/go-geom/encoding/wkb" + "github.com/twpayne/go-geom/encoding/wkt" "github.com/x448/float16" "github.com/milvus-io/milvus-proto/go-api/v2/schemapb" @@ -149,6 +151,57 @@ func GenerateJSONArray(numRows int) [][]byte { return ret } +// milvus core compoent view geometry as wkb bytes +func GenerateGeometryArray(numRows int) [][]byte { + ret := make([][]byte, 0, numRows) + const ( + point = "POINT (30.123 -10.456)" + linestring = "LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890)" + polygon = "POLYGON ((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456))" + multipoint = "MULTIPOINT ((10.111 40.222), (40.333 30.444), (20.555 20.666), (30.777 10.888))" + multilinestring = "MULTILINESTRING ((10.111 10.222, 20.333 20.444), (15.555 15.666, 25.777 25.888), (-30.999 20.000, 40.111 30.222))" + multipolygon = "MULTIPOLYGON (((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456)),((15.123 5.456, 25.678 5.890, 25.345 15.567, 15.123 15.456, 15.123 5.456)))" + ) + wktArray := [6]string{point, linestring, polygon, multipoint, multilinestring, multipolygon} + for i := 0; i < numRows; i++ { + // data of wkt string bytes ,consider to be process by proxy + if i == numRows-1 { + geomT, _ := wkt.Unmarshal("POINT (-84.036 39.997)") // add a special point finally for test + wkbdata, _ := wkb.Marshal(geomT, wkb.NDR) + ret = append(ret, wkbdata) + continue + } + geomT, _ := wkt.Unmarshal(wktArray[i%6]) + wkbdata, _ := wkb.Marshal(geomT, wkb.NDR) + ret = append(ret, wkbdata) + } + return ret +} + +// milvus client and proxy's insert request input view geometry data as wkt strings +func GenerateGeometryWktArray(numRows int) [][]byte { + ret := make([][]byte, 0, numRows) + const ( + point = "POINT (30.123 -10.456)" + linestring = "LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890)" + polygon = "POLYGON ((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456))" + multipoint = "MULTIPOINT ((10.111 40.222), (40.333 30.444), (20.555 20.666), (30.777 10.888))" + multilinestring = "MULTILINESTRING ((10.111 10.222, 20.333 20.444), (15.555 15.666, 25.777 25.888), (-30.999 20.000, 40.111 30.222))" + multipolygon = "MULTIPOLYGON (((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456)),((15.123 5.456, 25.678 5.890, 25.345 15.567, 15.123 15.456, 15.123 5.456)))" + ) + wktArray := [6]string{point, linestring, polygon, multipoint, multilinestring, multipolygon} + for i := 0; i < numRows; i++ { + // data of wkt string bytes ,consider to be process by proxy + if i == numRows-1 { + ret = append(ret, []byte("POINT (-84.036 39.997)")) + continue + } + + ret = append(ret, []byte(wktArray[i%6])) + } + return ret +} + func GenerateArrayOfBoolArray(numRows int) []*schemapb.ScalarField { ret := make([]*schemapb.ScalarField, 0, numRows) for i := 0; i < numRows; i++ { @@ -715,6 +768,54 @@ func NewArrayFieldDataWithValue(fieldName string, fieldValue interface{}) *schem } } +func NewGeometryFieldData(fieldName string, numRows int) *schemapb.FieldData { + return &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: fieldName, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: GenerateGeometryArray(numRows), + }, + }, + }, + }, + } +} + +func NewGeometryFieldDataWktFormat(fieldName string, numRows int) *schemapb.FieldData { + return &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: fieldName, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: GenerateGeometryWktArray(numRows), + }, + }, + }, + }, + } +} + +func NewGeometryFieldDataWithValue(fieldName string, fieldValue interface{}) *schemapb.FieldData { + return &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: fieldName, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: fieldValue.([][]byte), + }, + }, + }, + }, + } +} + func NewBinaryVectorFieldData(fieldName string, numRows, dim int) *schemapb.FieldData { return &schemapb.FieldData{ Type: schemapb.DataType_BinaryVector, @@ -882,6 +983,8 @@ func GenerateScalarFieldData(dType schemapb.DataType, fieldName string, numRows return NewArrayFieldData(fieldName, numRows) case schemapb.DataType_JSON: return NewJSONFieldData(fieldName, numRows) + case schemapb.DataType_Geometry: + return NewGeometryFieldData(fieldName, numRows) default: panic("unsupported data type") } @@ -912,6 +1015,8 @@ func GenerateScalarFieldDataWithValue(dType schemapb.DataType, fieldName string, fieldData = NewArrayFieldDataWithValue(fieldName, fieldValue) case schemapb.DataType_JSON: fieldData = NewJSONFieldDataWithValue(fieldName, fieldValue) + case schemapb.DataType_Geometry: + fieldData = NewGeometryFieldDataWithValue(fieldName, fieldValue) default: panic("unsupported data type") } diff --git a/pkg/util/typeutil/gen_empty_field_data.go b/pkg/util/typeutil/gen_empty_field_data.go index 5d39df275caba..a15f6ef7841bc 100644 --- a/pkg/util/typeutil/gen_empty_field_data.go +++ b/pkg/util/typeutil/gen_empty_field_data.go @@ -123,6 +123,20 @@ func genEmptyJSONFieldData(field *schemapb.FieldSchema) *schemapb.FieldData { } } +func genEmptyGeometryFieldData(field *schemapb.FieldSchema) *schemapb.FieldData { + return &schemapb.FieldData{ + Type: field.GetDataType(), + FieldName: field.GetName(), + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{GeometryData: &schemapb.GeometryArray{Data: nil}}, + }, + }, + FieldId: field.GetFieldID(), + IsDynamic: field.GetIsDynamic(), + } +} + func genEmptyBinaryVectorFieldData(field *schemapb.FieldSchema) (*schemapb.FieldData, error) { dim, err := GetDim(field) if err != nil { @@ -246,6 +260,8 @@ func GenEmptyFieldData(field *schemapb.FieldSchema) (*schemapb.FieldData, error) return genEmptyArrayFieldData(field), nil case schemapb.DataType_JSON: return genEmptyJSONFieldData(field), nil + case schemapb.DataType_Geometry: + return genEmptyGeometryFieldData(field), nil case schemapb.DataType_BinaryVector: return genEmptyBinaryVectorFieldData(field) case schemapb.DataType_FloatVector: diff --git a/pkg/util/typeutil/schema.go b/pkg/util/typeutil/schema.go index 8739552c4d9f1..ad6eda44c5524 100644 --- a/pkg/util/typeutil/schema.go +++ b/pkg/util/typeutil/schema.go @@ -82,7 +82,8 @@ func getVarFieldLength(fieldSchema *schemapb.FieldSchema, policy getVariableFiel default: return 0, fmt.Errorf("unrecognized getVariableFieldLengthPolicy %v", policy) } - case schemapb.DataType_Array, schemapb.DataType_JSON: + // geometry field max length now consider the same as json field, which is 512 bytes + case schemapb.DataType_Array, schemapb.DataType_JSON, schemapb.DataType_Geometry: return DynamicFieldMaxLength, nil default: return 0, fmt.Errorf("field %s is not a variable-length type", fieldSchema.DataType.String()) @@ -114,7 +115,8 @@ func estimateSizeBy(schema *schemapb.CollectionSchema, policy getVariableFieldLe res += 4 case schemapb.DataType_Int64, schemapb.DataType_Double: res += 8 - case schemapb.DataType_VarChar, schemapb.DataType_Array, schemapb.DataType_JSON: + // geometry wkb as well as wkt max len now is the same as max varfield lenth ,consider extend it if needed + case schemapb.DataType_VarChar, schemapb.DataType_Array, schemapb.DataType_JSON, schemapb.DataType_Geometry: maxLengthPerRow, err := getVarFieldLength(fs, policy) if err != nil { return 0, err @@ -196,6 +198,10 @@ func CalcColumnSize(column *schemapb.FieldData) int { for _, str := range column.GetScalars().GetJsonData().GetData() { res += len(str) } + case schemapb.DataType_Geometry: + for _, str := range column.GetScalars().GetGeometryData().GetData() { + res += len(str) + } default: panic("Unknown data type:" + column.Type.String()) } @@ -233,6 +239,11 @@ func EstimateEntitySize(fieldsData []*schemapb.FieldData, rowOffset int) (int, e return 0, fmt.Errorf("offset out range of field datas") } res += len(fs.GetScalars().GetJsonData().GetData()[rowOffset]) + case schemapb.DataType_Geometry: + if rowOffset >= len(fs.GetScalars().GetGeometryData().GetData()) { + return 0, fmt.Errorf("offset out range of field datas") + } + res += len(fs.GetScalars().GetGeometryData().GetData()[rowOffset]) case schemapb.DataType_BinaryVector: res += int(fs.GetVectors().GetDim()) case schemapb.DataType_FloatVector: @@ -507,6 +518,10 @@ func IsJSONType(dataType schemapb.DataType) bool { return dataType == schemapb.DataType_JSON } +func IsGeometryType(dataType schemapb.DataType) bool { + return dataType == schemapb.DataType_Geometry +} + func IsArrayType(dataType schemapb.DataType) bool { return dataType == schemapb.DataType_Array } @@ -547,7 +562,7 @@ func IsStringType(dataType schemapb.DataType) bool { } func IsVariableDataType(dataType schemapb.DataType) bool { - return IsStringType(dataType) || IsArrayType(dataType) || IsJSONType(dataType) + return IsStringType(dataType) || IsArrayType(dataType) || IsJSONType(dataType) || IsGeometryType(dataType) } func IsPrimitiveType(dataType schemapb.DataType) bool { @@ -614,6 +629,12 @@ func PrepareResultFieldData(sample []*schemapb.FieldData, topK int64) []*schemap Data: make([][]byte, 0, topK), }, } + case *schemapb.ScalarField_GeometryData: + scalar.Scalars.Data = &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: make([][]byte, 0, topK), + }, + } case *schemapb.ScalarField_ArrayData: scalar.Scalars.Data = &schemapb.ScalarField_ArrayData{ ArrayData: &schemapb.ArrayArray{ @@ -785,6 +806,17 @@ func AppendFieldData(dst, src []*schemapb.FieldData, idx int64) (appendSize int6 } /* #nosec G103 */ appendSize += int64(unsafe.Sizeof(srcScalar.JsonData.Data[idx])) + case *schemapb.ScalarField_GeometryData: + if dstScalar.GetGeometryData() == nil { + dstScalar.Data = &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: [][]byte{srcScalar.GeometryData.Data[idx]}, + }, + } + } else { + dstScalar.GetGeometryData().Data = append(dstScalar.GetGeometryData().Data, srcScalar.GeometryData.Data[idx]) + } + appendSize += int64(unsafe.Sizeof(srcScalar.GeometryData.Data[idx])) default: log.Error("Not supported field type", zap.String("field type", fieldData.Type.String())) } @@ -903,6 +935,8 @@ func DeleteFieldData(dst []*schemapb.FieldData) { dstScalar.GetStringData().Data = dstScalar.GetStringData().Data[:len(dstScalar.GetStringData().Data)-1] case *schemapb.ScalarField_JsonData: dstScalar.GetJsonData().Data = dstScalar.GetJsonData().Data[:len(dstScalar.GetJsonData().Data)-1] + case *schemapb.ScalarField_GeometryData: + dstScalar.GetGeometryData().Data = dstScalar.GetGeometryData().Data[:len(dstScalar.GetGeometryData().Data)-1] default: log.Error("wrong field type added", zap.String("field type", fieldData.Type.String())) } @@ -1040,6 +1074,16 @@ func MergeFieldData(dst []*schemapb.FieldData, src []*schemapb.FieldData) error } else { dstScalar.GetJsonData().Data = append(dstScalar.GetJsonData().Data, srcScalar.JsonData.Data...) } + case *schemapb.ScalarField_GeometryData: + if dstScalar.GetGeometryData() == nil { + dstScalar.Data = &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: srcScalar.GeometryData.Data, + }, + } + } else { + dstScalar.GetGeometryData().Data = append(dstScalar.GetGeometryData().Data, srcScalar.GeometryData.Data...) + } case *schemapb.ScalarField_BytesData: if dstScalar.GetBytesData() == nil { dstScalar.Data = &schemapb.ScalarField_BytesData{ diff --git a/pkg/util/typeutil/schema_test.go b/pkg/util/typeutil/schema_test.go index ff19f3313a3b8..34f0e2f51cd61 100644 --- a/pkg/util/typeutil/schema_test.go +++ b/pkg/util/typeutil/schema_test.go @@ -165,13 +165,19 @@ func TestSchema(t *testing.T) { }, }, }, + { + FieldID: 113, + Name: "field_geometry", + IsPrimaryKey: false, + DataType: schemapb.DataType_Geometry, + }, // Do not test on sparse float vector field. }, } t.Run("EstimateSizePerRecord", func(t *testing.T) { size, err := EstimateSizePerRecord(schema) - assert.Equal(t, 680+DynamicFieldMaxLength*3, size) + assert.Equal(t, 680+DynamicFieldMaxLength*4, size) assert.NoError(t, err) }) @@ -990,6 +996,21 @@ func genFieldData(fieldName string, fieldID int64, fieldType schemapb.DataType, }, FieldId: fieldID, } + case schemapb.DataType_Geometry: + fieldData = &schemapb.FieldData{ + Type: schemapb.DataType_Geometry, + FieldName: fieldName, + Field: &schemapb.FieldData_Scalars{ + Scalars: &schemapb.ScalarField{ + Data: &schemapb.ScalarField_GeometryData{ + GeometryData: &schemapb.GeometryArray{ + Data: fieldValue.([][]byte), + }, + }, + }, + }, + FieldId: fieldID, + } default: log.Error("not supported field type", zap.String("field type", fieldType.String())) } @@ -1011,6 +1032,7 @@ func TestAppendFieldData(t *testing.T) { BFloat16VectorFieldName = "BFloat16VectorField" ArrayFieldName = "ArrayField" SparseFloatVectorFieldName = "SparseFloatVectorField" + GeometryFieldName = "GeometryField" BoolFieldID = common.StartOfUserFieldID + 1 Int32FieldID = common.StartOfUserFieldID + 2 Int64FieldID = common.StartOfUserFieldID + 3 @@ -1022,6 +1044,7 @@ func TestAppendFieldData(t *testing.T) { BFloat16VectorFieldID = common.StartOfUserFieldID + 9 ArrayFieldID = common.StartOfUserFieldID + 10 SparseFloatVectorFieldID = common.StartOfUserFieldID + 11 + GeometryFieldID = common.StartOfUserFieldID + 12 ) BoolArray := []bool{true, false} Int32Array := []int32{1, 2} @@ -1061,8 +1084,13 @@ func TestAppendFieldData(t *testing.T) { CreateSparseFloatRow([]uint32{60, 80, 230}, []float32{2.1, 2.2, 2.3}), }, } + // POINT (30.123 -10.456) and LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890) + GeometryArray := [][]byte{ + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + } - result := make([]*schemapb.FieldData, 11) + result := make([]*schemapb.FieldData, 12) var fieldDataArray1 []*schemapb.FieldData fieldDataArray1 = append(fieldDataArray1, genFieldData(BoolFieldName, BoolFieldID, schemapb.DataType_Bool, BoolArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(Int32FieldName, Int32FieldID, schemapb.DataType_Int32, Int32Array[0:1], 1)) @@ -1075,6 +1103,7 @@ func TestAppendFieldData(t *testing.T) { fieldDataArray1 = append(fieldDataArray1, genFieldData(BFloat16VectorFieldName, BFloat16VectorFieldID, schemapb.DataType_BFloat16Vector, BFloat16Vector[0:Dim*2], Dim)) fieldDataArray1 = append(fieldDataArray1, genFieldData(ArrayFieldName, ArrayFieldID, schemapb.DataType_Array, ArrayArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(SparseFloatVectorFieldName, SparseFloatVectorFieldID, schemapb.DataType_SparseFloatVector, SparseFloatVector.Contents[0], SparseFloatVector.Dim)) + fieldDataArray1 = append(fieldDataArray1, genFieldData(GeometryFieldName, GeometryFieldID, schemapb.DataType_Geometry, GeometryArray[0:1], 1)) var fieldDataArray2 []*schemapb.FieldData fieldDataArray2 = append(fieldDataArray2, genFieldData(BoolFieldName, BoolFieldID, schemapb.DataType_Bool, BoolArray[1:2], 1)) @@ -1088,6 +1117,7 @@ func TestAppendFieldData(t *testing.T) { fieldDataArray2 = append(fieldDataArray2, genFieldData(BFloat16VectorFieldName, BFloat16VectorFieldID, schemapb.DataType_BFloat16Vector, BFloat16Vector[2*Dim:4*Dim], Dim)) fieldDataArray2 = append(fieldDataArray2, genFieldData(ArrayFieldName, ArrayFieldID, schemapb.DataType_Array, ArrayArray[1:2], 1)) fieldDataArray2 = append(fieldDataArray2, genFieldData(SparseFloatVectorFieldName, SparseFloatVectorFieldID, schemapb.DataType_SparseFloatVector, SparseFloatVector.Contents[1], SparseFloatVector.Dim)) + fieldDataArray2 = append(fieldDataArray2, genFieldData(GeometryFieldName, GeometryFieldID, schemapb.DataType_Geometry, GeometryArray[1:2], 1)) AppendFieldData(result, fieldDataArray1, 0) AppendFieldData(result, fieldDataArray2, 0) @@ -1103,6 +1133,7 @@ func TestAppendFieldData(t *testing.T) { assert.Equal(t, BFloat16Vector, result[8].GetVectors().Data.(*schemapb.VectorField_Bfloat16Vector).Bfloat16Vector) assert.Equal(t, ArrayArray, result[9].GetScalars().GetArrayData().Data) assert.Equal(t, SparseFloatVector, result[10].GetVectors().GetSparseFloatVector()) + assert.Equal(t, GeometryArray, result[11].GetScalars().GetGeometryData().Data) } func TestDeleteFieldData(t *testing.T) { @@ -1114,6 +1145,7 @@ func TestDeleteFieldData(t *testing.T) { FloatFieldName = "FloatField" DoubleFieldName = "DoubleField" JSONFieldName = "JSONField" + GeometryFieldName = "GeometryField" BinaryVectorFieldName = "BinaryVectorField" FloatVectorFieldName = "FloatVectorField" Float16VectorFieldName = "Float16VectorField" @@ -1128,6 +1160,7 @@ func TestDeleteFieldData(t *testing.T) { FloatFieldID DoubleFieldID JSONFieldID + GeometryFiledID BinaryVectorFieldID FloatVectorFieldID Float16VectorFieldID @@ -1140,6 +1173,11 @@ func TestDeleteFieldData(t *testing.T) { FloatArray := []float32{1.0, 2.0} DoubleArray := []float64{11.0, 22.0} JSONArray := [][]byte{[]byte("{\"hello\":0}"), []byte("{\"key\":1}")} + // POINT (30.123 -10.456) and LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890) + GeometryArray := [][]byte{ + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + } BinaryVector := []byte{0x12, 0x34} FloatVector := []float32{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 11.0, 22.0, 33.0, 44.0, 55.0, 66.0, 77.0, 88.0} Float16Vector := []byte{ @@ -1158,8 +1196,8 @@ func TestDeleteFieldData(t *testing.T) { }, } - result1 := make([]*schemapb.FieldData, 11) - result2 := make([]*schemapb.FieldData, 11) + result1 := make([]*schemapb.FieldData, 12) + result2 := make([]*schemapb.FieldData, 12) var fieldDataArray1 []*schemapb.FieldData fieldDataArray1 = append(fieldDataArray1, genFieldData(BoolFieldName, BoolFieldID, schemapb.DataType_Bool, BoolArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(Int32FieldName, Int32FieldID, schemapb.DataType_Int32, Int32Array[0:1], 1)) @@ -1167,6 +1205,7 @@ func TestDeleteFieldData(t *testing.T) { fieldDataArray1 = append(fieldDataArray1, genFieldData(FloatFieldName, FloatFieldID, schemapb.DataType_Float, FloatArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(DoubleFieldName, DoubleFieldID, schemapb.DataType_Double, DoubleArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(JSONFieldName, JSONFieldID, schemapb.DataType_JSON, JSONArray[0:1], 1)) + fieldDataArray1 = append(fieldDataArray1, genFieldData(GeometryFieldName, GeometryFiledID, schemapb.DataType_Geometry, GeometryArray[0:1], 1)) fieldDataArray1 = append(fieldDataArray1, genFieldData(BinaryVectorFieldName, BinaryVectorFieldID, schemapb.DataType_BinaryVector, BinaryVector[0:Dim/8], Dim)) fieldDataArray1 = append(fieldDataArray1, genFieldData(FloatVectorFieldName, FloatVectorFieldID, schemapb.DataType_FloatVector, FloatVector[0:Dim], Dim)) fieldDataArray1 = append(fieldDataArray1, genFieldData(Float16VectorFieldName, Float16VectorFieldID, schemapb.DataType_Float16Vector, Float16Vector[0:2*Dim], Dim)) @@ -1180,6 +1219,7 @@ func TestDeleteFieldData(t *testing.T) { fieldDataArray2 = append(fieldDataArray2, genFieldData(FloatFieldName, FloatFieldID, schemapb.DataType_Float, FloatArray[1:2], 1)) fieldDataArray2 = append(fieldDataArray2, genFieldData(DoubleFieldName, DoubleFieldID, schemapb.DataType_Double, DoubleArray[1:2], 1)) fieldDataArray2 = append(fieldDataArray2, genFieldData(JSONFieldName, JSONFieldID, schemapb.DataType_JSON, JSONArray[1:2], 1)) + fieldDataArray2 = append(fieldDataArray2, genFieldData(GeometryFieldName, GeometryFiledID, schemapb.DataType_Geometry, GeometryArray[1:2], 1)) fieldDataArray2 = append(fieldDataArray2, genFieldData(BinaryVectorFieldName, BinaryVectorFieldID, schemapb.DataType_BinaryVector, BinaryVector[Dim/8:2*Dim/8], Dim)) fieldDataArray2 = append(fieldDataArray2, genFieldData(FloatVectorFieldName, FloatVectorFieldID, schemapb.DataType_FloatVector, FloatVector[Dim:2*Dim], Dim)) fieldDataArray2 = append(fieldDataArray2, genFieldData(Float16VectorFieldName, Float16VectorFieldID, schemapb.DataType_Float16Vector, Float16Vector[2*Dim:4*Dim], Dim)) @@ -1195,6 +1235,7 @@ func TestDeleteFieldData(t *testing.T) { assert.Equal(t, FloatArray[0:1], result1[FloatFieldID-common.StartOfUserFieldID].GetScalars().GetFloatData().Data) assert.Equal(t, DoubleArray[0:1], result1[DoubleFieldID-common.StartOfUserFieldID].GetScalars().GetDoubleData().Data) assert.Equal(t, JSONArray[0:1], result1[JSONFieldID-common.StartOfUserFieldID].GetScalars().GetJsonData().Data) + assert.Equal(t, GeometryArray[0:1], result1[GeometryFiledID-common.StartOfUserFieldID].GetScalars().GetGeometryData().Data) assert.Equal(t, BinaryVector[0:Dim/8], result1[BinaryVectorFieldID-common.StartOfUserFieldID].GetVectors().Data.(*schemapb.VectorField_BinaryVector).BinaryVector) assert.Equal(t, FloatVector[0:Dim], result1[FloatVectorFieldID-common.StartOfUserFieldID].GetVectors().GetFloatVector().Data) assert.Equal(t, Float16Vector[0:2*Dim], result1[Float16VectorFieldID-common.StartOfUserFieldID].GetVectors().Data.(*schemapb.VectorField_Float16Vector).Float16Vector) @@ -1212,6 +1253,7 @@ func TestDeleteFieldData(t *testing.T) { assert.Equal(t, FloatArray[1:2], result2[FloatFieldID-common.StartOfUserFieldID].GetScalars().GetFloatData().Data) assert.Equal(t, DoubleArray[1:2], result2[DoubleFieldID-common.StartOfUserFieldID].GetScalars().GetDoubleData().Data) assert.Equal(t, JSONArray[1:2], result2[JSONFieldID-common.StartOfUserFieldID].GetScalars().GetJsonData().Data) + assert.Equal(t, GeometryArray[1:2], result2[GeometryFiledID-common.StartOfUserFieldID].GetScalars().GetGeometryData().Data) assert.Equal(t, BinaryVector[Dim/8:2*Dim/8], result2[BinaryVectorFieldID-common.StartOfUserFieldID].GetVectors().Data.(*schemapb.VectorField_BinaryVector).BinaryVector) assert.Equal(t, FloatVector[Dim:2*Dim], result2[FloatVectorFieldID-common.StartOfUserFieldID].GetVectors().GetFloatVector().Data) assert.Equal(t, Float16Vector[2*Dim:4*Dim], result2[Float16VectorFieldID-common.StartOfUserFieldID].GetVectors().Data.(*schemapb.VectorField_Float16Vector).Float16Vector) @@ -1501,6 +1543,11 @@ func TestCalcColumnSize(t *testing.T) { }, }, 110: [][]byte{[]byte(`{"key":"value"}`), []byte(`{"hello":"world"}`)}, + 111: [][]byte{ + // POINT (30.123 -10.456) and LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890) + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, } schema := &schemapb.CollectionSchema{ Name: "testColl", @@ -1572,6 +1619,11 @@ func TestCalcColumnSize(t *testing.T) { Name: "field_json", DataType: schemapb.DataType_JSON, }, + { + FieldID: 111, + Name: "field_geometry", + DataType: schemapb.DataType_Geometry, + }, }, } @@ -1597,6 +1649,11 @@ func TestCalcColumnSize(t *testing.T) { expected += len(v) } + case schemapb.DataType_Geometry: + data := values.([][]byte) + for _, v := range data { + expected += len(v) + } default: expected = binary.Size(fieldValues[field.GetFieldID()]) } @@ -1764,6 +1821,10 @@ func TestMergeFieldData(t *testing.T) { }, genFieldData("float16_vector", 111, schemapb.DataType_Float16Vector, []byte("12345678"), 4), genFieldData("bfloat16_vector", 112, schemapb.DataType_BFloat16Vector, []byte("12345678"), 4), + genFieldData("geometry", 113, schemapb.DataType_Geometry, [][]byte{ + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, 1), } srcFields := []*schemapb.FieldData{ @@ -1825,6 +1886,10 @@ func TestMergeFieldData(t *testing.T) { }, genFieldData("float16_vector", 111, schemapb.DataType_Float16Vector, []byte("abcdefgh"), 4), genFieldData("bfloat16_vector", 112, schemapb.DataType_BFloat16Vector, []byte("ABCDEFGH"), 4), + genFieldData("geometry", 113, schemapb.DataType_Geometry, [][]byte{ + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, 1), } err := MergeFieldData(dstFields, srcFields) @@ -1893,6 +1958,10 @@ func TestMergeFieldData(t *testing.T) { }, genFieldData("float16_vector", 111, schemapb.DataType_Float16Vector, []byte("12345678"), 4), genFieldData("bfloat16_vector", 112, schemapb.DataType_BFloat16Vector, []byte("12345678"), 4), + genFieldData("geometry", 113, schemapb.DataType_Geometry, [][]byte{ + {0x01, 0x01, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40}, + {0x01, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A, 0x0D, 0x1B, 0x4F, 0x4F, 0x9A, 0x3D, 0x40, 0x03, 0xA6, 0xB4, 0xA6, 0xA4, 0xD2, 0xC5, 0xC0, 0xD2, 0x4A, 0x4D, 0x6A, 0x8B, 0x3C, 0x5C, 0x0A}, + }, 1), } dstFields := []*schemapb.FieldData{ @@ -1903,6 +1972,7 @@ func TestMergeFieldData(t *testing.T) { {Type: schemapb.DataType_SparseFloatVector, FieldName: "sparseFloat", Field: &schemapb.FieldData_Vectors{Vectors: &schemapb.VectorField{Data: &schemapb.VectorField_SparseFloatVector{}}}, FieldId: 104}, {Type: schemapb.DataType_Float16Vector, FieldName: "float16_vector", Field: &schemapb.FieldData_Vectors{Vectors: &schemapb.VectorField{Data: &schemapb.VectorField_Float16Vector{}}}, FieldId: 111}, {Type: schemapb.DataType_BFloat16Vector, FieldName: "bfloat16_vector", Field: &schemapb.FieldData_Vectors{Vectors: &schemapb.VectorField{Data: &schemapb.VectorField_Bfloat16Vector{}}}, FieldId: 112}, + {Type: schemapb.DataType_Geometry, FieldName: "geometry", Field: &schemapb.FieldData_Scalars{Scalars: &schemapb.ScalarField{Data: &schemapb.ScalarField_GeometryData{}}}, FieldId: 113}, } err := MergeFieldData(dstFields, srcFields) diff --git a/scripts/3rdparty_build.sh b/scripts/3rdparty_build.sh index ec8c6af25cac6..3a43bc1fc167f 100644 --- a/scripts/3rdparty_build.sh +++ b/scripts/3rdparty_build.sh @@ -48,6 +48,10 @@ fi source ${ROOT_DIR}/scripts/setenv.sh pushd ${BUILD_OUTPUT_DIR} +GEOS_CONFIG_FILE="bin/geos-config" +if [ -f "$GEOS_CONFIG_FILE" ]; then + rm -f "$GEOS_CONFIG_FILE" +fi export CONAN_REVISIONS_ENABLED=1 export CXXFLAGS="-Wno-error=address -Wno-error=deprecated-declarations" diff --git a/tests/go_client/common/consts.go b/tests/go_client/common/consts.go index 91a6df94fb219..7e3738dbbe552 100644 --- a/tests/go_client/common/consts.go +++ b/tests/go_client/common/consts.go @@ -13,6 +13,7 @@ const ( DefaultDoubleFieldName = "double" DefaultVarcharFieldName = "varchar" DefaultJSONFieldName = "json" + DefaultGeometryName = "geometry" DefaultArrayFieldName = "array" DefaultFloatVecFieldName = "floatVec" DefaultBinaryVecFieldName = "binaryVec" diff --git a/tests/go_client/common/response_checker.go b/tests/go_client/common/response_checker.go index 4355b7f8d7080..4b0c19d7f1477 100644 --- a/tests/go_client/common/response_checker.go +++ b/tests/go_client/common/response_checker.go @@ -7,6 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/twpayne/go-geom/encoding/wkb" + "github.com/twpayne/go-geom/encoding/wkt" "go.uber.org/zap" "github.com/milvus-io/milvus/client/v2/column" @@ -71,6 +73,18 @@ func EqualColumn(t *testing.T, columnA column.Column, columnB column.Column) { case *column.ColumnJSONBytes: require.ElementsMatch(t, columnA.(*column.ColumnJSONBytes).Data(), columnB.(*column.ColumnJSONBytes).Data()) } + case entity.FieldTypeGeometry: + // currently proxy transform wkb to wkt,the query output wkt has different precision with client input(omit trailing zeros),and omit omissible bracket + columnAcompData := make([][]byte, 0) + // simulate proxy replace wkb progress + for _, bytes := range columnA.(*column.ColumnGeometryBytes).Data() { + geomT, _ := wkt.Unmarshal(string(bytes)) + wkbBytes, _ := wkb.Marshal(geomT, wkb.NDR) + geomT, _ = wkb.Unmarshal(wkbBytes) + realwktstr, _ := wkt.Marshal(geomT) + columnAcompData = append(columnAcompData, []byte(realwktstr)) + } + require.ElementsMatch(t, columnAcompData, columnB.(*column.ColumnGeometryBytes).Data()) case entity.FieldTypeFloatVector: require.ElementsMatch(t, columnA.(*column.ColumnFloatVector).Data(), columnB.(*column.ColumnFloatVector).Data()) case entity.FieldTypeBinaryVector: diff --git a/tests/go_client/go.mod b/tests/go_client/go.mod index 3bfbdf5a8a3a5..1c037feaa283f 100644 --- a/tests/go_client/go.mod +++ b/tests/go_client/go.mod @@ -9,6 +9,7 @@ require ( github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6 github.com/quasilyte/go-ruleguard/dsl v0.3.22 github.com/stretchr/testify v1.9.0 + github.com/twpayne/go-geom v1.5.7 github.com/x448/float16 v0.8.4 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.65.0 @@ -29,14 +30,14 @@ require ( github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/getsentry/sentry-go v0.12.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/godbus/dbus/v5 v5.0.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -52,10 +53,10 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/magiconair/properties v1.8.5 // indirect + github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454 // indirect + github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -64,15 +65,16 @@ require ( github.com/pelletier/go-toml v1.9.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/samber/lo v1.27.0 // indirect - github.com/shirou/gopsutil/v3 v3.22.9 // indirect - github.com/sirupsen/logrus v1.9.0 // indirect + github.com/shirou/gopsutil/v3 v3.24.2 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/soheilhy/cmux v0.1.5 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.6.0 // indirect @@ -84,12 +86,12 @@ require ( github.com/tidwall/gjson v1.17.1 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect - github.com/tklauser/go-sysconf v0.3.10 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tklauser/go-sysconf v0.3.13 // indirect + github.com/tklauser/numcpus v0.7.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/etcd/api/v3 v3.5.5 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect @@ -110,7 +112,7 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.10.0 // indirect golang.org/x/crypto v0.25.0 // indirect - golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect diff --git a/tests/go_client/go.sum b/tests/go_client/go.sum index ec403b16497b4..f652f7c38e958 100644 --- a/tests/go_client/go.sum +++ b/tests/go_client/go.sum @@ -44,10 +44,16 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= +github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -125,8 +131,8 @@ github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6ps github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= @@ -175,8 +181,9 @@ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ4 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= @@ -311,6 +318,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -365,12 +374,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a h1:3Bm7EwfUQUvhNeKIkUct/gl9eod1TcXuj8stxvi/GoI= +github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -388,8 +399,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454 h1:JmZCYjMPpiE4ksZw0AUxXWkDY7wwA4fhS+SO1N211Vw= -github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20240815123953-6dab6fcd6454/go.mod h1:/6UT4zZl6awVeXLeE7UGDWZvXj3IWkRsh3mqsn0DiAs= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7 h1:u02klF3sJg/AaPJ8rzzuG4io4sRjf87fd1sInf93/9A= +github.com/milvus-io/milvus-proto/go-api/v2 v2.3.4-0.20241030021526-9c3238c276f7/go.mod h1:/6UT4zZl6awVeXLeE7UGDWZvXj3IWkRsh3mqsn0DiAs= github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6 h1:dotu470D/DkctdLHsTCCmuvAD3h5C8gkFhMxb0Zlu7A= github.com/milvus-io/milvus/pkg v0.0.2-0.20240801085213-a642a26ed4c6/go.mod h1:tdeEcpeaAcrIJgrr6LVzu7SYl9zn18dNKZwPmCUb0Io= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -441,8 +452,9 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -492,15 +504,19 @@ github.com/samber/lo v1.27.0/go.mod h1:it33p9UtPMS7z72fP4gw/EIfQB2eI8ke7GR2wc6+R github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA= -github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= +github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y= +github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.1.0 h1:MkTeG1DMwsrdH7QtLXy5W+fUxWq+vmb6cLmyJ7aRtF0= github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= @@ -545,6 +561,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -557,13 +574,17 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= -github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= +github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= +github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/twpayne/go-geom v1.5.7 h1:7fdceDUr03/MP7rAKOaTV6x9njMiQdxB/D0PDzMTCDc= +github.com/twpayne/go-geom v1.5.7/go.mod h1:y4fTAQtLedXW8eG2Yo4tYrIGN1yIwwKkmA+K3iSHKBA= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -593,8 +614,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= -github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= @@ -688,8 +709,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -854,10 +875,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/tests/go_client/testcases/helper/data_helper.go b/tests/go_client/testcases/helper/data_helper.go index c6ed87ba383a6..c2f662d5b2973 100644 --- a/tests/go_client/testcases/helper/data_helper.go +++ b/tests/go_client/testcases/helper/data_helper.go @@ -249,6 +249,24 @@ func GenDefaultJSONData(nb int, option GenDataOption) [][]byte { return jsonValues } +func GenDefaultGeometryData(nb int, option GenDataOption) [][]byte { + const ( + point = "POINT (30.123 -10.456)" + linestring = "LINESTRING (30.123 -10.456, 10.789 30.123, -40.567 40.890)" + polygon = "POLYGON ((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456))" + multipoint = "MULTIPOINT ((10.111 40.222), (40.333 30.444), (20.555 20.666), (30.777 10.888))" + multilinestring = "MULTILINESTRING ((10.111 10.222, 20.333 20.444), (15.555 15.666, 25.777 25.888), (-30.999 20.000, 40.111 30.222))" + multipolygon = "MULTIPOLYGON (((30.123 -10.456, 40.678 40.890, 20.345 40.567, 10.123 20.456, 30.123 -10.456)),((15.123 5.456, 25.678 5.890, 25.345 15.567, 15.123 15.456, 15.123 5.456)))" + ) + wktArray := [6]string{point, linestring, polygon, multipoint, multilinestring, multipolygon} + geometryValues := make([][]byte, 0, nb) + start := option.start + for i := start; i < start+nb; i++ { + geometryValues = append(geometryValues, []byte(wktArray[i%6])) + } + return geometryValues +} + // GenColumnData GenColumnDataOption except dynamic column func GenColumnData(nb int, fieldType entity.FieldType, option GenDataOption) column.Column { dim := option.dim @@ -322,6 +340,10 @@ func GenColumnData(nb int, fieldType entity.FieldType, option GenDataOption) col jsonValues := GenDefaultJSONData(nb, option) return column.NewColumnJSONBytes(fieldName, jsonValues) + case entity.FieldTypeGeometry: + geometryValues := GenDefaultGeometryData(nb, option) + return column.NewColumnGeometryBytes(fieldName, geometryValues) + case entity.FieldTypeFloatVector: vecFloatValues := make([][]float32, 0, nb) for i := start; i < start+nb; i++ { diff --git a/tests/go_client/testcases/helper/field_helper.go b/tests/go_client/testcases/helper/field_helper.go index 07ecc01635065..2388c7b7f68fb 100644 --- a/tests/go_client/testcases/helper/field_helper.go +++ b/tests/go_client/testcases/helper/field_helper.go @@ -78,6 +78,8 @@ func GetFieldNameByFieldType(t entity.FieldType, opts ...GetFieldNameOpt) string return common.DefaultDynamicFieldName } return common.DefaultJSONFieldName + case entity.FieldTypeGeometry: + return common.DefaultGeometryName case entity.FieldTypeArray: return GetFieldNameByElementType(opt.elementType) case entity.FieldTypeBinaryVector: diff --git a/tests/go_client/testcases/helper/helper.go b/tests/go_client/testcases/helper/helper.go index 96e19fce75510..fb15374158b00 100644 --- a/tests/go_client/testcases/helper/helper.go +++ b/tests/go_client/testcases/helper/helper.go @@ -59,6 +59,7 @@ func GetAllScalarFieldType() []entity.FieldType { entity.FieldTypeVarChar, entity.FieldTypeArray, entity.FieldTypeJSON, + entity.FieldTypeGeometry, } } @@ -84,6 +85,7 @@ func GetInvalidPkFieldType() []entity.FieldType { entity.FieldTypeDouble, entity.FieldTypeString, entity.FieldTypeJSON, + entity.FieldTypeGeometry, entity.FieldTypeArray, } return nonPkFieldTypes @@ -98,6 +100,7 @@ func GetInvalidPartitionKeyFieldType() []entity.FieldType { entity.FieldTypeFloat, entity.FieldTypeDouble, entity.FieldTypeJSON, + entity.FieldTypeGeometry, entity.FieldTypeArray, entity.FieldTypeFloatVector, } diff --git a/tests/go_client/testcases/helper/index_helper.go b/tests/go_client/testcases/helper/index_helper.go index a2c034537fd2b..43778febc99f3 100644 --- a/tests/go_client/testcases/helper/index_helper.go +++ b/tests/go_client/testcases/helper/index_helper.go @@ -85,7 +85,7 @@ func SupportScalarIndexFieldType(field entity.FieldType) bool { vectorFieldTypes := []entity.FieldType{ entity.FieldTypeBinaryVector, entity.FieldTypeFloatVector, entity.FieldTypeFloat16Vector, entity.FieldTypeBFloat16Vector, - entity.FieldTypeSparseVector, entity.FieldTypeJSON, + entity.FieldTypeSparseVector, entity.FieldTypeJSON, entity.FieldTypeGeometry, // geometry now not support scalar index } for _, vectorFieldType := range vectorFieldTypes { if field == vectorFieldType { diff --git a/tests/go_client/testcases/index_test.go b/tests/go_client/testcases/index_test.go index 98748ef5e57ef..705d2a9532a31 100644 --- a/tests/go_client/testcases/index_test.go +++ b/tests/go_client/testcases/index_test.go @@ -248,7 +248,7 @@ func TestCreateAutoIndexAllFields(t *testing.T) { var expFields []string var idx index.Index for _, field := range schema.Fields { - if field.DataType == entity.FieldTypeJSON { + if field.DataType == entity.FieldTypeJSON || field.DataType == entity.FieldTypeGeometry { idx = index.NewAutoIndex(entity.IP) _, err := mc.CreateIndex(ctx, client.NewCreateIndexOption(schema.CollectionName, field.Name, idx)) common.CheckErr(t, err, false, fmt.Sprintf("create auto index on type:%s is not supported", field.DataType)) @@ -461,7 +461,7 @@ func TestCreateSortedScalarIndex(t *testing.T) { for _, field := range schema.Fields { if hp.SupportScalarIndexFieldType(field.DataType) { if field.DataType == entity.FieldTypeVarChar || field.DataType == entity.FieldTypeBool || - field.DataType == entity.FieldTypeJSON || field.DataType == entity.FieldTypeArray { + field.DataType == entity.FieldTypeJSON || field.DataType == entity.FieldTypeArray || field.DataType == entity.FieldTypeGeometry { _, err := mc.CreateIndex(ctx, client.NewCreateIndexOption(schema.CollectionName, field.Name, idx)) common.CheckErr(t, err, false, "STL_SORT are only supported on numeric field") } else { diff --git a/tests/integration/compaction/mix_compaction_test.go b/tests/integration/compaction/mix_compaction_test.go index 987d28b22f083..366a13357e6d8 100644 --- a/tests/integration/compaction/mix_compaction_test.go +++ b/tests/integration/compaction/mix_compaction_test.go @@ -52,11 +52,12 @@ func (s *CompactionSuite) TestMixCompaction() { indexType = integration.IndexFaissIvfFlat metricType = metric.L2 vecType = schemapb.DataType_FloatVector + testType = schemapb.DataType_Geometry ) collectionName := "TestCompaction_" + funcutil.GenRandomStr() - schema := integration.ConstructSchemaOfVecDataType(collectionName, dim, true, vecType) + schema := integration.ConstructSchemaOfVecDataType(collectionName, dim, true, vecType, testType) marshaledSchema, err := proto.Marshal(schema) s.NoError(err) @@ -92,11 +93,12 @@ func (s *CompactionSuite) TestMixCompaction() { for i := 0; i < rowNum/batch; i++ { // insert fVecColumn := integration.NewFloatVectorFieldData(integration.FloatVecField, batch, dim) + geoColumn := integration.NewGeometryFieldData(integration.GeometryField, batch) hashKeys := integration.GenerateHashKeys(batch) insertResult, err := c.Proxy.Insert(ctx, &milvuspb.InsertRequest{ DbName: dbName, CollectionName: collectionName, - FieldsData: []*schemapb.FieldData{fVecColumn}, + FieldsData: []*schemapb.FieldData{fVecColumn, geoColumn}, HashKeys: hashKeys, NumRows: uint32(batch), }) diff --git a/tests/integration/import/import_test.go b/tests/integration/import/import_test.go index 415489eeedea9..af2391486b304 100644 --- a/tests/integration/import/import_test.go +++ b/tests/integration/import/import_test.go @@ -55,6 +55,8 @@ type BulkInsertSuite struct { vecType schemapb.DataType indexType indexparamcheck.IndexType metricType metric.MetricType + expr string + testType schemapb.DataType } func (s *BulkInsertSuite) SetupTest() { @@ -68,6 +70,8 @@ func (s *BulkInsertSuite) SetupTest() { s.vecType = schemapb.DataType_FloatVector s.indexType = "HNSW" s.metricType = metric.L2 + s.expr = "" + s.testType = schemapb.DataType_None } func (s *BulkInsertSuite) run() { @@ -87,9 +91,19 @@ func (s *BulkInsertSuite) run() { fieldSchema3 := &schemapb.FieldSchema{FieldID: 102, Name: "embeddings", DataType: s.vecType, TypeParams: []*commonpb.KeyValuePair{{Key: common.DimKey, Value: "128"}}} fieldSchema4 := &schemapb.FieldSchema{FieldID: 103, Name: "embeddings", DataType: s.vecType, TypeParams: []*commonpb.KeyValuePair{}} if s.vecType != schemapb.DataType_SparseFloatVector { - schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema3) + if s.testType == schemapb.DataType_None { + schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema3) + } else { + fieldSchema5 := &schemapb.FieldSchema{FieldID: 104, Name: "testField" + schemapb.DataType_name[int32(s.testType)], DataType: s.testType, TypeParams: []*commonpb.KeyValuePair{}} + schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema3, fieldSchema5) + } } else { - schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema4) + if s.testType == schemapb.DataType_None { + schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema4) + } else { + fieldSchema5 := &schemapb.FieldSchema{FieldID: 104, Name: "testField" + schemapb.DataType_name[int32(s.testType)], DataType: s.testType, TypeParams: []*commonpb.KeyValuePair{}} + schema = integration.ConstructSchema(collectionName, dim, s.autoID, fieldSchema1, fieldSchema2, fieldSchema4, fieldSchema5) + } } marshaledSchema, err := proto.Marshal(schema) @@ -203,7 +217,7 @@ func (s *BulkInsertSuite) run() { s.WaitForLoad(ctx, collectionName) // search - expr := "" + expr := s.expr nq := 10 topk := 10 roundDecimal := -1 @@ -218,6 +232,12 @@ func (s *BulkInsertSuite) run() { // s.Equal(nq*topk, len(searchResult.GetResults().GetScores())) } +func (s *BulkInsertSuite) TestGeometryTypes() { + s.testType = schemapb.DataType_Geometry + s.expr = "st_equals(" + "testField" + schemapb.DataType_name[int32(s.testType)] + ",'POINT (-84.036 39.997)')" + s.run() +} + func (s *BulkInsertSuite) TestMultiFileTypes() { fileTypeArr := []importutilv2.FileType{importutilv2.JSON, importutilv2.Numpy, importutilv2.Parquet, importutilv2.CSV} diff --git a/tests/integration/util_insert.go b/tests/integration/util_insert.go index cf227ea9898f9..8cbfaead68b95 100644 --- a/tests/integration/util_insert.go +++ b/tests/integration/util_insert.go @@ -135,6 +135,11 @@ func NewStringFieldData(fieldName string, numRows int) *schemapb.FieldData { return testutils.NewStringFieldData(fieldName, numRows) } +// note: unlike testutils's NewGeometryFieldData ,integration's NewGeometryFieldData generate wkt string bytes +func NewGeometryFieldData(fieldName string, numRows int) *schemapb.FieldData { + return testutils.NewGeometryFieldDataWktFormat(fieldName, numRows) +} + func NewFloatVectorFieldData(fieldName string, numRows, dim int) *schemapb.FieldData { return testutils.NewFloatVectorFieldData(fieldName, numRows, dim) } diff --git a/tests/integration/util_schema.go b/tests/integration/util_schema.go index 9caf046ce7200..264e2e94fc43f 100644 --- a/tests/integration/util_schema.go +++ b/tests/integration/util_schema.go @@ -34,6 +34,7 @@ const ( DoubleField = "doubleField" VarCharField = "varCharField" JSONField = "jsonField" + GeometryField = "geometryField" FloatVecField = "floatVecField" BinVecField = "binVecField" Float16VecField = "float16VecField" @@ -83,7 +84,7 @@ func ConstructSchema(collection string, dim int, autoID bool, fields ...*schemap } } -func ConstructSchemaOfVecDataType(collection string, dim int, autoID bool, dataType schemapb.DataType) *schemapb.CollectionSchema { +func ConstructSchemaOfVecDataType(collection string, dim int, autoID bool, dataType ...schemapb.DataType) *schemapb.CollectionSchema { pk := &schemapb.FieldSchema{ FieldID: 100, Name: Int64Field, @@ -96,33 +97,41 @@ func ConstructSchemaOfVecDataType(collection string, dim int, autoID bool, dataT } var name string var typeParams []*commonpb.KeyValuePair - switch dataType { - case schemapb.DataType_FloatVector: - name = FloatVecField - typeParams = []*commonpb.KeyValuePair{ - { - Key: common.DimKey, - Value: fmt.Sprintf("%d", dim), - }, + var fieldSchemaArray []*schemapb.FieldSchema + fieldSchemaArray = append(fieldSchemaArray, pk) + for i := 0; i < len(dataType); i++ { + switch dataType[i] { + case schemapb.DataType_FloatVector: + name = FloatVecField + typeParams = []*commonpb.KeyValuePair{ + { + Key: common.DimKey, + Value: fmt.Sprintf("%d", dim), + }, + } + case schemapb.DataType_SparseFloatVector: + name = SparseFloatVecField + typeParams = nil + case schemapb.DataType_Geometry: + name = GeometryField + typeParams = nil + default: + panic("unsupported data type") } - case schemapb.DataType_SparseFloatVector: - name = SparseFloatVecField - typeParams = nil - default: - panic("unsupported data type") - } - fVec := &schemapb.FieldSchema{ - FieldID: 101, - Name: name, - IsPrimaryKey: false, - Description: "", - DataType: dataType, - TypeParams: typeParams, - IndexParams: nil, + sche := &schemapb.FieldSchema{ + FieldID: 101 + int64(i), + Name: name, + IsPrimaryKey: false, + Description: "", + DataType: dataType[i], + TypeParams: typeParams, + IndexParams: nil, + } + fieldSchemaArray = append(fieldSchemaArray, sche) } return &schemapb.CollectionSchema{ Name: collection, AutoID: autoID, - Fields: []*schemapb.FieldSchema{pk, fVec}, + Fields: fieldSchemaArray, } } diff --git a/tests/python_client/testcases/test_index.py b/tests/python_client/testcases/test_index.py index 9ebeb41f9c252..175483a2e6ac5 100644 --- a/tests/python_client/testcases/test_index.py +++ b/tests/python_client/testcases/test_index.py @@ -1256,7 +1256,7 @@ def test_create_index_json(self): # create index on JSON/Array field is not supported collection_w.create_index(ct.default_json_field_name, check_task=CheckTasks.err_res, - check_items={ct.err_code: 1100, + check_items={ct.err_code: 65535, ct.err_msg: "create index on JSON field is not supported"}) @pytest.mark.tags(CaseLabel.L1)