diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 91ef26d2e..28470c3e4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,6 @@ name: Go +permissions: + contents: read # # git hub actions config file. https://docs.github.com/en/actions @@ -13,38 +15,58 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.x - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: ^1.18 + go-version: ^1.23.6 - name: Check out code into the Go module directory - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Build run: go build -v ./ - name: Store grip - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: gripBin path: grip + unitTests: needs: build name: Unit tests runs-on: ubuntu-latest steps: - name: Set up Go 1.x - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: - go-version: ^1.18 + go-version: ^1.23.6 - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: run unit tests run: | - go test ./test/... -config badger.yml - - + go test ./test/... -config pebble.yml + + kafkaTest: + needs: build + name: Kafka tests + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + - name: Python Dependencies for Conformance + run: pip install requests numpy kafka-python + - name: Download grip + uses: actions/download-artifact@v4 + with: + name: gripBin + - name: Kafka Test + run: | + chmod +x grip + make start-kafka + ./grip server -c ./test/kafka.yml & + sleep 5 + python conformance/run_kafka.py badgerTest: needs: build @@ -52,11 +74,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - name: Badger Test @@ -65,7 +87,6 @@ jobs: ./grip server --rpc-port 18202 --http-port 18201 --config ./test/badger.yml & sleep 5 make test-conformance - pebbleTest: needs: build @@ -73,11 +94,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - name: Pebble Test @@ -86,7 +107,6 @@ jobs: ./grip server --rpc-port 18202 --http-port 18201 --config ./test/pebble.yml & sleep 5 make test-conformance - mongoTest: needs: build @@ -94,11 +114,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - name: Mongo Conformance @@ -107,8 +127,7 @@ jobs: make start-mongo ./grip server --rpc-port 18202 --http-port 18201 --config ./test/mongo.yml & sleep 5 - make test-conformance - + python conformance/run_conformance.py http://localhost:18201 --exclude nested_index mongoCoreTest: needs: build @@ -116,67 +135,62 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - - name: Mongo Conformance + - name: Mongo Core Conformance run: | chmod +x grip make start-mongo ./grip server --rpc-port 18202 --http-port 18201 --config ./test/mongo-core-processor.yml & sleep 5 make test-conformance - - elasticTest: + postgresTest: needs: build - name: Elastic Test + name: Postgres Test runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - - name: Elastic Conformance + - name: Postgres Conformance run: | chmod +x grip - make start-elastic + make start-postgres sleep 15 - ./grip server --rpc-port 18202 --http-port 18201 --config ./test/elastic.yml & + ./grip server --rpc-port 18202 --http-port 18201 --config ./test/psql.yml & sleep 5 - make test-conformance - + python conformance/run_conformance.py http://localhost:18201 --exclude aggregations - portgresTest: + sqliteTest: needs: build - name: Portgres Test + name: Sqlite Test runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - - name: Postgres Conformance + - name: Sqlite Conformance run: | chmod +x grip - make start-postgres - sleep 15 - ./grip server --rpc-port 18202 --http-port 18201 --config ./test/psql.yml & + ./grip server --rpc-port 18202 --http-port 18201 --config ./test/sqlite.yml & sleep 5 - python conformance/run_conformance.py http://localhost:18201 --exclude index aggregations - + python conformance/run_conformance.py http://localhost:18201 --exclude aggregations gripperTest: needs: build @@ -184,13 +198,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Update pip run: pip install --upgrade pip - name: Python Dependencies for Conformance run: pip install -U requests numpy grpcio-tools protobuf - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - name: Gripper Conformance @@ -201,8 +215,7 @@ jobs: sleep 5 ./grip server --rpc-port 18202 --http-port 18201 --config ./gripper/test-graph/config.yaml --er tableServer=localhost:50051 & sleep 5 - python conformance/run_conformance.py http://localhost:18201 --readOnly swapi - + python conformance/run_conformance.py http://localhost:18201 --readOnly swapi --exclude index pivot authTest: needs: build @@ -210,52 +223,63 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Python Dependencies for Conformance run: pip install requests numpy PyYAML - name: Download grip - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: gripBin - name: Auth Test run: | # start grip server chmod +x grip - ./grip server --rpc-port 18202 --http-port 18201 --config ./test/badger-auth.yml & + ./grip server --rpc-port 18202 --http-port 18201 --config ./test/pebble-auth.yml & sleep 5 # simple auth - # run tests without credentials, should fail + # run tests without credentials, should fail if make test-conformance then echo "ERROR: Conformance tests ran without credentials." ; exit 1 else - echo "Got expected auth error" - fi + echo "Got expected auth error" + fi # run specialized role based tests - make test-authorization ARGS="--grip_config_file_path test/badger-auth.yml" - - - + make test-authorization ARGS="--grip_config_file_path test/pebble-auth.yml" - #gridsTest: - # needs: build - # name: GRIDs Conformance - # runs-on: ubuntu-latest - # steps: - # - name: Check out code - # uses: actions/checkout@v2 - # - name: Python Dependencies for Conformance - # run: pip install requests numpy - # - name: Download grip - # uses: actions/download-artifact@v2 - # with: - # name: gripBin - # - name: GRIDs unit tests - # run: | - # chmod +x grip - # go test ./test -config grids.yml - # - name: GRIDs Test - # run: | - # ./grip server --rpc-port 18202 --http-port 18201 --config ./test/grids.yml & - # sleep 5 - # make test-conformance + gridsTest: + needs: build + name: GRIDs Conformance + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + - name: Python Dependencies for Conformance + run: pip install requests numpy + - name: Download grip + uses: actions/download-artifact@v4 + with: + name: gripBin + - name: GRIDs Test + run: | + chmod +x grip + ./grip server --rpc-port 18202 --http-port 18201 --config ./test/grids.yml & + sleep 5 + make test-conformance + + + gridsUnitTest: + needs: build + name: GRIDs Unit Test + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + - name: Download grip + uses: actions/download-artifact@v4 + with: + name: gripBin + - name: GRIDs unit tests + run: | + chmod +x grip + go test ./test -config grids.yml diff --git a/.gitignore b/.gitignore index a7c43db8e..75eb8e5cf 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ gripql/R/*.tar.gz # dev tools .idea/ .vscode/ +.DS_Store \ No newline at end of file diff --git a/Makefile b/Makefile index 8c3ff1b3a..4fbae6417 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ VERSION_LDFLAGS=\ -X "github.com/bmeg/grip/version.GitBranch=$(git_branch)" \ -X "github.com/bmeg/grip/version.GitUpstream=$(git_upstream)" -export GRIP_VERSION = 0.7.0 +export GRIP_VERSION = 0.8.0 # LAST_PR_NUMBER is used by the release notes builder to generate notes # based on pull requests (PR) up until the last release. export LAST_PR_NUMBER = 229 @@ -41,12 +41,10 @@ proto: --go_opt paths=source_relative \ --go-grpc_out ./ \ --go-grpc_opt paths=source_relative \ - --grpc-gateway_out ./ \ + --grpc-gateway_out allow_delete_body=true:./ \ --grpc-gateway_opt logtostderr=true \ --grpc-gateway_opt paths=source_relative \ --grpc-rest-direct_out . \ - --grpc-gateway-client_out . \ - --grpc-gateway-client_opt paths=source_relative \ gripql.proto @cd kvindex && protoc \ -I ./ \ @@ -66,11 +64,11 @@ proto: proto-depends: @git submodule update --init --recursive - @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.11.1 - @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.11.1 - @go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1 + @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@latest + @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest + @go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2 @go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest - @go install github.com/ckaznocha/protoc-gen-lint@v0.2.4 + @go install github.com/ckaznocha/protoc-gen-lint@latest @go install github.com/bmeg/protoc-gen-grpc-rest-direct@latest @go install github.com/ckaznocha/protoc-gen-lint@latest @@ -91,7 +89,7 @@ lint: flake8 gripql/python/ conformance/ lint-depends: - go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.35.2 + go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 go install golang.org/x/tools/cmd/goimports # --------------------- @@ -129,11 +127,7 @@ test-authorization: # --------------------- start-mongo: @docker rm -f grip-mongodb-test > /dev/null 2>&1 || echo - docker run -d --name grip-mongodb-test -p 27017:27017 docker.io/mongo:3.6.4 > /dev/null - -start-elastic: - @docker rm -f grip-es-test > /dev/null 2>&1 || echo - docker run -d --name grip-es-test -p 19200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:5.6.3 > /dev/null + docker run -d --name grip-mongodb-test -p 27017:27017 mongo:7.0.13-rc0-jammy > /dev/null start-postgres: @docker rm -f grip-postgres-test > /dev/null 2>&1 || echo @@ -146,6 +140,52 @@ start-mysql: start-gripper-test: @cd ./gripper/test-graph && ./gripper-table -m swapi/table.map & +start-kafka: + @docker rm -f kafka > /dev/null 2>&1 || echo + docker run -d --name kafka \ + -p 9092:9092 \ + -e KAFKA_ENABLE_KRAFT=yes \ + -e KAFKA_KRAFT_CLUSTER_ID=abcdefghijklmnopqrstuv== \ + -e KAFKA_CFG_NODE_ID=1 \ + -e KAFKA_CFG_PROCESS_ROLES=controller,broker \ + -e KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=1@localhost:9093 \ + -e KAFKA_CFG_LISTENERS=CONTROLLER://:9093,INTERNAL://:9092 \ + -e KAFKA_CFG_ADVERTISED_LISTENERS=INTERNAL://localhost:9092 \ + -e KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:SASL_PLAINTEXT,CONTROLLER:PLAINTEXT \ + -e KAFKA_CFG_INTER_BROKER_LISTENER_NAME=INTERNAL \ + -e KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER \ + -e KAFKA_CFG_SUPER_USERS=User:admin \ + -e KAFKA_CLIENT_USERS=admin \ + -e KAFKA_CLIENT_PASSWORDS=adminpassword \ + -e KAFKA_CFG_SASL_ENABLED_MECHANISMS=PLAIN \ + -e KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL=PLAIN \ + bitnami/kafka:latest + printf '%s\n' \ + 'security.protocol=SASL_PLAINTEXT' \ + 'sasl.mechanism=PLAIN' \ + 'sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="adminpassword";' \ + > sasl-config.properties + docker cp sasl-config.properties kafka:/tmp/sasl-config.properties + @echo "Waiting for Kafka to become ready..." + @until docker exec kafka kafka-topics.sh \ + --list \ + --bootstrap-server localhost:9092 \ + --command-config /tmp/sasl-config.properties > /dev/null 2>&1; do \ + echo "Still waiting..."; \ + sleep 2; \ + done + docker exec kafka kafka-topics.sh \ + --create \ + --topic gripHistory \ + --bootstrap-server localhost:9092 \ + --partitions 1 \ + --replication-factor 1 \ + --command-config /tmp/sasl-config.properties + docker exec kafka kafka-topics.sh \ + --list \ + --bootstrap-server localhost:9092 \ + --command-config /tmp/sasl-config.properties + # --------------------- # Website # --------------------- @@ -160,3 +200,4 @@ website-dev: # Other # --------------------- .PHONY: test rocksdb website + diff --git a/README.md b/README.md index 3bc844768..faa2232e3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ https://bmeg.github.io/grip/ -GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB. +GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB. Properties of an GRIP graph: diff --git a/accounts/basic.go b/accounts/basic.go index ffbf6b119..780ae28a2 100644 --- a/accounts/basic.go +++ b/accounts/basic.go @@ -4,6 +4,8 @@ import ( "encoding/base64" "fmt" "strings" + + "github.com/bmeg/grip/log" ) // BasicCredential describes a username and password for use with Funnel's basic auth. @@ -18,7 +20,7 @@ func (ba BasicAuth) Validate(md MetaData) (string, error) { var auth []string var ok bool - fmt.Printf("Running BasicAuth: %#v\n", md) + log.Infof("Running BasicAuth: %#v\n", md) if auth, ok = md["Authorization"]; !ok { if auth, ok = md["authorization"]; !ok { @@ -28,7 +30,7 @@ func (ba BasicAuth) Validate(md MetaData) (string, error) { if len(auth) > 0 { user, password, ok := parseBasicAuth(auth[0]) - fmt.Printf("User: %s Password: %s OK: %s\n", user, password, ok) + log.Infof("Authenticating as User: %s OK: %t\n", user, ok) for _, c := range ba { if c.User == user && c.Password == password { return user, nil diff --git a/accounts/bulk_write_filter.go b/accounts/bulk_write_filter.go index dafa875cb..01e79bac2 100644 --- a/accounts/bulk_write_filter.go +++ b/accounts/bulk_write_filter.go @@ -31,11 +31,11 @@ func (bw *BulkWriteFilter) Context() context.Context { return bw.SS.Context() } -func (bw *BulkWriteFilter) SendMsg(m interface{}) error { +func (bw *BulkWriteFilter) SendMsg(m any) error { return bw.SS.SendMsg(m) } -func (bw *BulkWriteFilter) RecvMsg(m interface{}) error { +func (bw *BulkWriteFilter) RecvMsg(m any) error { for { var ge gripql.GraphElement err := bw.SS.RecvMsg(&ge) @@ -52,3 +52,47 @@ func (bw *BulkWriteFilter) RecvMsg(m interface{}) error { } } } + +type BulkWriteRawFilter struct { + SS grpc.ServerStream + User string + Access Access +} + +func (bw *BulkWriteRawFilter) SetHeader(m metadata.MD) error { + return bw.SS.SendHeader(m) +} + +func (bw *BulkWriteRawFilter) SendHeader(m metadata.MD) error { + return bw.SS.SendHeader(m) +} + +func (bw *BulkWriteRawFilter) SetTrailer(m metadata.MD) { + bw.SS.SetTrailer(m) +} + +func (bw *BulkWriteRawFilter) Context() context.Context { + return bw.SS.Context() +} + +func (bw *BulkWriteRawFilter) SendMsg(m any) error { + return bw.SS.SendMsg(m) +} + +func (bw *BulkWriteRawFilter) RecvMsg(m any) error { + for { + var ge gripql.RawJson + err := bw.SS.RecvMsg(&ge) + if err != nil { + return err + } + err = bw.Access.Enforce(bw.User, ge.Graph, Write) + if err == nil { + mPtr := m.(*gripql.RawJson) + *mPtr = ge + return nil + } else { + log.Infof("Graph write error: %s", ge.Graph) + } + } +} diff --git a/accounts/interface.go b/accounts/interface.go index d64d938b7..e75fbc3f2 100644 --- a/accounts/interface.go +++ b/accounts/interface.go @@ -33,17 +33,21 @@ var MethodMap = map[string]Operation{ "/gripql.Job/ViewJob": Read, "/gripql.Job/ResumeJob": Exec, - "/gripql.Edit/AddVertex": Write, - "/gripql.Edit/AddEdge": Write, - "/gripql.Edit/BulkAdd": Write, - "/gripql.Edit/AddGraph": Write, - "/gripql.Edit/DeleteGraph": Write, - "/gripql.Edit/DeleteVertex": Write, - "/gripql.Edit/DeleteEdge": Write, - "/gripql.Edit/AddIndex": Write, - "/gripql.Edit/AddSchema": Write, - "/gripql.Edit/AddMapping": Write, - "/gripql.Edit/SampleSchema": Write, //Maybe exec? + "/gripql.Edit/AddVertex": Write, + "/gripql.Edit/AddEdge": Write, + "/gripql.Edit/BulkAdd": Write, + "/gripql.Edit/BulkAddRaw": Write, + "/gripql.Edit/BulkDelete": Write, + "/gripql.Edit/AddGraph": Write, + "/gripql.Edit/DeleteGraph": Write, + "/gripql.Edit/DeleteVertex": Write, + "/gripql.Edit/DeleteEdge": Write, + "/gripql.Edit/AddIndex": Write, + "/gripql.Edit/DeleteIndex": Write, + "/gripql.Edit/AddSchema": Write, + "/gripql.Edit/AddJsonSchema": Write, + "/gripql.Edit/AddMapping": Write, + "/gripql.Edit/SampleSchema": Write, //Maybe exec? "/gripql.Configure/StartPlugin": Admin, "/gripql.Configure/ListPlugin": Admin, diff --git a/accounts/stream_out_wrapper.go b/accounts/stream_out_wrapper.go index 617624636..bba77f7c2 100644 --- a/accounts/stream_out_wrapper.go +++ b/accounts/stream_out_wrapper.go @@ -37,11 +37,11 @@ func (bw *StreamOutWrapper[X]) Context() context.Context { return bw.SS.Context() } -func (bw *StreamOutWrapper[X]) SendMsg(m interface{}) error { +func (bw *StreamOutWrapper[X]) SendMsg(m any) error { return bw.SS.SendMsg(m) } -func (bw *StreamOutWrapper[X]) RecvMsg(m interface{}) error { +func (bw *StreamOutWrapper[X]) RecvMsg(m any) error { mPtr := m.(*X) *mPtr = bw.Request return nil diff --git a/accounts/util.go b/accounts/util.go index 25d81cf26..a201376d6 100644 --- a/accounts/util.go +++ b/accounts/util.go @@ -53,7 +53,7 @@ func (c *Config) StreamInterceptor() grpc.StreamServerInterceptor { // Return a new interceptor function that authorizes RPCs // using a password stored in the config. func unaryAuthInterceptor(auth Authenticate, access Access) grpc.UnaryServerInterceptor { - return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) { + return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { //fmt.Printf("AuthInt: %#v\n", ctx) md, _ := metadata.FromIncomingContext(ctx) //fmt.Printf("Metadata: %#v\n", md) @@ -88,7 +88,7 @@ func unaryAuthInterceptor(auth Authenticate, access Access) grpc.UnaryServerInte // Return a new interceptor function that authorizes RPCs // using a password stored in the config. func streamAuthInterceptor(auth Authenticate, access Access) grpc.StreamServerInterceptor { - return func(srv interface{}, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { + return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { //fmt.Printf("Streaming query: %#v\n", info) md, _ := metadata.FromIncomingContext(ss.Context()) @@ -141,6 +141,10 @@ func streamAuthInterceptor(auth Authenticate, access Access) grpc.StreamServerIn //stream URL formatting, each write request can //reference a different graph return handler(srv, &BulkWriteFilter{ss, user, access}) + } else if info.FullMethod == "/gripql.Edit/BulkDelete" { + return handler(srv, &BulkWriteFilter{ss, user, access}) + } else if info.FullMethod == "/gripql.Edit/BulkAddRaw" { + return handler(srv, &BulkWriteRawFilter{ss, user, access}) } else { log.Errorf("Unknown input streaming op %#v!!!", info) return handler(srv, ss) @@ -151,7 +155,7 @@ func streamAuthInterceptor(auth Authenticate, access Access) grpc.StreamServerIn } } -func getUnaryRequestGraph(req interface{}, info *grpc.UnaryServerInfo) (string, error) { +func getUnaryRequestGraph(req any, info *grpc.UnaryServerInfo) (string, error) { switch info.FullMethod { case "/gripql.Query/Traversal", "/gripql.Job/Submit", "/gripql.Job/SearchJobs": @@ -187,9 +191,15 @@ func getUnaryRequestGraph(req interface{}, info *grpc.UnaryServerInfo) (string, case "/gripql.Edit/AddSchema", "/gripql.Edit/AddMapping": o := req.(*gripql.Graph) return o.Graph, nil + case "/gripql.Edit/AddJsonSchema": + o := req.(*gripql.RawJson) + return o.Graph, nil case "/gripql.Edit/SampleSchema": o := req.(*gripql.GraphID) return o.Graph, nil + case "/gripql.Edit/BulkDelete": + o := req.(*gripql.DeleteData) + return o.Graph, nil case "/gripql.Configure/StartPlugin", "/gripql.Configure/ListPlugins", "/gripql.Configure/ListDrivers": return "*", nil //these operations effect all graphs } diff --git a/benchmark/engine_test.go b/benchmark/engine_test.go index 5882b87ec..dbc1197c6 100644 --- a/benchmark/engine_test.go +++ b/benchmark/engine_test.go @@ -22,8 +22,8 @@ func BenchmarkBaselineV(b *testing.B) { } for i := 0; i < 1000; i++ { - gid := fmt.Sprintf("v-%d", i) - db.AddVertex([]*gdbi.Vertex{{ID: gid, Label: "Vert"}}) + id := fmt.Sprintf("v-%d", i) + db.AddVertex([]*gdbi.Vertex{{ID: id, Label: "Vert"}}) } q := gripql.V() diff --git a/benchmark/kv-query-profile/main.go b/benchmark/kv-query-profile/main.go index 234b3577f..c982e8619 100644 --- a/benchmark/kv-query-profile/main.go +++ b/benchmark/kv-query-profile/main.go @@ -8,7 +8,6 @@ import ( "log" "os" "runtime/pprof" - "strings" "time" "github.com/bmeg/grip/engine/pipeline" @@ -17,7 +16,7 @@ import ( "github.com/bmeg/grip/kvgraph" "github.com/bmeg/grip/kvi" "github.com/dop251/goja" - "github.com/golang/protobuf/jsonpb" + "google.golang.org/protobuf/encoding/protojson" gripqljs "github.com/bmeg/grip/gripql/javascript" @@ -76,7 +75,7 @@ func main() { } query := gripql.GraphQuery{} - err = jsonpb.Unmarshal(strings.NewReader(string(queryJSON)), &query) + err = protojson.Unmarshal(queryJSON, &query) if err != nil { log.Printf("%s", err) return diff --git a/cmd/delete/main.go b/cmd/delete/main.go new file mode 100644 index 000000000..2f8810ffe --- /dev/null +++ b/cmd/delete/main.go @@ -0,0 +1,89 @@ +package delete + +import ( + "encoding/json" + "fmt" + "io" + "os" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/util/rpc" + "github.com/spf13/cobra" +) + +var host = "localhost:8202" +var file string +var edges []string +var vertices []string +var graph string +var data Data + +type Data struct { + Graph string `json:"graph"` + Edges []string `json:"edges"` + Vertices []string `json:"vertices"` +} + +// Cmd command line declaration +var Cmd = &cobra.Command{ + Use: "delete ", + Short: "Delete data from a graph", + Long: `JSON File Format: { + "graph": 'graph_name', + "edges":['list of edge ids'], + "vertices":['list of vertice ids'] +} + +comma delimited --edges or --vertices arguments are also supported ex: +--edges="edge1,edge2"`, + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + if file == "" && edges == nil && vertices == nil { + return fmt.Errorf("no input file path or --edges or --vertices arg was provided") + } + + conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) + if err != nil { + return err + } + graph = args[0] + + if file != "" { + jsonFile, err := os.Open(file) + if err != nil { + log.Errorf("Failed to open file: %s", err) + } + defer jsonFile.Close() + + // Read the JSON file + byteValue, err := io.ReadAll(jsonFile) + if err != nil { + log.Errorf("Failed to read file: %s", err) + } + + // Unmarshal the JSON into the Data struct + err = json.Unmarshal(byteValue, &data) + if err != nil { + log.Errorf("Failed to unmarshal JSON: %s", err) + } + } else if edges != nil || vertices != nil { + data.Edges = edges + data.Vertices = vertices + } + + log.WithFields(log.Fields{"graph": graph}).Info("deleting data") + log.Info("VALUE OF DATA: ", data.Edges, data.Vertices) + conn.BulkDelete(&gripql.DeleteData{Graph: graph, Vertices: data.Vertices, Edges: data.Edges}) + + return nil + }, +} + +func init() { + flags := Cmd.Flags() + flags.StringVar(&host, "host", host, "grip server url") + flags.StringSliceVar(&edges, "edges", edges, "grip edges list") + flags.StringSliceVar(&vertices, "vertices", vertices, "grip vertices list") + flags.StringVar(&file, "file", file, "file name") +} diff --git a/cmd/dump/main.go b/cmd/dump/main.go index dbaa6cf26..39724ad1a 100644 --- a/cmd/dump/main.go +++ b/cmd/dump/main.go @@ -1,12 +1,12 @@ package dump import ( + "context" "fmt" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/util/rpc" "github.com/spf13/cobra" - "google.golang.org/protobuf/encoding/protojson" ) var host = "localhost:8202" @@ -27,14 +27,16 @@ var Cmd = &cobra.Command{ return err } + fm := gripql.NewFlattenMarshaler() + if vertexDump { q := gripql.V() - elems, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) + elems, err := conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: q.Statements}) if err != nil { return err } for v := range elems { - txt, err := protojson.Marshal(v.GetVertex()) + txt, err := fm.Marshal(v.GetVertex()) if err != nil { return err } @@ -43,13 +45,13 @@ var Cmd = &cobra.Command{ } if edgeDump { - q := gripql.E() - elems, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) + q := gripql.V().OutE() + elems, err := conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: q.Statements}) if err != nil { return err } for v := range elems { - txt, err := protojson.Marshal(v.GetEdge()) + txt, err := fm.Marshal(v.GetEdge()) if err != nil { return err } diff --git a/cmd/info/main.go b/cmd/info/main.go index 6dccf0827..b2cf0bd4b 100644 --- a/cmd/info/main.go +++ b/cmd/info/main.go @@ -1,6 +1,7 @@ package info import ( + "context" "fmt" "github.com/bmeg/grip/gripql" @@ -27,7 +28,7 @@ var Cmd = &cobra.Command{ fmt.Printf("Graph: %s\n", graph) q := gripql.V().Count() - res, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) + res, err := conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: q.Statements}) if err != nil { return err } @@ -35,8 +36,8 @@ var Cmd = &cobra.Command{ fmt.Printf("Vertex Count: %v\n", row.GetCount()) } - q = gripql.E().Count() - res, err = conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) + q = gripql.V().OutE().Count() + res, err = conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: q.Statements}) if err != nil { return err } diff --git a/cmd/job/main.go b/cmd/job/main.go index e70a28358..b3783e05f 100644 --- a/cmd/job/main.go +++ b/cmd/job/main.go @@ -1,17 +1,14 @@ package job - import ( "fmt" - "encoding/json" + "github.com/bmeg/grip/gripql" + gripqljs "github.com/bmeg/grip/gripql/javascript" + _ "github.com/bmeg/grip/jsengine/goja" // import goja so it registers with the driver map "github.com/bmeg/grip/util/rpc" "github.com/spf13/cobra" - _ "github.com/bmeg/grip/jsengine/goja" // import goja so it registers with the driver map "google.golang.org/protobuf/encoding/protojson" - "github.com/dop251/goja" - gripqljs "github.com/bmeg/grip/gripql/javascript" - "github.com/bmeg/grip/jsengine/underscore" ) var host = "localhost:8202" @@ -28,7 +25,7 @@ var listJobsCmd = &cobra.Command{ Long: ``, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - graph := args[0] + graph := args[0] conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { @@ -48,13 +45,13 @@ var listJobsCmd = &cobra.Command{ } var dropCmd = &cobra.Command{ - Use: "drop", - Short: "List graphs", + Use: "drop ", + Short: "Drop job", Long: ``, Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { - graph := args[0] - jobID := args[1] + graph := args[0] + jobID := args[1] conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { @@ -65,19 +62,19 @@ var dropCmd = &cobra.Command{ if err != nil { return err } - fmt.Printf("%s\n", resp) + fmt.Printf("%s\n", resp) return nil }, } var getCmd = &cobra.Command{ - Use: "get job", + Use: "get ", Short: "Get job info", Long: ``, Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { - graph := args[0] - jobID := args[1] + graph := args[0] + jobID := args[1] conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { @@ -103,60 +100,94 @@ var getCmd = &cobra.Command{ }, } - var submitCmd = &cobra.Command{ Use: "submit ", Short: "Submit query job", Long: ``, Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { - graph := args[0] + graph := args[0] queryString := args[1] - vm := goja.New() - us, err := underscore.Asset("underscore.js") + query, err := gripqljs.ParseQuery(queryString) if err != nil { - return fmt.Errorf("failed to load underscore.js") - } - if _, err := vm.RunString(string(us)); err != nil { return err } - gripqlString, err := gripqljs.Asset("gripql.js") + query.Graph = graph + + conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { - return fmt.Errorf("failed to load gripql.js") + return err } - if _, err := vm.RunString(string(gripqlString)); err != nil { + + res, err := conn.Submit(query) + if err != nil { return err } - val, err := vm.RunString(queryString) + fmt.Printf("%s\n", res) + return nil + }, +} + +var resumeCmd = &cobra.Command{ + Use: "resume ", + Short: "Resume query job", + Long: ``, + Args: cobra.ExactArgs(3), + RunE: func(cmd *cobra.Command, args []string) error { + graph := args[0] + jobID := args[1] + queryString := args[2] + + query, err := gripqljs.ParseQuery(queryString) if err != nil { return err } + query.Graph = graph - queryJSON, err := json.Marshal(val) + conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { return err } - query := gripql.GraphQuery{} - err = protojson.Unmarshal(queryJSON, &query) + res, err := conn.ResumeJob(graph, jobID, query) if err != nil { return err } - query.Graph = graph + + for row := range res { + rowString, _ := protojson.Marshal(row) + fmt.Printf("%s\n", rowString) + } + return nil + + }, +} + +var viewCmd = &cobra.Command{ + Use: "view ", + Short: "Resume query job", + Long: ``, + Args: cobra.ExactArgs(2), + RunE: func(cmd *cobra.Command, args []string) error { + graph := args[0] + jobID := args[1] conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { return err } - res, err := conn.Submit(&query) + res, err := conn.ViewJob(graph, jobID) if err != nil { return err } - fmt.Printf("%s\n", res) + for row := range res { + rowString, _ := protojson.Marshal(row) + fmt.Printf("%s\n", rowString) + } return nil }, } @@ -164,9 +195,15 @@ var submitCmd = &cobra.Command{ func init() { listJobsCmd.Flags().StringVar(&host, "host", host, "grip server url") getCmd.Flags().StringVar(&host, "host", host, "grip server url") + viewCmd.Flags().StringVar(&host, "host", host, "grip server url") dropCmd.Flags().StringVar(&host, "host", host, "grip server url") + submitCmd.Flags().StringVar(&host, "host", host, "grip server url") + resumeCmd.Flags().StringVar(&host, "host", host, "grip server url") Cmd.AddCommand(listJobsCmd) Cmd.AddCommand(getCmd) + Cmd.AddCommand(viewCmd) Cmd.AddCommand(dropCmd) + Cmd.AddCommand(submitCmd) + Cmd.AddCommand(resumeCmd) } diff --git a/cmd/jsonload/main.go b/cmd/jsonload/main.go new file mode 100644 index 000000000..1bf6ecb76 --- /dev/null +++ b/cmd/jsonload/main.go @@ -0,0 +1,88 @@ +package jsonload + +import ( + "encoding/json" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/util" + "github.com/bmeg/grip/util/rpc" + "github.com/spf13/cobra" +) + +var host = "localhost:8202" +var NdJsonFile string +var workerCount = 5 +var graph string +var ExtraArgs string +var logRate = 10000 + +var Cmd = &cobra.Command{ + Use: "jsonload ", + Short: "Load, Validate NdJson data into grip graph", + Long: ``, + Args: cobra.ExactArgs(3), + RunE: func(cmd *cobra.Command, args []string) error { + NdJsonFile = args[0] + graph = args[1] + ExtraArgs = args[2] + + var args_map map[string]any + if ExtraArgs != "" { + err := json.Unmarshal([]byte(ExtraArgs), &args_map) + if err != nil { + return err + } + } + + conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) + if err != nil { + return err + } + resp, err := conn.ListGraphs() + if err != nil { + return err + } + found := false + for _, g := range resp.Graphs { + if graph == g { + found = true + } + } + if !found { + log.WithFields(log.Fields{"graph": graph}).Info("creating graph") + err := conn.AddGraph(graph) + if err != nil { + return err + } + } + elemChan := make(chan *gripql.RawJson) + wait := make(chan bool) + go func() { + _, err := conn.BulkAddRaw(elemChan) + if err != nil { + log.Errorf("bulk add raw error: %v", err) + } + wait <- false + }() + + jsonChan, err := util.StreamRawJsonFromFile(NdJsonFile, workerCount, graph, args_map) + if err != nil { + return err + } + count := 0 + for j := range jsonChan { + count++ + if count%logRate == 0 { + log.Infof("Loaded %d vertices", count) + } + elemChan <- j + } + + close(elemChan) + <-wait + + log.WithFields(log.Fields{"graph": graph}).Info("loading data") + return nil + }, +} diff --git a/cmd/load/main.go b/cmd/load/main.go index b2e18422f..dfc7297c1 100644 --- a/cmd/load/main.go +++ b/cmd/load/main.go @@ -6,6 +6,7 @@ import ( "github.com/bmeg/grip/cmd/load/example" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/schema" "github.com/bmeg/grip/util" "github.com/bmeg/grip/util/rpc" "github.com/spf13/cobra" @@ -101,8 +102,8 @@ var Cmd = &cobra.Command{ if count%logRate == 0 { log.Infof("Loaded %d edges", count) } - if edgeUID && e.Gid == "" { - e.Gid = util.UUID() + if edgeUID && e.Id == "" { + e.Id = util.UUID() } elemChan <- &gripql.GraphElement{Graph: graph, Edge: e} } @@ -140,8 +141,8 @@ var Cmd = &cobra.Command{ if edgeCount%logRate == 0 { log.Infof("Loaded %d edges", edgeCount) } - if edgeUID && e.Gid == "" { - e.Gid = util.UUID() + if edgeUID && e.Id == "" { + e.Id = util.UUID() } elemChan <- &gripql.GraphElement{Graph: graph, Edge: e} } @@ -153,7 +154,7 @@ var Cmd = &cobra.Command{ if jsonFile != "" { log.Infof("Loading json file: %s", jsonFile) - graphs, err := gripql.ParseJSONGraphsFile(jsonFile) + graphs, err := schema.ParseJSONGraphsFile(jsonFile) if err != nil { return err } @@ -171,7 +172,7 @@ var Cmd = &cobra.Command{ if yamlFile != "" { log.Infof("Loading YAML file: %s", yamlFile) - graphs, err := gripql.ParseYAMLGraphsFile(yamlFile) + graphs, err := schema.ParseYAMLGraphsFile(yamlFile) if err != nil { return err } diff --git a/cmd/mapping/main.go b/cmd/mapping/main.go index f4e8605af..7c953a1e7 100644 --- a/cmd/mapping/main.go +++ b/cmd/mapping/main.go @@ -2,18 +2,17 @@ package mapping import ( "fmt" - "io/ioutil" + "io" "os" "github.com/bmeg/grip/gripql" + graphSchema "github.com/bmeg/grip/schema" "github.com/bmeg/grip/util/rpc" "github.com/spf13/cobra" ) var host = "localhost:8202" -var yaml = false var jsonFile string -var yamlFile string var sampleCount uint32 = 50 var excludeLabels []string @@ -42,11 +41,7 @@ var getCmd = &cobra.Command{ } var txt string - if yaml { - txt, err = gripql.GraphToYAMLString(schema) - } else { - txt, err = gripql.GraphToJSONString(schema) - } + txt, err = graphSchema.GraphToJSONString(schema) if err != nil { return err } @@ -61,7 +56,7 @@ var postCmd = &cobra.Command{ Long: ``, Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { - if jsonFile == "" && yamlFile == "" { + if jsonFile == "" { return fmt.Errorf("no schema file was provided") } @@ -74,13 +69,13 @@ var postCmd = &cobra.Command{ var graphs []*gripql.Graph var err error if jsonFile == "-" { - bytes, err := ioutil.ReadAll(os.Stdin) + bytes, err := io.ReadAll(os.Stdin) if err != nil { return err } - graphs, err = gripql.ParseJSONGraphs(bytes) + graphs, err = graphSchema.ParseJSONGraphs(bytes) } else { - graphs, err = gripql.ParseJSONGraphsFile(jsonFile) + graphs, err = graphSchema.ParseJSONGraphsFile(jsonFile) } if err != nil { return err @@ -93,28 +88,6 @@ var postCmd = &cobra.Command{ } } - if yamlFile != "" { - var graphs []*gripql.Graph - var err error - if jsonFile == "-" { - bytes, err := ioutil.ReadAll(os.Stdin) - if err != nil { - return err - } - graphs, err = gripql.ParseYAMLGraphs(bytes) - } else { - graphs, err = gripql.ParseYAMLGraphsFile(yamlFile) - } - if err != nil { - return err - } - for _, g := range graphs { - err := conn.AddMapping(g) - if err != nil { - return err - } - } - } return nil }, } @@ -122,12 +95,10 @@ var postCmd = &cobra.Command{ func init() { gflags := getCmd.Flags() gflags.StringVar(&host, "host", host, "grip server url") - gflags.BoolVar(&yaml, "yaml", yaml, "output schema in YAML rather than JSON format") pflags := postCmd.Flags() pflags.StringVar(&host, "host", host, "grip server url") pflags.StringVar(&jsonFile, "json", "", "JSON graph file") - pflags.StringVar(&yamlFile, "yaml", "", "YAML graph file") Cmd.AddCommand(getCmd) Cmd.AddCommand(postCmd) diff --git a/cmd/mongoload/main.go b/cmd/mongoload/main.go index 6607fb7af..673129799 100644 --- a/cmd/mongoload/main.go +++ b/cmd/mongoload/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "sync" + "sync/atomic" //"io" //"strings" @@ -29,23 +30,27 @@ var edgeFile string var dirPath string var edgeUID bool -var bulkBufferSize = 1000 +var bulkBufferSize = 5_000 var workerCount = 1 -var logRate = 10000 +var logRate = 10_000 var createGraph = false func vertexSerialize(vertChan chan *gripql.Vertex, workers int) chan []byte { + var serializeCount atomic.Int64 dataChan := make(chan []byte, workers) var wg sync.WaitGroup - for i := 0; i < workers; i++ { + for range workers { wg.Add(1) go func() { for v := range vertChan { doc := mongo.PackVertex(gdbi.NewElementFromVertex(v)) rawBytes, err := bson.Marshal(doc) if err == nil { + if serializeCount.Add(1)%10000 == 0 { + log.Infof("Serialized %d vertices", serializeCount.Load()) + } dataChan <- rawBytes } } @@ -62,12 +67,12 @@ func vertexSerialize(vertChan chan *gripql.Vertex, workers int) chan []byte { func edgeSerialize(edgeChan chan *gripql.Edge, workers int) chan []byte { dataChan := make(chan []byte, workers) var wg sync.WaitGroup - for i := 0; i < workers; i++ { + for range workers { wg.Add(1) go func() { for e := range edgeChan { - if edgeUID && e.Gid == "" { - e.Gid = util.UUID() + if edgeUID && e.Id == "" { + e.Id = util.UUID() } doc := mongo.PackEdge(gdbi.NewElementFromEdge(e)) rawBytes, err := bson.Marshal(doc) @@ -100,11 +105,7 @@ var Cmd = &cobra.Command{ // Connect to mongo and start the bulk load process log.Infof("Loading data into graph: %s", graph) - client, err := mgo.NewClient(options.Client().ApplyURI(mongoHost)) - if err != nil { - return err - } - err = client.Connect(context.TODO()) + client, err := mgo.Connect(context.Background(), options.Client().ApplyURI(mongoHost)) if err != nil { return err } @@ -121,24 +122,32 @@ var Cmd = &cobra.Command{ if vertexFile != "" { log.Infof("Loading vertex file: %s", vertexFile) - vertInserter := db.NewUnorderedBufferedBulkInserter(vertexCol, bulkBufferSize). - SetBypassDocumentValidation(true). - SetOrdered(false). - SetUpsert(true) vertChan, err := util.StreamVerticesFromFile(vertexFile, workerCount) if err != nil { return err } dataChan := vertexSerialize(vertChan, workerCount) - count := 0 - for d := range dataChan { - vertInserter.InsertRaw(d) - if count%logRate == 0 { - log.Infof("Loaded %d vertices", count) - } - count++ + var wg sync.WaitGroup + var vertexCount atomic.Int64 + for range workerCount { + wg.Add(1) + go func() { + defer wg.Done() + inserter := db.NewUnorderedBufferedBulkInserter(vertexCol, bulkBufferSize). + SetBypassDocumentValidation(true). + SetOrdered(false). + SetUpsert(false) + defer inserter.Flush() + for d := range dataChan { + inserter.InsertRaw(d) + newCount := vertexCount.Add(1) + if newCount%10000 == 0 { + log.Infof("Processed %d vertices...", newCount) + } + } + }() } - vertInserter.Flush() + wg.Wait() } if edgeFile != "" { diff --git a/cmd/query/main.go b/cmd/query/main.go index f2474d7d2..13d427d0e 100644 --- a/cmd/query/main.go +++ b/cmd/query/main.go @@ -1,21 +1,20 @@ package query import ( - "encoding/json" + "context" "fmt" "github.com/bmeg/grip/gripql" gripqljs "github.com/bmeg/grip/gripql/javascript" _ "github.com/bmeg/grip/jsengine/goja" // import goja so it registers with the driver map _ "github.com/bmeg/grip/jsengine/otto" // import otto so it registers with the driver map - "github.com/bmeg/grip/jsengine/underscore" + "github.com/bmeg/grip/log" "github.com/bmeg/grip/util/rpc" - "github.com/dop251/goja" "github.com/spf13/cobra" - "google.golang.org/protobuf/encoding/protojson" ) var host = "localhost:8202" +var verbose bool // Cmd is the declaration of the command line var Cmd = &cobra.Command{ @@ -26,56 +25,42 @@ Example: grip query example-graph 'V().hasLabel("Variant").out().limit(5)'`, Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { - vm := goja.New() - - us, err := underscore.Asset("underscore.js") - if err != nil { - return fmt.Errorf("failed to load underscore.js") - } - if _, err := vm.RunString(string(us)); err != nil { - return err - } - - gripqlString, err := gripqljs.Asset("gripql.js") - if err != nil { - return fmt.Errorf("failed to load gripql.js") - } - if _, err := vm.RunString(string(gripqlString)); err != nil { - return err - } - + graph := args[0] queryString := args[1] - val, err := vm.RunString(queryString) - if err != nil { - return err - } - queryJSON, err := json.Marshal(val) - if err != nil { - return err + if verbose { + c := log.DefaultLoggerConfig() + c.Level = "debug" + log.ConfigureLogger(c) } - query := gripql.GraphQuery{} - err = protojson.Unmarshal(queryJSON, &query) + query, err := gripqljs.ParseQuery(queryString) if err != nil { + log.Errorf("Parse error: %s", err) return err } - query.Graph = args[0] - + query.Graph = graph conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { + log.Errorf("Connect error: %s", err) return err } - res, err := conn.Traversal(&query) + log.Debugf("Query: %s\n", query.String()) + res, err := conn.Traversal(context.Background(), query) if err != nil { + log.Errorf("Traversal error: %s", err) return err } + fm := gripql.NewFlattenMarshaler() + count := uint64(0) for row := range res { - rowString, _ := protojson.Marshal(row) + rowString, _ := fm.Marshal(row) fmt.Printf("%s\n", rowString) + count++ } + log.Debugf("rows returned: %d", count) return nil }, } @@ -83,4 +68,6 @@ Example: func init() { flags := Cmd.Flags() flags.StringVar(&host, "host", host, "grip server url") + flags.BoolVar(&verbose, "verbose", verbose, "Verbose") + } diff --git a/cmd/rdf/main.go b/cmd/rdf/main.go index e1ccc5f73..1212b1280 100644 --- a/cmd/rdf/main.go +++ b/cmd/rdf/main.go @@ -108,7 +108,7 @@ func stringClean(cMap map[string]string, s string) string { return s } -//LoadRDFCmd is the main command line for loading RDF data +// LoadRDFCmd is the main command line for loading RDF data func LoadRDFCmd(cmd *cobra.Command, args []string) error { graph = args[0] log.Infof("Loading data into graph: %s", graph) @@ -165,12 +165,12 @@ func LoadRDFCmd(cmd *cobra.Command, args []string) error { curSubj = subj if triple.Obj.Type() == rdf.TermLiteral { if curVertex == nil { - curVertex = &gripql.Vertex{Gid: subj} + curVertex = &gripql.Vertex{Id: subj} } curVertex.SetProperty(stringClean(uMap, triple.Pred.String()), triple.Obj.String()) } else if triple.Pred.String() == RdfType { if curVertex == nil { - curVertex = &gripql.Vertex{Gid: subj} + curVertex = &gripql.Vertex{Id: subj} } curVertex.Label = stringClean(uMap, triple.Obj.String()) } else { @@ -189,7 +189,7 @@ func LoadRDFCmd(cmd *cobra.Command, args []string) error { }() for element := range elementChan { if element.vertex != nil { - if element.vertex.Gid != "" && element.vertex.Label != "" { + if element.vertex.Id != "" && element.vertex.Label != "" { err := emit.AddVertex(graph, element.vertex) if err != nil { log.Errorf("%s", err) diff --git a/cmd/root.go b/cmd/root.go index caf89a00d..b2a85c8d4 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -7,20 +7,22 @@ import ( "os" "github.com/bmeg/grip/cmd/create" + "github.com/bmeg/grip/cmd/delete" "github.com/bmeg/grip/cmd/drop" "github.com/bmeg/grip/cmd/dump" "github.com/bmeg/grip/cmd/erclient" "github.com/bmeg/grip/cmd/info" + "github.com/bmeg/grip/cmd/job" + "github.com/bmeg/grip/cmd/jsonload" "github.com/bmeg/grip/cmd/kvload" "github.com/bmeg/grip/cmd/list" "github.com/bmeg/grip/cmd/load" - "github.com/bmeg/grip/cmd/job" + "github.com/bmeg/grip/cmd/mapping" "github.com/bmeg/grip/cmd/mongoload" "github.com/bmeg/grip/cmd/plugin" "github.com/bmeg/grip/cmd/query" "github.com/bmeg/grip/cmd/rdf" "github.com/bmeg/grip/cmd/schema" - "github.com/bmeg/grip/cmd/mapping" "github.com/bmeg/grip/cmd/server" "github.com/bmeg/grip/cmd/stream" "github.com/bmeg/grip/cmd/version" @@ -59,6 +61,7 @@ func init() { RootCmd.AddCommand(job.Cmd) RootCmd.AddCommand(load.Cmd) RootCmd.AddCommand(mongoload.Cmd) + RootCmd.AddCommand(jsonload.Cmd) RootCmd.AddCommand(query.Cmd) RootCmd.AddCommand(erclient.Cmd) RootCmd.AddCommand(rdf.Cmd) @@ -69,6 +72,8 @@ func init() { RootCmd.AddCommand(plugin.Cmd) RootCmd.AddCommand(version.Cmd) RootCmd.AddCommand(kvload.Cmd) + RootCmd.AddCommand(delete.Cmd) + } var genBashCompletionCmd = &cobra.Command{ diff --git a/cmd/schema/main.go b/cmd/schema/main.go index fb3c570db..4ddce767e 100644 --- a/cmd/schema/main.go +++ b/cmd/schema/main.go @@ -2,24 +2,18 @@ package schema import ( "fmt" - "io/ioutil" - "os" "github.com/bmeg/grip/gripql" - gripql_schema "github.com/bmeg/grip/gripql/schema" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/schema" "github.com/bmeg/grip/util/rpc" "github.com/spf13/cobra" ) var host = "localhost:8202" -var yaml = false var jsonFile string -var yamlFile string -var sampleCount uint32 = 50 -var excludeLabels []string - -var manual bool +var graphName string +var jsonSchemaFile string // Cmd line declaration var Cmd = &cobra.Command{ @@ -40,17 +34,14 @@ var getCmd = &cobra.Command{ return err } - schema, err := conn.GetSchema(graph) + gripqlschema, err := conn.GetSchema(graph) if err != nil { return err } var txt string - if yaml { - txt, err = gripql.GraphToYAMLString(schema) - } else { - txt, err = gripql.GraphToJSONString(schema) - } + + txt, err = schema.GraphToJSONString(gripqlschema) if err != nil { return err } @@ -59,13 +50,18 @@ var getCmd = &cobra.Command{ }, } +type Config struct { + DependencyOrder []string `yaml:"dependency_order"` +} + var postCmd = &cobra.Command{ - Use: "post", - Short: "Post graph schemas", + Use: "post [graph name]", + Short: "Post jsonschema graph schemas", Long: ``, - Args: cobra.NoArgs, + Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - if jsonFile == "" && yamlFile == "" { + graphName := args[0] + if jsonFile == "" && jsonSchemaFile == "" { return fmt.Errorf("no schema file was provided") } @@ -74,42 +70,35 @@ var postCmd = &cobra.Command{ return err } - if jsonFile != "" { - var graphs []*gripql.Graph - var err error - if jsonFile == "-" { - bytes, err := ioutil.ReadAll(os.Stdin) - if err != nil { - return err + /* + * Deprecate this for now. This expects a schema in the legacy grip schema graph format + * if jsonFile != "" { + var graphs []*gripql.Graph + var err error + if jsonFile == "-" { + bytes, err := io.ReadAll(os.Stdin) + if err != nil { + return err + } + graphs, err = schema.ParseJSONGraphs(bytes) + } else { + graphs, err = schema.ParseJSONGraphsFile(jsonFile) } - graphs, err = gripql.ParseJSONGraphs(bytes) - } else { - graphs, err = gripql.ParseJSONGraphsFile(jsonFile) - } - if err != nil { - return err - } - for _, g := range graphs { - err := conn.AddSchema(g) if err != nil { return err } - log.Debug("Posted schema: %s", g.Graph) - } - } - - if yamlFile != "" { - var graphs []*gripql.Graph - var err error - if jsonFile == "-" { - bytes, err := ioutil.ReadAll(os.Stdin) - if err != nil { - return err + for _, g := range graphs { + err := conn.AddSchema(g) + if err != nil { + return err + } + log.Debugf("Posted schema: %s", g.Graph) } - graphs, err = gripql.ParseYAMLGraphs(bytes) - } else { - graphs, err = gripql.ParseYAMLGraphsFile(yamlFile) - } + }*/ + + if jsonSchemaFile != "" { + log.Infof("Loading Json Schema file: %s", jsonSchemaFile) + graphs, err := schema.ParseJsonSchema(jsonSchemaFile, graphName) if err != nil { return err } @@ -118,70 +107,22 @@ var postCmd = &cobra.Command{ if err != nil { return err } + log.Debugf("Posted schema: %s", g.Graph) } } return nil }, } -var sampleCmd = &cobra.Command{ - Use: "sample ", - Short: "Sample graph and construct schema", - Long: ``, - Args: cobra.ExactArgs(1), - RunE: func(cmd *cobra.Command, args []string) error { - graph := args[0] - - conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) - if err != nil { - return err - } - - var schema *gripql.Graph - if manual { - schema, err = gripql_schema.ScanSchema(conn, graph, sampleCount, excludeLabels) - if err != nil { - return err - } - } else { - schema, err = conn.SampleSchema(graph) - if err != nil { - return err - } - } - var txt string - if yaml { - txt, err = gripql.GraphToYAMLString(schema) - } else { - txt, err = gripql.GraphToJSONString(schema) - } - if err != nil { - return err - } - fmt.Printf("%s\n", txt) - conn.Close() - return nil - }, -} - func init() { gflags := getCmd.Flags() gflags.StringVar(&host, "host", host, "grip server url") - gflags.BoolVar(&yaml, "yaml", yaml, "output schema in YAML rather than JSON format") pflags := postCmd.Flags() pflags.StringVar(&host, "host", host, "grip server url") - pflags.StringVar(&jsonFile, "json", "", "JSON graph file") - pflags.StringVar(&yamlFile, "yaml", "", "YAML graph file") - - sflags := sampleCmd.Flags() - sflags.StringVar(&host, "host", host, "grip server url") - sflags.Uint32Var(&sampleCount, "sample", sampleCount, "Number of elements to sample") - sflags.BoolVar(&yaml, "yaml", yaml, "output schema in YAML rather than JSON format") - sflags.BoolVar(&manual, "manual", manual, "Use client side schema sampling") - sflags.StringSliceVar(&excludeLabels, "exclude-label", excludeLabels, "exclude vertex/edge label from schema") + //pflags.StringVar(&jsonFile, "json", "", "JSON graph file") + pflags.StringVar(&jsonSchemaFile, "jsonSchema", "", "Json Schema") Cmd.AddCommand(getCmd) Cmd.AddCommand(postCmd) - Cmd.AddCommand(sampleCmd) } diff --git a/cmd/server/main.go b/cmd/server/main.go index 6707f0b37..010f299d4 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -5,6 +5,7 @@ import ( "fmt" "os" "os/signal" + "strings" "github.com/bmeg/grip/config" "github.com/bmeg/grip/log" @@ -17,9 +18,11 @@ import ( var conf = &config.Config{} var configFile string -var driver = "badger" +var driver = "pebble" +var verbose bool var endPoints = map[string]string{} +var endPointConfig = map[string]string{} var pluginDir = "" @@ -28,7 +31,9 @@ var pluginDir = "" // This blocks indefinitely. func Run(conf *config.Config, baseDir string) error { log.ConfigureLogger(conf.Logger) - log.WithFields(log.Fields{"Config": conf}).Info("Starting Server") + cpyConf := config.DeepCopyRedactedConfig(conf) + + log.WithFields(log.Fields{"Config": cpyConf}).Info("Starting Server") ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -45,7 +50,14 @@ func Run(conf *config.Config, baseDir string) error { } for k, v := range endPoints { - if err := srv.AddEndpoint(k, v); err != nil { + c := map[string]string{} + for ck, cv := range endPointConfig { + if strings.HasPrefix(ck, k+":") { + nk := ck[len(k)+1:] + c[nk] = cv + } + } + if err := srv.AddEndpoint(k, v, c); err != nil { log.Errorf("Error loading pluging %s: %s", k, err) } } @@ -81,6 +93,10 @@ var Cmd = &cobra.Command{ dconf.AddPebbleDefault() } else if driver == "mongo" { dconf.AddMongoDefault() + } else if driver == "grids" { + dconf.AddGridsDefault() + } else if driver == "sqlite" { + dconf.AddSqliteDefault() } } if pluginDir != "" { @@ -100,6 +116,11 @@ var Cmd = &cobra.Command{ conf.RPCClient.ServerAddress = conf.Server.RPCAddress() } } + + if verbose { + conf.Logger.Level = "debug" + } + return nil }, RunE: func(cmd *cobra.Command, args []string) error { @@ -117,10 +138,13 @@ func init() { flags.StringVar(&conf.Logger.Formatter, "log-format", conf.Logger.Formatter, "Log format [text, json]") flags.BoolVar(&conf.Server.RequestLogging.Enable, "log-requests", conf.Server.RequestLogging.Enable, "Log all requests") + flags.BoolVar(&verbose, "verbose", verbose, "Verbose") + flags.StringVarP(&pluginDir, "plugins", "p", pluginDir, "Directory with GRIPPER plugins") flags.StringVarP(&driver, "driver", "d", driver, "Default Driver") flags.StringToStringVarP(&endPoints, "endpoint", "w", endPoints, "web endpoint plugins") + flags.StringToStringVarP(&endPointConfig, "endpoint-config", "l", endPointConfig, "web endpoint configuration") flags.StringToStringVarP(&conf.Sources, "er", "e", conf.Sources, "GRIPPER source address") } diff --git a/cmd/stream/main.go b/cmd/stream/main.go index 57925e2dd..e0fea5db4 100644 --- a/cmd/stream/main.go +++ b/cmd/stream/main.go @@ -1,6 +1,12 @@ package stream import ( + "bytes" + "fmt" + "regexp" + "strings" + "time" + "github.com/Shopify/sarama" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" @@ -9,81 +15,185 @@ import ( "google.golang.org/protobuf/encoding/protojson" ) -var kafka = "localhost:9092" var host = "localhost:8202" -var graph string -var vertexTopic = "grip_vertex" -var edgeTopic = "grip_edge" +var KafkaUsername = "" +var KafkaPassword = "" +var Topic = "" -// Cmd is the base command called by the cobra command line system +// Fetch all requests from Kafka and recreate all write +// Ex command using ci env: grip stream localhost:9092 --KafkaUsername admin --KafkaPassword adminpassword --Topic gripHistory var Cmd = &cobra.Command{ - Use: "stream ", + Use: "stream", Short: "Stream data into a graph from Kafka", Long: ``, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - graph = args[0] - log.WithFields(log.Fields{"kafka": kafka, "graph": graph}).Errorf("Streaming data from Kafka into graph") + kafkaHost := args[0] conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true) if err != nil { return err } + defer conn.Close() - consumer, err := sarama.NewConsumer([]string{kafka}, nil) - if err != nil { - panic(err) + config := sarama.NewConfig() + config.Version = sarama.V2_8_0_0 + config.Net.SASL.Enable = true + config.Net.SASL.User = KafkaUsername + config.Net.SASL.Password = KafkaPassword + config.Net.SASL.Mechanism = sarama.SASLTypePlaintext + config.Producer.Return.Successes = true + config.Net.SASL.Handshake = true + config.Net.TLS.Enable = false + if KafkaUsername == "" || KafkaPassword == "" || Topic == "" { + return fmt.Errorf("Kafka username and password and topic must be populated") } - vertexConsumer, err := consumer.ConsumePartition(vertexTopic, 0, sarama.OffsetOldest) - edgeConsumer, err := consumer.ConsumePartition(edgeTopic, 0, sarama.OffsetOldest) + consumer, err := sarama.NewConsumer([]string{kafkaHost}, config) + if err != nil { + return fmt.Errorf("failed to create Kafka consumer: %w", err) + } + defer consumer.Close() + writeConsumer, err := consumer.ConsumePartition(Topic, 0, sarama.OffsetOldest) + if err != nil { + return fmt.Errorf("failed to consume partition: %w", err) + } + defer writeConsumer.Close() done := make(chan bool) go func() { - count := 0 - for msg := range vertexConsumer.Messages() { - v := gripql.Vertex{} - err := protojson.Unmarshal(msg.Value, &v) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("vertex consumer: unmarshal error") - continue - } - err = conn.AddVertex(graph, &v) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("vertex consumer: add error") - continue - } - count++ - if count%1000 == 0 { - log.Infof("Loaded %d vertices", count) - } - } - done <- true - }() + defer close(done) + for { + // timeout after 3 seconds have elapsed and no new message has been sent to Consumer + timeout := time.NewTimer(3 * time.Second) + select { + case msg, ok := <-writeConsumer.Messages(): + if !ok { + log.Info("writeConsumer channel closed") + return + } + timeout.Stop() + Method := "" + Path := "" + for _, HeaderMsg := range msg.Headers { + if bytes.Equal(HeaderMsg.Key, []byte("PATH")) { + Path = string(HeaderMsg.Value) + } else if bytes.Equal(HeaderMsg.Key, []byte("METHOD")) { + Method = string(HeaderMsg.Value) + } + } + if Path == "" || Method == "" { + continue + } - go func() { - count := 0 - for msg := range edgeConsumer.Messages() { - e := gripql.Edge{} - err := protojson.Unmarshal(msg.Value, &e) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("edge consumer: unmarshal error") - continue - } - err = conn.AddEdge(graph, &e) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("edge consumer: add error") - continue - } - count++ - if count%1000 == 0 { - log.Infof("Loaded %d edges", count) + fmt.Println("PATH: ", Path, "METHOD: ", Method) + bulk := regexp.MustCompile("^/v1/graph$") + graph := regexp.MustCompile("^/v1/graph/([^/]+)$") + switch Method { + case "DELETE": + deleteVertex := regexp.MustCompile("^/v1/graph/([^/]+)/vertex/([^/]+)$") + deleteEdge := regexp.MustCompile("^/v1/graph/([^/]+)/edge/([^/]+)$") + switch { + case bulk.MatchString(Path): + g := gripql.DeleteData{} + err := protojson.Unmarshal(msg.Value, &g) + if err != nil { + log.WithFields(log.Fields{"error": err, "value": string(msg.Value)}).Error("consumer: bulk delete unmarshal vertex error") + continue + } + err = conn.BulkDelete(&g) + if err != nil { + log.WithFields(log.Fields{"error": err, "path": Path}).Errorf("consumer: bulk delete") + continue + } + case deleteVertex.MatchString(Path): + id := strings.Split(Path, "/") + err := conn.DeleteVertex(id[len(id)-3], id[len(id)-1]) + if err != nil { + log.WithFields(log.Fields{"error": err, "path": Path}).Errorf("consumer: delete vertex") + continue + } + case deleteEdge.MatchString(Path): + id := strings.Split(Path, "/") + err := conn.DeleteEdge(id[len(id)-3], id[len(id)-1]) + if err != nil { + log.WithFields(log.Fields{"error": err, "path": Path}).Errorf("consumer: delete edge") + continue + } + case graph.MatchString(Path): + paths := strings.Split(Path, "/") + graphName := paths[len(paths)-1] + err = conn.DeleteGraph(graphName) + if err != nil { + log.WithFields(log.Fields{"error": err, "graph": graphName}).Errorf("consumer: delete graph") + } + default: + continue + } + case "POST": + addVertex := regexp.MustCompile("^/v1/graph/([^/]+)/vertex$") + addEdge := regexp.MustCompile("^/v1/graph/([^/]+)/edge$") + addSchema := regexp.MustCompile("^/v1/graph/([^/]+)/schema$") + switch { + case bulk.MatchString(Path): + fmt.Printf("WE HERE: %s", string(msg.Value)) + case addVertex.MatchString(Path): + v := gripql.Vertex{} + err = protojson.Unmarshal(msg.Value, &v) + if err != nil { + log.WithFields(log.Fields{"error": err, "value": string(msg.Value)}).Error("consumer: unmarshal vertex error") + continue + } + id := strings.Split(Path, "/") + err = conn.AddVertex(id[len(id)-2], &v) + if err != nil { + log.WithFields(log.Fields{"error": err, "vertex": v}).Error("consumer: add vertex error") + continue + } + case addEdge.MatchString(Path): + e := gripql.Edge{} + err = protojson.Unmarshal(msg.Value, &e) + if err != nil { + log.WithFields(log.Fields{"error": err, "value": string(msg.Value)}).Error("consumer: unmarshal edge error") + continue + } + id := strings.Split(Path, "/") + err = conn.AddEdge(id[len(id)-2], &e) + if err != nil { + log.WithFields(log.Fields{"error": err, "edge": e}).Error("consumer: add edge error") + continue + } + case addSchema.MatchString(Path): + graph := gripql.Graph{} + err = protojson.Unmarshal(msg.Value, &graph) + if err != nil { + log.WithFields(log.Fields{"error": err, "value": string(msg.Value)}).Error("consumer: unmarshal schema error") + continue + } + err = conn.AddSchema(&graph) + if err != nil { + log.WithFields(log.Fields{"error": err, "schema": graph}).Error("consumer: add schema error") + } + case graph.MatchString(Path): + paths := strings.Split(Path, "/") + graphName := paths[len(paths)-1] + err = conn.AddGraph(graphName) + if err != nil { + log.WithFields(log.Fields{"error": err, "graph": graphName}).Error("consumer: add graph error") + } + default: + continue + } + default: + continue + } + case <-timeout.C: + return } } - done <- true }() - <-done + <-done return nil }, @@ -91,8 +201,9 @@ var Cmd = &cobra.Command{ func init() { flags := Cmd.Flags() - flags.StringVar(&kafka, "kafka", "localhost:9092", "Kafka server url") flags.StringVar(&host, "host", "localhost:8202", "grip server url") - flags.StringVar(&vertexTopic, "vertex", "grip_vertex", "vertex topic name") - flags.StringVar(&edgeTopic, "edge", "grip_edge", "edge topic name") + flags.StringVar(&KafkaUsername, "KafkaUsername", "", "Kafka Username") + flags.StringVar(&KafkaPassword, "KafkaPassword", "", "Kafka Password") + flags.StringVar(&Topic, "Topic", "gripHistory", "Kafka Topic") + } diff --git a/config/config.go b/config/config.go index d6c0da973..0848f4339 100644 --- a/config/config.go +++ b/config/config.go @@ -2,19 +2,19 @@ package config import ( "fmt" - "io/ioutil" "math/rand" + "os" "path/filepath" "strings" "time" - "github.com/bmeg/grip/elastic" esql "github.com/bmeg/grip/existing-sql" "github.com/bmeg/grip/gripper" - "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" "github.com/bmeg/grip/mongo" "github.com/bmeg/grip/psql" + "github.com/bmeg/grip/schema" + "github.com/bmeg/grip/sqlite" "github.com/bmeg/grip/util" "github.com/bmeg/grip/util/duration" "github.com/bmeg/grip/util/rpc" @@ -26,16 +26,24 @@ func init() { } type DriverConfig struct { - Grids *string - Badger *string - Bolt *string - Level *string - Pebble *string - Elasticsearch *elastic.Config - MongoDB *mongo.Config - PSQL *psql.Config - ExistingSQL *esql.Config - Gripper *gripper.Config + Grids *string + Badger *string + Bolt *string + Level *string + Pebble *string + MongoDB *mongo.Config + PSQL *psql.Config + ExistingSQL *esql.Config + Sqlite *sqlite.Config + Gripper *gripper.Config +} + +type KafkaConfig struct { + Username *string + Password *string + Hostname *string + // Limit to one topic stream for now + Topic *string } // Config describes the configuration for Grip. @@ -47,6 +55,7 @@ type Config struct { Graphs map[string]string Drivers map[string]DriverConfig Sources map[string]string + Kafka KafkaConfig } type DriverParams interface { @@ -68,8 +77,8 @@ func DefaultConfig() *Config { c.Server.SchemaInspectN = 500 c.Server.SchemaRandomSample = true c.Server.RequestLogging.HeaderWhitelist = []string{ - "authorization", "oauthemail", "content-type", "content-length", - "forwarded", "x-forwarded-for", "x-forwarded-host", "user-agent", + "content-type", "content-length", "forwarded", + "x-forwarded-for", "x-forwarded-host", "user-agent", } c.RPCClient = rpc.ConfigWithDefaults(c.Server.RPCAddress()) @@ -79,6 +88,9 @@ func DefaultConfig() *Config { c.Sources = map[string]string{} c.Logger = log.DefaultLoggerConfig() + + c.Kafka = KafkaConfig{} + return c } @@ -101,6 +113,18 @@ func (conf *Config) AddMongoDefault() { conf.Default = "mongo" } +func (conf *Config) AddSqliteDefault() { + c := sqlite.Config{DBName: "grip-sqlite.db"} + conf.Drivers["sqlite"] = DriverConfig{Sqlite: &c} + conf.Default = "sqlite" +} + +func (conf *Config) AddGridsDefault() { + n := "grip-grids.db" + conf.Drivers["grids"] = DriverConfig{Grids: &n} + conf.Default = "grids" +} + // TestifyConfig randomizes ports and database paths/names func TestifyConfig(c *Config) { rand := strings.ToLower(util.RandomString(6)) @@ -117,12 +141,15 @@ func TestifyConfig(c *Config) { a := "grip.db." + rand d.Badger = &a } + if d.Pebble != nil { + a := "grip.db." + rand + d.Pebble = &a + } if d.MongoDB != nil { d.MongoDB.DBName = "gripdb-" + rand } - if d.Elasticsearch != nil { - d.Elasticsearch.DBName = "gripdb-" + rand - d.Elasticsearch.Synchronous = true + if d.Sqlite != nil { + d.Sqlite.DBName = "gripdb-" + rand } c.Drivers[c.Default] = d } @@ -132,9 +159,6 @@ func (c *Config) SetDefaults() { if d.MongoDB != nil { d.MongoDB.SetDefaults() } - if d.Elasticsearch != nil { - d.Elasticsearch.SetDefaults() - } } } @@ -169,7 +193,7 @@ func ParseConfigFile(relpath string, conf *Config) error { } // Read file - source, err := ioutil.ReadFile(path) + source, err := os.ReadFile(path) if err != nil { return fmt.Errorf("failed to read config at path %s: \n%v", path, err) } @@ -184,17 +208,17 @@ func ParseConfigFile(relpath string, conf *Config) error { if conf.Drivers[i].Gripper.MappingFile != "" { gpath := filepath.Join(filepath.Dir(path), conf.Drivers[i].Gripper.MappingFile) - gsource, err := ioutil.ReadFile(gpath) + gsource, err := os.ReadFile(gpath) if err != nil { return fmt.Errorf("failed to read graph at path %s: \n%v", gpath, err) } // Parse file - data := map[string]interface{}{} + data := map[string]any{} err = yaml.Unmarshal(gsource, &data) if err != nil { return fmt.Errorf("failed to parse config at path %s: \n%v", path, err) } - graph, err := gripql.GraphMapToProto(data) + graph, err := schema.GraphMapToProto(data) if err != nil { return fmt.Errorf("failed to parse config at path %s: \n%v", path, err) } @@ -204,3 +228,94 @@ func ParseConfigFile(relpath string, conf *Config) error { } return nil } + +func DeepCopyRedactedConfig(conf *Config) *Config { + if conf == nil { + return nil + } + + cpyConf := &Config{ + Server: conf.Server, + RPCClient: rpc.Config{ + ServerAddress: conf.RPCClient.ServerAddress, + Timeout: conf.RPCClient.Timeout, + MaxRetries: conf.RPCClient.MaxRetries, + User: conf.RPCClient.User, + Password: "[REDACTED]", + }, + Logger: conf.Logger, + Default: conf.Default, + Graphs: make(map[string]string, len(conf.Graphs)), + Drivers: make(map[string]DriverConfig, len(conf.Drivers)), + Sources: make(map[string]string, len(conf.Sources)), + Kafka: KafkaConfig{}, + } + + for k, v := range conf.Graphs { + cpyConf.Graphs[k] = v + } + + for k, v := range conf.Sources { + cpyConf.Sources[k] = v + } + + for k, driver := range conf.Drivers { + cpyDriver := DriverConfig{} + if driver.Grids != nil { + grids := *driver.Grids + cpyDriver.Grids = &grids + } + if driver.Badger != nil { + badger := *driver.Badger + cpyDriver.Badger = &badger + } + if driver.Bolt != nil { + bolt := *driver.Bolt + cpyDriver.Bolt = &bolt + } + if driver.Level != nil { + level := *driver.Level + cpyDriver.Level = &level + } + if driver.Pebble != nil { + pebble := *driver.Pebble + cpyDriver.Pebble = &pebble + } + if driver.MongoDB != nil { + mongoDB := &mongo.Config{DBName: "[REDACTED]", Password: "[REDACTED]"} + cpyDriver.MongoDB = mongoDB + } + if driver.PSQL != nil { + psql := &psql.Config{DBName: "[REDACTED]", Password: "[REDACTED]"} + cpyDriver.PSQL = psql + } + if driver.ExistingSQL != nil { + existingSQL := &esql.Config{DataSourceName: "[REDACTED]"} + cpyDriver.ExistingSQL = existingSQL + } + if driver.Sqlite != nil { + sqlite := *driver.Sqlite + cpyDriver.Sqlite = &sqlite + } + if driver.Gripper != nil { + gripper := &gripper.Config{MappingFile: "[REDACTED]"} + cpyDriver.Gripper = gripper + } + cpyConf.Drivers[k] = cpyDriver + } + if conf.Kafka.Username != nil { + cpyConf.Kafka.Username = conf.Kafka.Username + } + if conf.Kafka.Password != nil { + password := "[REDACTED]" // Redact (tagged as sensitive) + cpyConf.Kafka.Password = &password + } + if conf.Kafka.Hostname != nil { + cpyConf.Kafka.Hostname = conf.Kafka.Hostname + } + if conf.Kafka.Topic != nil { + topic := *conf.Kafka.Topic + cpyConf.Kafka.Topic = &topic + } + return cpyConf +} diff --git a/conformance/graphs/fhir.edges b/conformance/graphs/fhir.edges new file mode 100644 index 000000000..1ef87b22c --- /dev/null +++ b/conformance/graphs/fhir.edges @@ -0,0 +1,6 @@ +{"_id":"patient_a-observation_a1", "_from":"patient_a", "_to":"observation_a1", "_label":"patient_observation"} +{"_id":"patient_a-observation_a2", "_from":"patient_a", "_to":"observation_a2", "_label":"patient_observation"} +{"_id":"patient_a-observation_a3", "_from":"patient_a", "_to":"observation_a3", "_label":"patient_observation"} +{"_id":"patient_b-observation_b1", "_from":"patient_b", "_to":"observation_b1", "_label":"patient_observation"} +{"_id":"patient_b-observation_b2", "_from":"patient_b", "_to":"observation_b2", "_label":"patient_observation"} +{"_id":"patient_b-observation_b3", "_from":"patient_b", "_to":"observation_b3", "_label":"patient_observation"} diff --git a/conformance/graphs/fhir.vertices b/conformance/graphs/fhir.vertices new file mode 100644 index 000000000..c5f104e30 --- /dev/null +++ b/conformance/graphs/fhir.vertices @@ -0,0 +1,8 @@ +{"_id":"patient_a", "_label":"Patient", "name":"Alice"} +{"_id":"patient_b", "_label":"Patient", "name":"Bob"} +{"_id":"observation_a1", "_label":"Observation", "key":"age", "value":36} +{"_id":"observation_a2", "_label":"Observation", "key":"sex", "value":"Female"} +{"_id":"observation_a3", "_label":"Observation", "key":"blood_pressure", "value":"111/78"} +{"_id":"observation_b1", "_label":"Observation", "key":"age", "value":42} +{"_id":"observation_b2", "_label":"Observation", "key":"sex", "value":"Male"} +{"_id":"observation_b3", "_label":"Observation", "key":"blood_pressure", "value":"120/80"} diff --git a/conformance/graphs/prompt-schema.json b/conformance/graphs/prompt-schema.json new file mode 100644 index 000000000..4518b99c5 --- /dev/null +++ b/conformance/graphs/prompt-schema.json @@ -0,0 +1,96 @@ +{ + "$schema": "https://json-schema.org/draft/2020-12/schema", + "$id": "http://grip-schema.io/schema/0.0.1", + "$defs": { + "Prompt": { + "$id": "http://grip-schema.io/schema/0.0.1/Prompt", + "additionalProperties": false, + "description": "User generated prompt", + "links": [ + { + "href": "{id}", + "rel": "responses", + "targetHints": { + "direction": [ + "outbound" + ], + "multiplicity": [ + "has_many" + ], + "regex_match": [ + "response:*" + ] + }, + "targetSchema": { + "$ref": "http://grip-schema.io/schema/0.0.1/Response" + }, + "templatePointers": { + "id": "/response" + } + } + ], + "properties": { + "id": { + "type": "string" + }, + "text": { + "type": "string" + }, + "resourceType": { + "type": "string" + }, + "responses": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "Response": { + "$id": "http://grip-schema.io/schema/0.0.1/Response", + "additionalProperties": false, + "description": "User LLM generated response", + "links": [ + { + "href": "{id}", + "rel": "prompt", + "targetHints": { + "direction": [ + "outbound" + ], + "multiplicity": [ + "has_one" + ], + "regex_match": [ + "prompt:*" + ] + }, + "targetSchema": { + "$ref": "http://grip-schema.io/schema/0.0.1/Prompt" + }, + "templatePointers": { + "id": "/prompt" + } + } + ], + "properties": { + "id": { + "type": "string" + }, + "text": { + "type": "string" + }, + "resourceType": { + "type": "string" + }, + "prompt": { + "type": "string" + }, + "model": { + "type": "string" + } + } + } + } +} \ No newline at end of file diff --git a/conformance/graphs/prompt.yaml b/conformance/graphs/prompt.yaml new file mode 100644 index 000000000..0f58c6f54 --- /dev/null +++ b/conformance/graphs/prompt.yaml @@ -0,0 +1,29 @@ +id: http://grip-schema.io/schema/0.0.1/Prompt +additionalProperties: false +description: User generated prompt +links: +- href: '{id}' + rel: responses + targetHints: + direction: + - outbound + multiplicity: + - has_many + regex_match: + - response:* + targetSchema: + $ref: http://grip-schema.io/schema/0.0.1/Response + templatePointers: + id: /response + +properties: + id: + type: string + text: + type: string + resourceType: + type: string + responses: + type: array + items: + type: string diff --git a/conformance/graphs/response.yaml b/conformance/graphs/response.yaml new file mode 100644 index 000000000..311ef2c5f --- /dev/null +++ b/conformance/graphs/response.yaml @@ -0,0 +1,30 @@ +id: http://grip-schema.io/schema/0.0.1/Response +additionalProperties: false +description: User LLM generated response +links: +- href: '{id}' + rel: prompt + targetHints: + direction: + - outbound + multiplicity: + - has_one + regex_match: + - prompt:* + targetSchema: + $ref: http://grip-schema.io/schema/0.0.1/Prompt + templatePointers: + id: /prompt + +properties: + id: + type: string + text: + type: string + resourceType: + type: string + prompt: + type: string + model: + type: string + diff --git a/conformance/graphs/swapi.edges b/conformance/graphs/swapi.edges index 93b33c120..410283e32 100644 --- a/conformance/graphs/swapi.edges +++ b/conformance/graphs/swapi.edges @@ -1,144 +1,144 @@ -{"gid": "Film:1-characters-Character:1", "label": "characters", "from": "Film:1", "to": "Character:1"} -{"gid": "Film:1-characters-Character:2", "label": "characters", "from": "Film:1", "to": "Character:2"} -{"gid": "Film:1-characters-Character:3", "label": "characters", "from": "Film:1", "to": "Character:3"} -{"gid": "Film:1-characters-Character:4", "label": "characters", "from": "Film:1", "to": "Character:4"} -{"gid": "Film:1-characters-Character:5", "label": "characters", "from": "Film:1", "to": "Character:5"} -{"gid": "Film:1-characters-Character:6", "label": "characters", "from": "Film:1", "to": "Character:6"} -{"gid": "Film:1-characters-Character:7", "label": "characters", "from": "Film:1", "to": "Character:7"} -{"gid": "Film:1-characters-Character:8", "label": "characters", "from": "Film:1", "to": "Character:8"} -{"gid": "Film:1-characters-Character:9", "label": "characters", "from": "Film:1", "to": "Character:9"} -{"gid": "Film:1-characters-Character:10", "label": "characters", "from": "Film:1", "to": "Character:10"} -{"gid": "Film:1-characters-Character:12", "label": "characters", "from": "Film:1", "to": "Character:12"} -{"gid": "Film:1-characters-Character:13", "label": "characters", "from": "Film:1", "to": "Character:13"} -{"gid": "Film:1-characters-Character:14", "label": "characters", "from": "Film:1", "to": "Character:14"} -{"gid": "Film:1-characters-Character:15", "label": "characters", "from": "Film:1", "to": "Character:15"} -{"gid": "Film:1-characters-Character:16", "label": "characters", "from": "Film:1", "to": "Character:16"} -{"gid": "Film:1-characters-Character:18", "label": "characters", "from": "Film:1", "to": "Character:18"} -{"gid": "Film:1-characters-Character:19", "label": "characters", "from": "Film:1", "to": "Character:19"} -{"gid": "Film:1-characters-Character:81", "label": "characters", "from": "Film:1", "to": "Character:81"} -{"gid": "Film:1-planets-Planet:2", "label": "planets", "from": "Film:1", "to": "Planet:2", "data" : {"scene_count" : 10}} -{"gid": "Film:1-planets-Planet:3", "label": "planets", "from": "Film:1", "to": "Planet:3", "data" : {"scene_count" : 15}} -{"gid": "Film:1-planets-Planet:1", "label": "planets", "from": "Film:1", "to": "Planet:1", "data" : {"scene_count" : 20}} -{"gid": "Film:1-starships-Starship:2", "label": "starships", "from": "Film:1", "to": "Starship:2"} -{"gid": "Film:1-starships-Starship:3", "label": "starships", "from": "Film:1", "to": "Starship:3"} -{"gid": "Film:1-starships-Starship:5", "label": "starships", "from": "Film:1", "to": "Starship:5"} -{"gid": "Film:1-starships-Starship:9", "label": "starships", "from": "Film:1", "to": "Starship:9"} -{"gid": "Film:1-starships-Starship:10", "label": "starships", "from": "Film:1", "to": "Starship:10"} -{"gid": "Film:1-starships-Starship:11", "label": "starships", "from": "Film:1", "to": "Starship:11"} -{"gid": "Film:1-starships-Starship:12", "label": "starships", "from": "Film:1", "to": "Starship:12"} -{"gid": "Film:1-starships-Starship:13", "label": "starships", "from": "Film:1", "to": "Starship:13"} -{"gid": "Film:1-vehicles-Vehicle:4", "label": "vehicles", "from": "Film:1", "to": "Vehicle:4"} -{"gid": "Film:1-vehicles-Vehicle:6", "label": "vehicles", "from": "Film:1", "to": "Vehicle:6"} -{"gid": "Film:1-vehicles-Vehicle:7", "label": "vehicles", "from": "Film:1", "to": "Vehicle:7"} -{"gid": "Film:1-vehicles-Vehicle:8", "label": "vehicles", "from": "Film:1", "to": "Vehicle:8"} -{"gid": "Film:1-species-Species:5", "label": "species", "from": "Film:1", "to": "Species:5"} -{"gid": "Film:1-species-Species:3", "label": "species", "from": "Film:1", "to": "Species:3"} -{"gid": "Film:1-species-Species:2", "label": "species", "from": "Film:1", "to": "Species:2"} -{"gid": "Film:1-species-Species:1", "label": "species", "from": "Film:1", "to": "Species:1"} -{"gid": "Film:1-species-Species:4", "label": "species", "from": "Film:1", "to": "Species:4"} -{"gid": "Character:1-homeworld-Planet:1", "label": "homeworld", "from": "Character:1", "to": "Planet:1"} -{"gid": "Character:1-films-Film:1", "label": "films", "from": "Character:1", "to": "Film:1"} -{"gid": "Character:1-species-Species:1", "label": "species", "from": "Character:1", "to": "Species:1"} -{"gid": "Character:1-starships-Starship:12", "label": "starships", "from": "Character:1", "to": "Starship:12"} -{"gid": "Character:2-homeworld-Planet:1", "label": "homeworld", "from": "Character:2", "to": "Planet:1"} -{"gid": "Character:2-films-Film:1", "label": "films", "from": "Character:2", "to": "Film:1"} -{"gid": "Character:2-species-Species:2", "label": "species", "from": "Character:2", "to": "Species:2"} -{"gid": "Character:3-films-Film:1", "label": "films", "from": "Character:3", "to": "Film:1"} -{"gid": "Character:3-species-Species:2", "label": "species", "from": "Character:3", "to": "Species:2"} -{"gid": "Character:4-homeworld-Planet:1", "label": "homeworld", "from": "Character:4", "to": "Planet:1"} -{"gid": "Character:4-films-Film:1", "label": "films", "from": "Character:4", "to": "Film:1"} -{"gid": "Character:4-species-Species:1", "label": "species", "from": "Character:4", "to": "Species:1"} -{"gid": "Character:4-starships-Starship:13", "label": "starships", "from": "Character:4", "to": "Starship:13"} -{"gid": "Character:5-homeworld-Planet:2", "label": "homeworld", "from": "Character:5", "to": "Planet:2"} -{"gid": "Character:5-films-Film:1", "label": "films", "from": "Character:5", "to": "Film:1"} -{"gid": "Character:5-species-Species:1", "label": "species", "from": "Character:5", "to": "Species:1"} -{"gid": "Character:6-homeworld-Planet:1", "label": "homeworld", "from": "Character:6", "to": "Planet:1"} -{"gid": "Character:6-films-Film:1", "label": "films", "from": "Character:6", "to": "Film:1"} -{"gid": "Character:6-species-Species:1", "label": "species", "from": "Character:6", "to": "Species:1"} -{"gid": "Character:7-homeworld-Planet:1", "label": "homeworld", "from": "Character:7", "to": "Planet:1"} -{"gid": "Character:7-films-Film:1", "label": "films", "from": "Character:7", "to": "Film:1"} -{"gid": "Character:7-species-Species:1", "label": "species", "from": "Character:7", "to": "Species:1"} -{"gid": "Character:8-homeworld-Planet:1", "label": "homeworld", "from": "Character:8", "to": "Planet:1"} -{"gid": "Character:8-films-Film:1", "label": "films", "from": "Character:8", "to": "Film:1"} -{"gid": "Character:8-species-Species:2", "label": "species", "from": "Character:8", "to": "Species:2"} -{"gid": "Character:9-homeworld-Planet:1", "label": "homeworld", "from": "Character:9", "to": "Planet:1"} -{"gid": "Character:9-films-Film:1", "label": "films", "from": "Character:9", "to": "Film:1"} -{"gid": "Character:9-species-Species:1", "label": "species", "from": "Character:9", "to": "Species:1"} -{"gid": "Character:9-starships-Starship:12", "label": "starships", "from": "Character:9", "to": "Starship:12"} -{"gid": "Character:10-films-Film:1", "label": "films", "from": "Character:10", "to": "Film:1"} -{"gid": "Character:10-species-Species:1", "label": "species", "from": "Character:10", "to": "Species:1"} -{"gid": "Character:12-films-Film:1", "label": "films", "from": "Character:12", "to": "Film:1"} -{"gid": "Character:12-species-Species:1", "label": "species", "from": "Character:12", "to": "Species:1"} -{"gid": "Character:13-films-Film:1", "label": "films", "from": "Character:13", "to": "Film:1"} -{"gid": "Character:13-species-Species:3", "label": "species", "from": "Character:13", "to": "Species:3"} -{"gid": "Character:13-starships-Starship:10", "label": "starships", "from": "Character:13", "to": "Starship:10"} -{"gid": "Character:14-films-Film:1", "label": "films", "from": "Character:14", "to": "Film:1"} -{"gid": "Character:14-species-Species:1", "label": "species", "from": "Character:14", "to": "Species:1"} -{"gid": "Character:14-starships-Starship:10", "label": "starships", "from": "Character:14", "to": "Starship:10"} -{"gid": "Character:15-films-Film:1", "label": "films", "from": "Character:15", "to": "Film:1"} -{"gid": "Character:15-species-Species:4", "label": "species", "from": "Character:15", "to": "Species:4"} -{"gid": "Character:16-films-Film:1", "label": "films", "from": "Character:16", "to": "Film:1"} -{"gid": "Character:16-species-Species:5", "label": "species", "from": "Character:16", "to": "Species:5"} -{"gid": "Character:18-films-Film:1", "label": "films", "from": "Character:18", "to": "Film:1"} -{"gid": "Character:18-species-Species:1", "label": "species", "from": "Character:18", "to": "Species:1"} -{"gid": "Character:18-starships-Starship:12", "label": "starships", "from": "Character:18", "to": "Starship:12"} -{"gid": "Character:19-films-Film:1", "label": "films", "from": "Character:19", "to": "Film:1"} -{"gid": "Character:19-species-Species:1", "label": "species", "from": "Character:19", "to": "Species:1"} -{"gid": "Character:19-starships-Starship:12", "label": "starships", "from": "Character:19", "to": "Starship:12"} -{"gid": "Character:81-homeworld-Planet:2", "label": "homeworld", "from": "Character:81", "to": "Planet:2"} -{"gid": "Character:81-films-Film:1", "label": "films", "from": "Character:81", "to": "Film:1"} -{"gid": "Character:81-species-Species:1", "label": "species", "from": "Character:81", "to": "Species:1"} -{"gid": "Planet:2-residents-Character:5", "label": "residents", "from": "Planet:2", "to": "Character:5"} -{"gid": "Planet:2-residents-Character:81", "label": "residents", "from": "Planet:2", "to": "Character:81"} -{"gid": "Planet:2-films-Film:1", "label": "films", "from": "Planet:2", "to": "Film:1"} -{"gid": "Planet:3-films-Film:1", "label": "films", "from": "Planet:3", "to": "Film:1"} -{"gid": "Planet:1-residents-Character:1", "label": "residents", "from": "Planet:1", "to": "Character:1"} -{"gid": "Planet:1-residents-Character:2", "label": "residents", "from": "Planet:1", "to": "Character:2"} -{"gid": "Planet:1-residents-Character:4", "label": "residents", "from": "Planet:1", "to": "Character:4"} -{"gid": "Planet:1-residents-Character:6", "label": "residents", "from": "Planet:1", "to": "Character:6"} -{"gid": "Planet:1-residents-Character:7", "label": "residents", "from": "Planet:1", "to": "Character:7"} -{"gid": "Planet:1-residents-Character:8", "label": "residents", "from": "Planet:1", "to": "Character:8"} -{"gid": "Planet:1-residents-Character:9", "label": "residents", "from": "Planet:1", "to": "Character:9"} -{"gid": "Planet:1-films-Film:1", "label": "films", "from": "Planet:1", "to": "Film:1"} -{"gid": "Species:5-people-Character:16", "label": "people", "from": "Species:5", "to": "Character:16"} -{"gid": "Species:5-films-Film:1", "label": "films", "from": "Species:5", "to": "Film:1"} -{"gid": "Species:3-people-Character:13", "label": "people", "from": "Species:3", "to": "Character:13"} -{"gid": "Species:3-films-Film:1", "label": "films", "from": "Species:3", "to": "Film:1"} -{"gid": "Species:2-people-Character:2", "label": "people", "from": "Species:2", "to": "Character:2"} -{"gid": "Species:2-people-Character:3", "label": "people", "from": "Species:2", "to": "Character:3"} -{"gid": "Species:2-people-Character:8", "label": "people", "from": "Species:2", "to": "Character:8"} -{"gid": "Species:2-films-Film:1", "label": "films", "from": "Species:2", "to": "Film:1"} -{"gid": "Species:1-people-Character:1", "label": "people", "from": "Species:1", "to": "Character:1"} -{"gid": "Species:1-people-Character:4", "label": "people", "from": "Species:1", "to": "Character:4"} -{"gid": "Species:1-people-Character:5", "label": "people", "from": "Species:1", "to": "Character:5"} -{"gid": "Species:1-people-Character:6", "label": "people", "from": "Species:1", "to": "Character:6"} -{"gid": "Species:1-people-Character:7", "label": "people", "from": "Species:1", "to": "Character:7"} -{"gid": "Species:1-people-Character:9", "label": "people", "from": "Species:1", "to": "Character:9"} -{"gid": "Species:1-people-Character:10", "label": "people", "from": "Species:1", "to": "Character:10"} -{"gid": "Species:1-people-Character:12", "label": "people", "from": "Species:1", "to": "Character:12"} -{"gid": "Species:1-people-Character:14", "label": "people", "from": "Species:1", "to": "Character:14"} -{"gid": "Species:1-people-Character:18", "label": "people", "from": "Species:1", "to": "Character:18"} -{"gid": "Species:1-people-Character:19", "label": "people", "from": "Species:1", "to": "Character:19"} -{"gid": "Species:1-people-Character:81", "label": "people", "from": "Species:1", "to": "Character:81"} -{"gid": "Species:1-films-Film:1", "label": "films", "from": "Species:1", "to": "Film:1"} -{"gid": "Species:4-people-Character:15", "label": "people", "from": "Species:4", "to": "Character:15"} -{"gid": "Species:4-films-Film:1", "label": "films", "from": "Species:4", "to": "Film:1"} -{"gid": "Starship:5-films-Film:1", "label": "films", "from": "Starship:5", "to": "Film:1"} -{"gid": "Starship:9-films-Film:1", "label": "films", "from": "Starship:9", "to": "Film:1"} -{"gid": "Starship:10-pilots-Character:13", "label": "pilots", "from": "Starship:10", "to": "Character:13"} -{"gid": "Starship:10-pilots-Character:14", "label": "pilots", "from": "Starship:10", "to": "Character:14"} -{"gid": "Starship:10-films-Film:1", "label": "films", "from": "Starship:10", "to": "Film:1"} -{"gid": "Starship:11-films-Film:1", "label": "films", "from": "Starship:11", "to": "Film:1"} -{"gid": "Starship:12-pilots-Character:1", "label": "pilots", "from": "Starship:12", "to": "Character:1"} -{"gid": "Starship:12-pilots-Character:9", "label": "pilots", "from": "Starship:12", "to": "Character:9"} -{"gid": "Starship:12-pilots-Character:18", "label": "pilots", "from": "Starship:12", "to": "Character:18"} -{"gid": "Starship:12-pilots-Character:19", "label": "pilots", "from": "Starship:12", "to": "Character:19"} -{"gid": "Starship:12-films-Film:1", "label": "films", "from": "Starship:12", "to": "Film:1"} -{"gid": "Starship:13-pilots-Character:4", "label": "pilots", "from": "Starship:13", "to": "Character:4"} -{"gid": "Starship:13-films-Film:1", "label": "films", "from": "Starship:13", "to": "Film:1"} -{"gid": "Starship:3-films-Film:1", "label": "films", "from": "Starship:3", "to": "Film:1"} -{"gid": "Starship:2-films-Film:1", "label": "films", "from": "Starship:2", "to": "Film:1"} -{"gid": "Vehicle:4-films-Film:1", "label": "films", "from": "Vehicle:4", "to": "Film:1"} -{"gid": "Vehicle:6-films-Film:1", "label": "films", "from": "Vehicle:6", "to": "Film:1"} -{"gid": "Vehicle:7-films-Film:1", "label": "films", "from": "Vehicle:7", "to": "Film:1"} -{"gid": "Vehicle:8-films-Film:1", "label": "films", "from": "Vehicle:8", "to": "Film:1"} +{"_id": "Film:1-characters-Character:1", "_label": "characters", "_from": "Film:1", "_to": "Character:1"} +{"_id": "Film:1-characters-Character:2", "_label": "characters", "_from": "Film:1", "_to": "Character:2"} +{"_id": "Film:1-characters-Character:3", "_label": "characters", "_from": "Film:1", "_to": "Character:3"} +{"_id": "Film:1-characters-Character:4", "_label": "characters", "_from": "Film:1", "_to": "Character:4"} +{"_id": "Film:1-characters-Character:5", "_label": "characters", "_from": "Film:1", "_to": "Character:5"} +{"_id": "Film:1-characters-Character:6", "_label": "characters", "_from": "Film:1", "_to": "Character:6"} +{"_id": "Film:1-characters-Character:7", "_label": "characters", "_from": "Film:1", "_to": "Character:7"} +{"_id": "Film:1-characters-Character:8", "_label": "characters", "_from": "Film:1", "_to": "Character:8"} +{"_id": "Film:1-characters-Character:9", "_label": "characters", "_from": "Film:1", "_to": "Character:9"} +{"_id": "Film:1-characters-Character:10", "_label": "characters", "_from": "Film:1", "_to": "Character:10"} +{"_id": "Film:1-characters-Character:12", "_label": "characters", "_from": "Film:1", "_to": "Character:12"} +{"_id": "Film:1-characters-Character:13", "_label": "characters", "_from": "Film:1", "_to": "Character:13"} +{"_id": "Film:1-characters-Character:14", "_label": "characters", "_from": "Film:1", "_to": "Character:14"} +{"_id": "Film:1-characters-Character:15", "_label": "characters", "_from": "Film:1", "_to": "Character:15"} +{"_id": "Film:1-characters-Character:16", "_label": "characters", "_from": "Film:1", "_to": "Character:16"} +{"_id": "Film:1-characters-Character:18", "_label": "characters", "_from": "Film:1", "_to": "Character:18"} +{"_id": "Film:1-characters-Character:19", "_label": "characters", "_from": "Film:1", "_to": "Character:19"} +{"_id": "Film:1-characters-Character:81", "_label": "characters", "_from": "Film:1", "_to": "Character:81"} +{"_id": "Film:1-planets-Planet:2", "_label": "planets", "_from": "Film:1", "_to": "Planet:2", "scene_count" : 10} +{"_id": "Film:1-planets-Planet:3", "_label": "planets", "_from": "Film:1", "_to": "Planet:3", "scene_count" : 15} +{"_id": "Film:1-planets-Planet:1", "_label": "planets", "_from": "Film:1", "_to": "Planet:1", "scene_count" : 20} +{"_id": "Film:1-starships-Starship:2", "_label": "starships", "_from": "Film:1", "_to": "Starship:2"} +{"_id": "Film:1-starships-Starship:3", "_label": "starships", "_from": "Film:1", "_to": "Starship:3"} +{"_id": "Film:1-starships-Starship:5", "_label": "starships", "_from": "Film:1", "_to": "Starship:5"} +{"_id": "Film:1-starships-Starship:9", "_label": "starships", "_from": "Film:1", "_to": "Starship:9"} +{"_id": "Film:1-starships-Starship:10", "_label": "starships", "_from": "Film:1", "_to": "Starship:10"} +{"_id": "Film:1-starships-Starship:11", "_label": "starships", "_from": "Film:1", "_to": "Starship:11"} +{"_id": "Film:1-starships-Starship:12", "_label": "starships", "_from": "Film:1", "_to": "Starship:12"} +{"_id": "Film:1-starships-Starship:13", "_label": "starships", "_from": "Film:1", "_to": "Starship:13"} +{"_id": "Film:1-vehicles-Vehicle:4", "_label": "vehicles", "_from": "Film:1", "_to": "Vehicle:4"} +{"_id": "Film:1-vehicles-Vehicle:6", "_label": "vehicles", "_from": "Film:1", "_to": "Vehicle:6"} +{"_id": "Film:1-vehicles-Vehicle:7", "_label": "vehicles", "_from": "Film:1", "_to": "Vehicle:7"} +{"_id": "Film:1-vehicles-Vehicle:8", "_label": "vehicles", "_from": "Film:1", "_to": "Vehicle:8"} +{"_id": "Film:1-species-Species:5", "_label": "species", "_from": "Film:1", "_to": "Species:5"} +{"_id": "Film:1-species-Species:3", "_label": "species", "_from": "Film:1", "_to": "Species:3"} +{"_id": "Film:1-species-Species:2", "_label": "species", "_from": "Film:1", "_to": "Species:2"} +{"_id": "Film:1-species-Species:1", "_label": "species", "_from": "Film:1", "_to": "Species:1"} +{"_id": "Film:1-species-Species:4", "_label": "species", "_from": "Film:1", "_to": "Species:4"} +{"_id": "Character:1-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:1", "_to": "Planet:1"} +{"_id": "Character:1-films-Film:1", "_label": "films", "_from": "Character:1", "_to": "Film:1"} +{"_id": "Character:1-species-Species:1", "_label": "species", "_from": "Character:1", "_to": "Species:1"} +{"_id": "Character:1-starships-Starship:12", "_label": "starships", "_from": "Character:1", "_to": "Starship:12"} +{"_id": "Character:2-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:2", "_to": "Planet:1"} +{"_id": "Character:2-films-Film:1", "_label": "films", "_from": "Character:2", "_to": "Film:1"} +{"_id": "Character:2-species-Species:2", "_label": "species", "_from": "Character:2", "_to": "Species:2"} +{"_id": "Character:3-films-Film:1", "_label": "films", "_from": "Character:3", "_to": "Film:1"} +{"_id": "Character:3-species-Species:2", "_label": "species", "_from": "Character:3", "_to": "Species:2"} +{"_id": "Character:4-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:4", "_to": "Planet:1"} +{"_id": "Character:4-films-Film:1", "_label": "films", "_from": "Character:4", "_to": "Film:1"} +{"_id": "Character:4-species-Species:1", "_label": "species", "_from": "Character:4", "_to": "Species:1"} +{"_id": "Character:4-starships-Starship:13", "_label": "starships", "_from": "Character:4", "_to": "Starship:13"} +{"_id": "Character:5-homeworld-Planet:2", "_label": "homeworld", "_from": "Character:5", "_to": "Planet:2"} +{"_id": "Character:5-films-Film:1", "_label": "films", "_from": "Character:5", "_to": "Film:1"} +{"_id": "Character:5-species-Species:1", "_label": "species", "_from": "Character:5", "_to": "Species:1"} +{"_id": "Character:6-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:6", "_to": "Planet:1"} +{"_id": "Character:6-films-Film:1", "_label": "films", "_from": "Character:6", "_to": "Film:1"} +{"_id": "Character:6-species-Species:1", "_label": "species", "_from": "Character:6", "_to": "Species:1"} +{"_id": "Character:7-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:7", "_to": "Planet:1"} +{"_id": "Character:7-films-Film:1", "_label": "films", "_from": "Character:7", "_to": "Film:1"} +{"_id": "Character:7-species-Species:1", "_label": "species", "_from": "Character:7", "_to": "Species:1"} +{"_id": "Character:8-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:8", "_to": "Planet:1"} +{"_id": "Character:8-films-Film:1", "_label": "films", "_from": "Character:8", "_to": "Film:1"} +{"_id": "Character:8-species-Species:2", "_label": "species", "_from": "Character:8", "_to": "Species:2"} +{"_id": "Character:9-homeworld-Planet:1", "_label": "homeworld", "_from": "Character:9", "_to": "Planet:1"} +{"_id": "Character:9-films-Film:1", "_label": "films", "_from": "Character:9", "_to": "Film:1"} +{"_id": "Character:9-species-Species:1", "_label": "species", "_from": "Character:9", "_to": "Species:1"} +{"_id": "Character:9-starships-Starship:12", "_label": "starships", "_from": "Character:9", "_to": "Starship:12"} +{"_id": "Character:10-films-Film:1", "_label": "films", "_from": "Character:10", "_to": "Film:1"} +{"_id": "Character:10-species-Species:1", "_label": "species", "_from": "Character:10", "_to": "Species:1"} +{"_id": "Character:12-films-Film:1", "_label": "films", "_from": "Character:12", "_to": "Film:1"} +{"_id": "Character:12-species-Species:1", "_label": "species", "_from": "Character:12", "_to": "Species:1"} +{"_id": "Character:13-films-Film:1", "_label": "films", "_from": "Character:13", "_to": "Film:1"} +{"_id": "Character:13-species-Species:3", "_label": "species", "_from": "Character:13", "_to": "Species:3"} +{"_id": "Character:13-starships-Starship:10", "_label": "starships", "_from": "Character:13", "_to": "Starship:10"} +{"_id": "Character:14-films-Film:1", "_label": "films", "_from": "Character:14", "_to": "Film:1"} +{"_id": "Character:14-species-Species:1", "_label": "species", "_from": "Character:14", "_to": "Species:1"} +{"_id": "Character:14-starships-Starship:10", "_label": "starships", "_from": "Character:14", "_to": "Starship:10"} +{"_id": "Character:15-films-Film:1", "_label": "films", "_from": "Character:15", "_to": "Film:1"} +{"_id": "Character:15-species-Species:4", "_label": "species", "_from": "Character:15", "_to": "Species:4"} +{"_id": "Character:16-films-Film:1", "_label": "films", "_from": "Character:16", "_to": "Film:1"} +{"_id": "Character:16-species-Species:5", "_label": "species", "_from": "Character:16", "_to": "Species:5"} +{"_id": "Character:18-films-Film:1", "_label": "films", "_from": "Character:18", "_to": "Film:1"} +{"_id": "Character:18-species-Species:1", "_label": "species", "_from": "Character:18", "_to": "Species:1"} +{"_id": "Character:18-starships-Starship:12", "_label": "starships", "_from": "Character:18", "_to": "Starship:12"} +{"_id": "Character:19-films-Film:1", "_label": "films", "_from": "Character:19", "_to": "Film:1"} +{"_id": "Character:19-species-Species:1", "_label": "species", "_from": "Character:19", "_to": "Species:1"} +{"_id": "Character:19-starships-Starship:12", "_label": "starships", "_from": "Character:19", "_to": "Starship:12"} +{"_id": "Character:81-homeworld-Planet:2", "_label": "homeworld", "_from": "Character:81", "_to": "Planet:2"} +{"_id": "Character:81-films-Film:1", "_label": "films", "_from": "Character:81", "_to": "Film:1"} +{"_id": "Character:81-species-Species:1", "_label": "species", "_from": "Character:81", "_to": "Species:1"} +{"_id": "Planet:2-residents-Character:5", "_label": "residents", "_from": "Planet:2", "_to": "Character:5"} +{"_id": "Planet:2-residents-Character:81", "_label": "residents", "_from": "Planet:2", "_to": "Character:81"} +{"_id": "Planet:2-films-Film:1", "_label": "films", "_from": "Planet:2", "_to": "Film:1"} +{"_id": "Planet:3-films-Film:1", "_label": "films", "_from": "Planet:3", "_to": "Film:1"} +{"_id": "Planet:1-residents-Character:1", "_label": "residents", "_from": "Planet:1", "_to": "Character:1"} +{"_id": "Planet:1-residents-Character:2", "_label": "residents", "_from": "Planet:1", "_to": "Character:2"} +{"_id": "Planet:1-residents-Character:4", "_label": "residents", "_from": "Planet:1", "_to": "Character:4"} +{"_id": "Planet:1-residents-Character:6", "_label": "residents", "_from": "Planet:1", "_to": "Character:6"} +{"_id": "Planet:1-residents-Character:7", "_label": "residents", "_from": "Planet:1", "_to": "Character:7"} +{"_id": "Planet:1-residents-Character:8", "_label": "residents", "_from": "Planet:1", "_to": "Character:8"} +{"_id": "Planet:1-residents-Character:9", "_label": "residents", "_from": "Planet:1", "_to": "Character:9"} +{"_id": "Planet:1-films-Film:1", "_label": "films", "_from": "Planet:1", "_to": "Film:1"} +{"_id": "Species:5-people-Character:16", "_label": "people", "_from": "Species:5", "_to": "Character:16"} +{"_id": "Species:5-films-Film:1", "_label": "films", "_from": "Species:5", "_to": "Film:1"} +{"_id": "Species:3-people-Character:13", "_label": "people", "_from": "Species:3", "_to": "Character:13"} +{"_id": "Species:3-films-Film:1", "_label": "films", "_from": "Species:3", "_to": "Film:1"} +{"_id": "Species:2-people-Character:2", "_label": "people", "_from": "Species:2", "_to": "Character:2"} +{"_id": "Species:2-people-Character:3", "_label": "people", "_from": "Species:2", "_to": "Character:3"} +{"_id": "Species:2-people-Character:8", "_label": "people", "_from": "Species:2", "_to": "Character:8"} +{"_id": "Species:2-films-Film:1", "_label": "films", "_from": "Species:2", "_to": "Film:1"} +{"_id": "Species:1-people-Character:1", "_label": "people", "_from": "Species:1", "_to": "Character:1"} +{"_id": "Species:1-people-Character:4", "_label": "people", "_from": "Species:1", "_to": "Character:4"} +{"_id": "Species:1-people-Character:5", "_label": "people", "_from": "Species:1", "_to": "Character:5"} +{"_id": "Species:1-people-Character:6", "_label": "people", "_from": "Species:1", "_to": "Character:6"} +{"_id": "Species:1-people-Character:7", "_label": "people", "_from": "Species:1", "_to": "Character:7"} +{"_id": "Species:1-people-Character:9", "_label": "people", "_from": "Species:1", "_to": "Character:9"} +{"_id": "Species:1-people-Character:10", "_label": "people", "_from": "Species:1", "_to": "Character:10"} +{"_id": "Species:1-people-Character:12", "_label": "people", "_from": "Species:1", "_to": "Character:12"} +{"_id": "Species:1-people-Character:14", "_label": "people", "_from": "Species:1", "_to": "Character:14"} +{"_id": "Species:1-people-Character:18", "_label": "people", "_from": "Species:1", "_to": "Character:18"} +{"_id": "Species:1-people-Character:19", "_label": "people", "_from": "Species:1", "_to": "Character:19"} +{"_id": "Species:1-people-Character:81", "_label": "people", "_from": "Species:1", "_to": "Character:81"} +{"_id": "Species:1-films-Film:1", "_label": "films", "_from": "Species:1", "_to": "Film:1"} +{"_id": "Species:4-people-Character:15", "_label": "people", "_from": "Species:4", "_to": "Character:15"} +{"_id": "Species:4-films-Film:1", "_label": "films", "_from": "Species:4", "_to": "Film:1"} +{"_id": "Starship:5-films-Film:1", "_label": "films", "_from": "Starship:5", "_to": "Film:1"} +{"_id": "Starship:9-films-Film:1", "_label": "films", "_from": "Starship:9", "_to": "Film:1"} +{"_id": "Starship:10-pilots-Character:13", "_label": "pilots", "_from": "Starship:10", "_to": "Character:13"} +{"_id": "Starship:10-pilots-Character:14", "_label": "pilots", "_from": "Starship:10", "_to": "Character:14"} +{"_id": "Starship:10-films-Film:1", "_label": "films", "_from": "Starship:10", "_to": "Film:1"} +{"_id": "Starship:11-films-Film:1", "_label": "films", "_from": "Starship:11", "_to": "Film:1"} +{"_id": "Starship:12-pilots-Character:1", "_label": "pilots", "_from": "Starship:12", "_to": "Character:1"} +{"_id": "Starship:12-pilots-Character:9", "_label": "pilots", "_from": "Starship:12", "_to": "Character:9"} +{"_id": "Starship:12-pilots-Character:18", "_label": "pilots", "_from": "Starship:12", "_to": "Character:18"} +{"_id": "Starship:12-pilots-Character:19", "_label": "pilots", "_from": "Starship:12", "_to": "Character:19"} +{"_id": "Starship:12-films-Film:1", "_label": "films", "_from": "Starship:12", "_to": "Film:1"} +{"_id": "Starship:13-pilots-Character:4", "_label": "pilots", "_from": "Starship:13", "_to": "Character:4"} +{"_id": "Starship:13-films-Film:1", "_label": "films", "_from": "Starship:13", "_to": "Film:1"} +{"_id": "Starship:3-films-Film:1", "_label": "films", "_from": "Starship:3", "_to": "Film:1"} +{"_id": "Starship:2-films-Film:1", "_label": "films", "_from": "Starship:2", "_to": "Film:1"} +{"_id": "Vehicle:4-films-Film:1", "_label": "films", "_from": "Vehicle:4", "_to": "Film:1"} +{"_id": "Vehicle:6-films-Film:1", "_label": "films", "_from": "Vehicle:6", "_to": "Film:1"} +{"_id": "Vehicle:7-films-Film:1", "_label": "films", "_from": "Vehicle:7", "_to": "Film:1"} +{"_id": "Vehicle:8-films-Film:1", "_label": "films", "_from": "Vehicle:8", "_to": "Film:1"} diff --git a/conformance/graphs/swapi.vertices b/conformance/graphs/swapi.vertices index af3dff55a..eb8079dfb 100644 --- a/conformance/graphs/swapi.vertices +++ b/conformance/graphs/swapi.vertices @@ -1,39 +1,39 @@ -{"gid": "Character:1", "label": "Character", "data": {"system": {"created": "2014-12-09T13:50:51.644000Z", "edited": "2014-12-20T21:17:56.891000Z"}, "name": "Luke Skywalker", "height": 172, "mass": 77, "hair_color": "blond", "skin_color": "fair", "eye_color": "blue", "birth_year": "19BBY", "gender": "male", "url": "https://swapi.co/api/people/1/"}} -{"gid": "Character:2", "label": "Character", "data": {"system": {"created": "2014-12-10T15:10:51.357000Z", "edited": "2014-12-20T21:17:50.309000Z"}, "name": "C-3PO", "height": 167, "mass": 75, "hair_color": null, "skin_color": "gold", "eye_color": "yellow", "birth_year": "112BBY", "gender": null, "url": "https://swapi.co/api/people/2/"}} -{"gid": "Character:3", "label": "Character", "data": {"system": {"created": "2014-12-10T15:11:50.376000Z", "edited": "2014-12-20T21:17:50.311000Z"}, "name": "R2-D2", "height": 96, "mass": 32, "hair_color": null, "skin_color": "white, blue", "eye_color": "red", "birth_year": "33BBY", "gender": null, "url": "https://swapi.co/api/people/3/"}} -{"gid": "Character:4", "label": "Character", "data": {"system": {"created": "2014-12-10T15:18:20.704000Z", "edited": "2014-12-20T21:17:50.313000Z"}, "name": "Darth Vader", "height": 202, "mass": 136, "hair_color": "none", "skin_color": "white", "eye_color": "yellow", "birth_year": "41.9BBY", "gender": "male", "url": "https://swapi.co/api/people/4/"}} -{"gid": "Character:5", "label": "Character", "data": {"system": {"created": "2014-12-10T15:20:09.791000Z", "edited": "2014-12-20T21:17:50.315000Z"}, "name": "Leia Organa", "height": 150, "mass": 49, "hair_color": "brown", "skin_color": "light", "eye_color": "brown", "birth_year": "19BBY", "gender": "female", "url": "https://swapi.co/api/people/5/"}} -{"gid": "Character:6", "label": "Character", "data": {"system": {"created": "2014-12-10T15:52:14.024000Z", "edited": "2014-12-20T21:17:50.317000Z"}, "name": "Owen Lars", "height": 178, "mass": 120, "hair_color": "brown, grey", "skin_color": "light", "eye_color": "blue", "birth_year": "52BBY", "gender": "male", "url": "https://swapi.co/api/people/6/"}} -{"gid": "Character:7", "label": "Character", "data": {"system": {"created": "2014-12-10T15:53:41.121000Z", "edited": "2014-12-20T21:17:50.319000Z"}, "name": "Beru Whitesun lars", "height": 165, "mass": 75, "hair_color": "brown", "skin_color": "light", "eye_color": "blue", "birth_year": "47BBY", "gender": "female", "url": "https://swapi.co/api/people/7/"}} -{"gid": "Character:8", "label": "Character", "data": {"system": {"created": "2014-12-10T15:57:50.959000Z", "edited": "2014-12-20T21:17:50.321000Z"}, "name": "R5-D4", "height": 97, "mass": 32, "hair_color": null, "skin_color": "white, red", "eye_color": "red", "birth_year": "unknown", "gender": null, "url": "https://swapi.co/api/people/8/"}} -{"gid": "Character:9", "label": "Character", "data": {"system": {"created": "2014-12-10T15:59:50.509000Z", "edited": "2014-12-20T21:17:50.323000Z"}, "name": "Biggs Darklighter", "height": 183, "mass": 84, "hair_color": "black", "skin_color": "light", "eye_color": "brown", "birth_year": "24BBY", "gender": "male", "url": "https://swapi.co/api/people/9/"}} -{"gid": "Character:10", "label": "Character", "data": {"system": {"created": "2014-12-10T16:16:29.192000Z", "edited": "2014-12-20T21:17:50.325000Z"}, "name": "Obi-Wan Kenobi", "height": 182, "mass": 77, "hair_color": "auburn, white", "skin_color": "fair", "eye_color": "blue-gray", "birth_year": "57BBY", "gender": "male", "url": "https://swapi.co/api/people/10/"}} -{"gid": "Character:12", "label": "Character", "data": {"system": {"created": "2014-12-10T16:26:56.138000Z", "edited": "2014-12-20T21:17:50.330000Z"}, "name": "Wilhuff Tarkin", "height": 180, "mass": null, "hair_color": "auburn, grey", "skin_color": "fair", "eye_color": "blue", "birth_year": "64BBY", "gender": "male", "url": "https://swapi.co/api/people/12/"}} -{"gid": "Character:13", "label": "Character", "data": {"system": {"created": "2014-12-10T16:42:45.066000Z", "edited": "2014-12-20T21:17:50.332000Z"}, "name": "Chewbacca", "height": 228, "mass": 112, "hair_color": "brown", "skin_color": "unknown", "eye_color": "blue", "birth_year": "200BBY", "gender": "male", "url": "https://swapi.co/api/people/13/"}} -{"gid": "Character:14", "label": "Character", "data": {"system": {"created": "2014-12-10T16:49:14.582000Z", "edited": "2014-12-20T21:17:50.334000Z"}, "name": "Han Solo", "height": 180, "mass": 80, "hair_color": "brown", "skin_color": "fair", "eye_color": "brown", "birth_year": "29BBY", "gender": "male", "url": "https://swapi.co/api/people/14/"}} -{"gid": "Character:15", "label": "Character", "data": {"system": {"created": "2014-12-10T17:03:30.334000Z", "edited": "2014-12-20T21:17:50.336000Z"}, "name": "Greedo", "height": 173, "mass": 74, "hair_color": null, "skin_color": "green", "eye_color": "black", "birth_year": "44BBY", "gender": "male", "url": "https://swapi.co/api/people/15/"}} -{"gid": "Character:16", "label": "Character", "data": {"system": {"created": "2014-12-10T17:11:31.638000Z", "edited": "2014-12-20T21:17:50.338000Z"}, "name": "Jabba Desilijic Tiure", "height": 175, "mass": null, "hair_color": null, "skin_color": "green-tan, brown", "eye_color": "orange", "birth_year": "600BBY", "gender": "hermaphrodite", "url": "https://swapi.co/api/people/16/"}} -{"gid": "Character:18", "label": "Character", "data": {"system": {"created": "2014-12-12T11:08:06.469000Z", "edited": "2014-12-20T21:17:50.341000Z"}, "name": "Wedge Antilles", "height": 170, "mass": 77, "hair_color": "brown", "skin_color": "fair", "eye_color": "hazel", "birth_year": "21BBY", "gender": "male", "url": "https://swapi.co/api/people/18/"}} -{"gid": "Character:19", "label": "Character", "data": {"system": {"created": "2014-12-12T11:16:56.569000Z", "edited": "2014-12-20T21:17:50.343000Z"}, "name": "Jek Tono Porkins", "height": 180, "mass": 110, "hair_color": "brown", "skin_color": "fair", "eye_color": "blue", "birth_year": "unknown", "gender": "male", "url": "https://swapi.co/api/people/19/"}} -{"gid": "Character:81", "label": "Character", "data": {"system": {"created": "2014-12-20T19:49:35.583000Z", "edited": "2014-12-20T21:17:50.493000Z"}, "name": "Raymus Antilles", "height": 188, "mass": 79, "hair_color": "brown", "skin_color": "light", "eye_color": "brown", "birth_year": "unknown", "gender": "male", "url": "https://swapi.co/api/people/81/"}} -{"gid": "Planet:2", "label": "Planet", "data": {"system": {"created": "2014-12-10T11:35:48.479000Z", "edited": "2014-12-20T20:58:18.420000Z"}, "name": "Alderaan", "rotation_period": 24, "orbital_period": 364, "diameter": 12500, "climate": "temperate", "gravity": null, "terrain": ["grasslands", "mountains"], "surface_water": 40, "population": 2000000000, "url": "https://swapi.co/api/planets/2/"}} -{"gid": "Planet:3", "label": "Planet", "data": {"system": {"created": "2014-12-10T11:37:19.144000Z", "edited": "2014-12-20T20:58:18.421000Z"}, "name": "Yavin IV", "rotation_period": 24, "orbital_period": 4818, "diameter": 10200, "climate": "temperate, tropical", "gravity": null, "terrain": ["jungle", "rainforests"], "surface_water": 8, "population": 1000, "url": "https://swapi.co/api/planets/3/"}} -{"gid": "Planet:1", "label": "Planet", "data": {"system": {"created": "2014-12-09T13:50:49.641000Z", "edited": "2014-12-21T20:48:04.175778Z"}, "name": "Tatooine", "rotation_period": 23, "orbital_period": 304, "diameter": 10465, "climate": "arid", "gravity": null, "terrain": ["desert"], "surface_water": 1, "population": 200000, "url": "https://swapi.co/api/planets/1/"}} -{"gid": "Starship:2", "label": "Starship", "data": {"system": {"created": "2014-12-10T14:20:33.369000Z", "edited": "2014-12-22T17:35:45.408368Z"}, "name": "CR90 corvette", "model": "CR90 corvette", "manufacturer": "Corellian Engineering Corporation", "cost_in_credits": 3500000, "length": 150.0, "max_atmosphering_speed": 950, "crew": 165, "passengers": 600, "cargo_capacity": 3000000, "consumables": "1 year", "hyperdrive_rating": 2.0, "MGLT": "60", "starship_class": "corvette", "url": "https://swapi.co/api/starships/2/"}} -{"gid": "Starship:3", "label": "Starship", "data": {"system": {"created": "2014-12-10T15:08:19.848000Z", "edited": "2014-12-22T17:35:44.410941Z"}, "name": "Star Destroyer", "model": "Imperial I-class Star Destroyer", "manufacturer": "Kuat Drive Yards", "cost_in_credits": 150000000, "length": null, "max_atmosphering_speed": 975, "crew": 47060, "passengers": 0, "cargo_capacity": 36000000, "consumables": "2 years", "hyperdrive_rating": 2.0, "MGLT": "60", "starship_class": "Star Destroyer", "url": "https://swapi.co/api/starships/3/"}} -{"gid": "Starship:5", "label": "Starship", "data": {"system": {"created": "2014-12-10T15:48:00.586000Z", "edited": "2014-12-22T17:35:44.431407Z"}, "name": "Sentinel-class landing craft", "model": "Sentinel-class landing craft", "manufacturer": "Sienar Fleet Systems, Cyngus Spaceworks", "cost_in_credits": 240000, "length": 38.0, "max_atmosphering_speed": 1000, "crew": 5, "passengers": 75, "cargo_capacity": 180000, "consumables": "1 month", "hyperdrive_rating": 1.0, "MGLT": "70", "starship_class": "landing craft", "url": "https://swapi.co/api/starships/5/"}} -{"gid": "Starship:9", "label": "Starship", "data": {"system": {"created": "2014-12-10T16:36:50.509000Z", "edited": "2014-12-22T17:35:44.452589Z"}, "name": "Death Star", "model": "DS-1 Orbital Battle Station", "manufacturer": "Imperial Department of Military Research, Sienar Fleet Systems", "cost_in_credits": 1000000000000, "length": 120000.0, "max_atmosphering_speed": null, "crew": 342953, "passengers": 843342, "cargo_capacity": 1000000000000, "consumables": "3 years", "hyperdrive_rating": 4.0, "MGLT": "10", "starship_class": "Deep Space Mobile Battlestation", "url": "https://swapi.co/api/starships/9/"}} -{"gid": "Starship:10", "label": "Starship", "data": {"system": {"created": "2014-12-10T16:59:45.094000Z", "edited": "2014-12-22T17:35:44.464156Z"}, "name": "Millennium Falcon", "model": "YT-1300 light freighter", "manufacturer": "Corellian Engineering Corporation", "cost_in_credits": 100000, "length": 34.37, "max_atmosphering_speed": 1050, "crew": 4, "passengers": 6, "cargo_capacity": 100000, "consumables": "2 months", "hyperdrive_rating": 0.5, "MGLT": "75", "starship_class": "Light freighter", "url": "https://swapi.co/api/starships/10/"}} -{"gid": "Starship:11", "label": "Starship", "data": {"system": {"created": "2014-12-12T11:00:39.817000Z", "edited": "2014-12-22T17:35:44.479706Z"}, "name": "Y-wing", "model": "BTL Y-wing", "manufacturer": "Koensayr Manufacturing", "cost_in_credits": 134999, "length": 14.0, "max_atmosphering_speed": null, "crew": 2, "passengers": 0, "cargo_capacity": 110, "consumables": "1 week", "hyperdrive_rating": 1.0, "MGLT": "80", "starship_class": "assault starfighter", "url": "https://swapi.co/api/starships/11/"}} -{"gid": "Starship:12", "label": "Starship", "data": {"system": {"created": "2014-12-12T11:19:05.340000Z", "edited": "2014-12-22T17:35:44.491233Z"}, "name": "X-wing", "model": "T-65 X-wing", "manufacturer": "Incom Corporation", "cost_in_credits": 149999, "length": 12.5, "max_atmosphering_speed": 1050, "crew": 1, "passengers": 0, "cargo_capacity": 110, "consumables": "1 week", "hyperdrive_rating": 1.0, "MGLT": "100", "starship_class": "Starfighter", "url": "https://swapi.co/api/starships/12/"}} -{"gid": "Starship:13", "label": "Starship", "data": {"system": {"created": "2014-12-12T11:21:32.991000Z", "edited": "2014-12-22T17:35:44.549047Z"}, "name": "TIE Advanced x1", "model": "Twin Ion Engine Advanced x1", "manufacturer": "Sienar Fleet Systems", "cost_in_credits": null, "length": 9.2, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 0, "cargo_capacity": 150, "consumables": "5 days", "hyperdrive_rating": 1.0, "MGLT": "105", "starship_class": "Starfighter", "url": "https://swapi.co/api/starships/13/"}} -{"gid": "Vehicle:4", "label": "Vehicle", "data": {"system": {"created": "2014-12-10T15:36:25.724000Z", "edited": "2014-12-22T18:21:15.523587Z"}, "name": "Sand Crawler", "model": "Digger Crawler", "manufacturer": "Corellia Mining Corporation", "cost_in_credits": 150000, "length": 36.8, "max_atmosphering_speed": 30, "crew": 46, "passengers": 30, "cargo_capacity": 50000, "consumables": "2 months", "vehicle_class": "wheeled", "url": "https://swapi.co/api/vehicles/4/"}} -{"gid": "Vehicle:6", "label": "Vehicle", "data": {"system": {"created": "2014-12-10T16:01:52.434000Z", "edited": "2014-12-22T18:21:15.552614Z"}, "name": "T-16 skyhopper", "model": "T-16 skyhopper", "manufacturer": "Incom Corporation", "cost_in_credits": 14500, "length": 10.4, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 1, "cargo_capacity": 50, "consumables": "0", "vehicle_class": "repulsorcraft", "url": "https://swapi.co/api/vehicles/6/"}} -{"gid": "Vehicle:7", "label": "Vehicle", "data": {"system": {"created": "2014-12-10T16:13:52.586000Z", "edited": "2014-12-22T18:21:15.583700Z"}, "name": "X-34 landspeeder", "model": "X-34 landspeeder", "manufacturer": "SoroSuub Corporation", "cost_in_credits": 10550, "length": 3.4, "max_atmosphering_speed": 250, "crew": 1, "passengers": 1, "cargo_capacity": 5, "consumables": "unknown", "vehicle_class": "repulsorcraft", "url": "https://swapi.co/api/vehicles/7/"}} -{"gid": "Vehicle:8", "label": "Vehicle", "data": {"system": {"created": "2014-12-10T16:33:52.860000Z", "edited": "2014-12-22T18:21:15.606149Z"}, "name": "TIE/LN starfighter", "model": "Twin Ion Engine/Ln Starfighter", "manufacturer": "Sienar Fleet Systems", "cost_in_credits": null, "length": 6.4, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 0, "cargo_capacity": 65, "consumables": "2 days", "vehicle_class": "starfighter", "url": "https://swapi.co/api/vehicles/8/"}} -{"gid": "Species:5", "label": "Species", "data": {"system": {"created": "2014-12-10T17:12:50.410000Z", "edited": "2014-12-20T21:36:42.146000Z"}, "name": "Hutt", "classification": "gastropod", "designation": "sentient", "average_height": "300", "skin_colors": ["green", "brown", "tan"], "hair_colors": [], "eye_colors": ["yellow", "red"], "average_lifespan": 1000, "language": "Huttese", "url": "https://swapi.co/api/species/5/"}} -{"gid": "Species:3", "label": "Species", "data": {"system": {"created": "2014-12-10T16:44:31.486000Z", "edited": "2015-01-30T21:23:03.074598Z"}, "name": "Wookiee", "classification": "mammal", "designation": "sentient", "average_height": "210", "skin_colors": ["gray"], "hair_colors": ["black", "brown"], "eye_colors": ["blue", "green", "yellow", "brown", "golden", "red"], "average_lifespan": 400, "language": "Shyriiwook", "url": "https://swapi.co/api/species/3/"}} -{"gid": "Species:2", "label": "Species", "data": {"system": {"created": "2014-12-10T15:16:16.259000Z", "edited": "2015-04-17T06:59:43.869528Z"}, "name": "Droid", "classification": "artificial", "designation": "sentient", "average_height": null, "skin_colors": [], "hair_colors": [], "eye_colors": [], "average_lifespan": null, "language": null, "url": "https://swapi.co/api/species/2/"}} -{"gid": "Species:1", "label": "Species", "data": {"system": {"created": "2014-12-10T13:52:11.567000Z", "edited": "2015-04-17T06:59:55.850671Z"}, "name": "Human", "classification": "mammal", "designation": "sentient", "average_height": "180", "skin_colors": ["caucasian", "black", "asian", "hispanic"], "hair_colors": ["blonde", "brown", "black", "red"], "eye_colors": ["brown", "blue", "green", "hazel", "grey", "amber"], "average_lifespan": 120, "language": "Galactic Basic", "url": "https://swapi.co/api/species/1/"}} -{"gid": "Species:4", "label": "Species", "data": {"system": {"created": "2014-12-10T17:05:26.471000Z", "edited": "2016-07-19T13:27:03.156498Z"}, "name": "Rodian", "classification": "sentient", "designation": "reptilian", "average_height": "170", "skin_colors": ["green", "blue"], "hair_colors": [], "eye_colors": ["black"], "average_lifespan": null, "language": "Galactic Basic", "url": "https://swapi.co/api/species/4/"}} -{"gid": "Film:1", "label": "Film", "data": {"system": {"created": "2014-12-10T14:23:31.880000Z", "edited": "2015-04-11T09:46:52.774897Z"}, "title": "A New Hope", "episode_id": 4, "opening_crawl": "It is a period of civil war.\r\nRebel spaceships, striking\r\nfrom a hidden base, have won\r\ntheir first victory against\r\nthe evil Galactic Empire.\r\n\r\nDuring the battle, Rebel\r\nspies managed to steal secret\r\nplans to the Empire's\r\nultimate weapon, the DEATH\r\nSTAR, an armored space\r\nstation with enough power\r\nto destroy an entire planet.\r\n\r\nPursued by the Empire's\r\nsinister agents, Princess\r\nLeia races home aboard her\r\nstarship, custodian of the\r\nstolen plans that can save her\r\npeople and restore\r\nfreedom to the galaxy....", "director": "George Lucas", "producer": ["Gary Kurtz", "Rick McCallum"], "release_date": "1977-05-25", "url": "https://swapi.co/api/films/1/"}} +{"_id": "Character:1", "_label": "Character", "system": {"created": "2014-12-09T13:50:51.644000Z", "edited": "2014-12-20T21:17:56.891000Z"}, "name": "Luke Skywalker", "height": 172, "mass": 77, "hair_color": "blond", "skin_color": "fair", "eye_color": "blue", "birth_year": "19BBY", "gender": "male", "url": "https://swapi.co/api/people/1/"} +{"_id": "Character:2", "_label": "Character", "system": {"created": "2014-12-10T15:10:51.357000Z", "edited": "2014-12-20T21:17:50.309000Z"}, "name": "C-3PO", "height": 167, "mass": 75, "hair_color": null, "skin_color": "gold", "eye_color": "yellow", "birth_year": "112BBY", "gender": null, "url": "https://swapi.co/api/people/2/"} +{"_id": "Character:3", "_label": "Character", "system": {"created": "2014-12-10T15:11:50.376000Z", "edited": "2014-12-20T21:17:50.311000Z"}, "name": "R2-D2", "height": 96, "mass": 32, "hair_color": null, "skin_color": "white, blue", "eye_color": "red", "birth_year": "33BBY", "gender": null, "url": "https://swapi.co/api/people/3/"} +{"_id": "Character:4", "_label": "Character", "system": {"created": "2014-12-10T15:18:20.704000Z", "edited": "2014-12-20T21:17:50.313000Z"}, "name": "Darth Vader", "height": 202, "mass": 136, "hair_color": "none", "skin_color": "white", "eye_color": "yellow", "birth_year": "41.9BBY", "gender": "male", "url": "https://swapi.co/api/people/4/"} +{"_id": "Character:5", "_label": "Character", "system": {"created": "2014-12-10T15:20:09.791000Z", "edited": "2014-12-20T21:17:50.315000Z"}, "name": "Leia Organa", "height": 150, "mass": 49, "hair_color": "brown", "skin_color": "light", "eye_color": "brown", "birth_year": "19BBY", "gender": "female", "url": "https://swapi.co/api/people/5/"} +{"_id": "Character:6", "_label": "Character", "system": {"created": "2014-12-10T15:52:14.024000Z", "edited": "2014-12-20T21:17:50.317000Z"}, "name": "Owen Lars", "height": 178, "mass": 120, "hair_color": "brown, grey", "skin_color": "light", "eye_color": "blue", "birth_year": "52BBY", "gender": "male", "url": "https://swapi.co/api/people/6/"} +{"_id": "Character:7", "_label": "Character", "system": {"created": "2014-12-10T15:53:41.121000Z", "edited": "2014-12-20T21:17:50.319000Z"}, "name": "Beru Whitesun lars", "height": 165, "mass": 75, "hair_color": "brown", "skin_color": "light", "eye_color": "blue", "birth_year": "47BBY", "gender": "female", "url": "https://swapi.co/api/people/7/"} +{"_id": "Character:8", "_label": "Character", "system": {"created": "2014-12-10T15:57:50.959000Z", "edited": "2014-12-20T21:17:50.321000Z"}, "name": "R5-D4", "height": 97, "mass": 32, "hair_color": null, "skin_color": "white, red", "eye_color": "red", "birth_year": "unknown", "gender": null, "url": "https://swapi.co/api/people/8/"} +{"_id": "Character:9", "_label": "Character", "system": {"created": "2014-12-10T15:59:50.509000Z", "edited": "2014-12-20T21:17:50.323000Z"}, "name": "Biggs Darklighter", "height": 183, "mass": 84, "hair_color": "black", "skin_color": "light", "eye_color": "brown", "birth_year": "24BBY", "gender": "male", "url": "https://swapi.co/api/people/9/"} +{"_id": "Character:10", "_label": "Character", "system": {"created": "2014-12-10T16:16:29.192000Z", "edited": "2014-12-20T21:17:50.325000Z"}, "name": "Obi-Wan Kenobi", "height": 182, "mass": 77, "hair_color": "auburn, white", "skin_color": "fair", "eye_color": "blue-gray", "birth_year": "57BBY", "gender": "male", "url": "https://swapi.co/api/people/10/"} +{"_id": "Character:12", "_label": "Character", "system": {"created": "2014-12-10T16:26:56.138000Z", "edited": "2014-12-20T21:17:50.330000Z"}, "name": "Wilhuff Tarkin", "height": 180, "mass": null, "hair_color": "auburn, grey", "skin_color": "fair", "eye_color": "blue", "birth_year": "64BBY", "gender": "male", "url": "https://swapi.co/api/people/12/"} +{"_id": "Character:13", "_label": "Character", "system": {"created": "2014-12-10T16:42:45.066000Z", "edited": "2014-12-20T21:17:50.332000Z"}, "name": "Chewbacca", "height": 228, "mass": 112, "hair_color": "brown", "skin_color": "unknown", "eye_color": "blue", "birth_year": "200BBY", "gender": "male", "url": "https://swapi.co/api/people/13/"} +{"_id": "Character:14", "_label": "Character", "system": {"created": "2014-12-10T16:49:14.582000Z", "edited": "2014-12-20T21:17:50.334000Z"}, "name": "Han Solo", "height": 180, "mass": 80, "hair_color": "brown", "skin_color": "fair", "eye_color": "brown", "birth_year": "29BBY", "gender": "male", "url": "https://swapi.co/api/people/14/"} +{"_id": "Character:15", "_label": "Character", "system": {"created": "2014-12-10T17:03:30.334000Z", "edited": "2014-12-20T21:17:50.336000Z"}, "name": "Greedo", "height": 173, "mass": 74, "hair_color": null, "skin_color": "green", "eye_color": "black", "birth_year": "44BBY", "gender": "male", "url": "https://swapi.co/api/people/15/"} +{"_id": "Character:16", "_label": "Character", "system": {"created": "2014-12-10T17:11:31.638000Z", "edited": "2014-12-20T21:17:50.338000Z"}, "name": "Jabba Desilijic Tiure", "height": 175, "mass": null, "hair_color": null, "skin_color": "green-tan, brown", "eye_color": "orange", "birth_year": "600BBY", "gender": "hermaphrodite", "url": "https://swapi.co/api/people/16/"} +{"_id": "Character:18", "_label": "Character", "system": {"created": "2014-12-12T11:08:06.469000Z", "edited": "2014-12-20T21:17:50.341000Z"}, "name": "Wedge Antilles", "height": 170, "mass": 77, "hair_color": "brown", "skin_color": "fair", "eye_color": "hazel", "birth_year": "21BBY", "gender": "male", "url": "https://swapi.co/api/people/18/"} +{"_id": "Character:19", "_label": "Character", "system": {"created": "2014-12-12T11:16:56.569000Z", "edited": "2014-12-20T21:17:50.343000Z"}, "name": "Jek Tono Porkins", "height": 180, "mass": 110, "hair_color": "brown", "skin_color": "fair", "eye_color": "blue", "birth_year": "unknown", "gender": "male", "url": "https://swapi.co/api/people/19/"} +{"_id": "Character:81", "_label": "Character", "system": {"created": "2014-12-20T19:49:35.583000Z", "edited": "2014-12-20T21:17:50.493000Z"}, "name": "Raymus Antilles", "height": 188, "mass": 79, "hair_color": "brown", "skin_color": "light", "eye_color": "brown", "birth_year": "unknown", "gender": "male", "url": "https://swapi.co/api/people/81/"} +{"_id": "Planet:2", "_label": "Planet", "system": {"created": "2014-12-10T11:35:48.479000Z", "edited": "2014-12-20T20:58:18.420000Z"}, "name": "Alderaan", "rotation_period": 24, "orbital_period": 364, "diameter": 12500, "climate": "temperate", "gravity": null, "terrain": ["grasslands", "mountains"], "surface_water": 40, "population": 2000000000, "url": "https://swapi.co/api/planets/2/"} +{"_id": "Planet:3", "_label": "Planet", "system": {"created": "2014-12-10T11:37:19.144000Z", "edited": "2014-12-20T20:58:18.421000Z"}, "name": "Yavin IV", "rotation_period": 24, "orbital_period": 4818, "diameter": 10200, "climate": "temperate, tropical", "gravity": null, "terrain": ["jungle", "rainforests"], "surface_water": 8, "population": 1000, "url": "https://swapi.co/api/planets/3/"} +{"_id": "Planet:1", "_label": "Planet", "system": {"created": "2014-12-09T13:50:49.641000Z", "edited": "2014-12-21T20:48:04.175778Z"}, "name": "Tatooine", "rotation_period": 23, "orbital_period": 304, "diameter": 10465, "climate": "ar_id", "gravity": null, "terrain": ["desert"], "surface_water": 1, "population": 200000, "url": "https://swapi.co/api/planets/1/"} +{"_id": "Starship:2", "_label": "Starship", "system": {"created": "2014-12-10T14:20:33.369000Z", "edited": "2014-12-22T17:35:45.408368Z"}, "name": "CR90 corvette", "model": "CR90 corvette", "manufacturer": "Corellian Engineering Corporation", "cost_in_credits": 3500000, "length": 150.0, "max_atmosphering_speed": 950, "crew": 165, "passengers": 600, "cargo_capacity": 3000000, "consumables": "1 year", "hyperdrive_rating": 2.0, "MGLT": "60", "starship_class": "corvette", "url": "https://swapi.co/api/starships/2/"} +{"_id": "Starship:3", "_label": "Starship", "system": {"created": "2014-12-10T15:08:19.848000Z", "edited": "2014-12-22T17:35:44.410941Z"}, "name": "Star Destroyer", "model": "Imperial I-class Star Destroyer", "manufacturer": "Kuat Drive Yards", "cost_in_credits": 150000000, "length": null, "max_atmosphering_speed": 975, "crew": 47060, "passengers": 0, "cargo_capacity": 36000000, "consumables": "2 years", "hyperdrive_rating": 2.0, "MGLT": "60", "starship_class": "Star Destroyer", "url": "https://swapi.co/api/starships/3/"} +{"_id": "Starship:5", "_label": "Starship", "system": {"created": "2014-12-10T15:48:00.586000Z", "edited": "2014-12-22T17:35:44.431407Z"}, "name": "Sentinel-class landing craft", "model": "Sentinel-class landing craft", "manufacturer": "Sienar Fleet Systems, Cyngus Spaceworks", "cost_in_credits": 240000, "length": 38.0, "max_atmosphering_speed": 1000, "crew": 5, "passengers": 75, "cargo_capacity": 180000, "consumables": "1 month", "hyperdrive_rating": 1.0, "MGLT": "70", "starship_class": "landing craft", "url": "https://swapi.co/api/starships/5/"} +{"_id": "Starship:9", "_label": "Starship", "system": {"created": "2014-12-10T16:36:50.509000Z", "edited": "2014-12-22T17:35:44.452589Z"}, "name": "Death Star", "model": "DS-1 Orbital Battle Station", "manufacturer": "Imperial Department of Military Research, Sienar Fleet Systems", "cost_in_credits": 1000000000000, "length": 120000.0, "max_atmosphering_speed": null, "crew": 342953, "passengers": 843342, "cargo_capacity": 1000000000000, "consumables": "3 years", "hyperdrive_rating": 4.0, "MGLT": "10", "starship_class": "Deep Space Mobile Battlestation", "url": "https://swapi.co/api/starships/9/"} +{"_id": "Starship:10", "_label": "Starship", "system": {"created": "2014-12-10T16:59:45.094000Z", "edited": "2014-12-22T17:35:44.464156Z"}, "name": "Millennium Falcon", "model": "YT-1300 light freighter", "manufacturer": "Corellian Engineering Corporation", "cost_in_credits": 100000, "length": 34.37, "max_atmosphering_speed": 1050, "crew": 4, "passengers": 6, "cargo_capacity": 100000, "consumables": "2 months", "hyperdrive_rating": 0.5, "MGLT": "75", "starship_class": "Light freighter", "url": "https://swapi.co/api/starships/10/"} +{"_id": "Starship:11", "_label": "Starship", "system": {"created": "2014-12-12T11:00:39.817000Z", "edited": "2014-12-22T17:35:44.479706Z"}, "name": "Y-wing", "model": "BTL Y-wing", "manufacturer": "Koensayr Manufacturing", "cost_in_credits": 134999, "length": 14.0, "max_atmosphering_speed": null, "crew": 2, "passengers": 0, "cargo_capacity": 110, "consumables": "1 week", "hyperdrive_rating": 1.0, "MGLT": "80", "starship_class": "assault starfighter", "url": "https://swapi.co/api/starships/11/"} +{"_id": "Starship:12", "_label": "Starship", "system": {"created": "2014-12-12T11:19:05.340000Z", "edited": "2014-12-22T17:35:44.491233Z"}, "name": "X-wing", "model": "T-65 X-wing", "manufacturer": "Incom Corporation", "cost_in_credits": 149999, "length": 12.5, "max_atmosphering_speed": 1050, "crew": 1, "passengers": 0, "cargo_capacity": 110, "consumables": "1 week", "hyperdrive_rating": 1.0, "MGLT": "100", "starship_class": "Starfighter", "url": "https://swapi.co/api/starships/12/"} +{"_id": "Starship:13", "_label": "Starship", "system": {"created": "2014-12-12T11:21:32.991000Z", "edited": "2014-12-22T17:35:44.549047Z"}, "name": "TIE Advanced x1", "model": "Twin Ion Engine Advanced x1", "manufacturer": "Sienar Fleet Systems", "cost_in_credits": null, "length": 9.2, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 0, "cargo_capacity": 150, "consumables": "5 days", "hyperdrive_rating": 1.0, "MGLT": "105", "starship_class": "Starfighter", "url": "https://swapi.co/api/starships/13/"} +{"_id": "Vehicle:4", "_label": "Vehicle", "system": {"created": "2014-12-10T15:36:25.724000Z", "edited": "2014-12-22T18:21:15.523587Z"}, "name": "Sand Crawler", "model": "Digger Crawler", "manufacturer": "Corellia Mining Corporation", "cost_in_credits": 150000, "length": 36.8, "max_atmosphering_speed": 30, "crew": 46, "passengers": 30, "cargo_capacity": 50000, "consumables": "2 months", "vehicle_class": "wheeled", "url": "https://swapi.co/api/vehicles/4/"} +{"_id": "Vehicle:6", "_label": "Vehicle", "system": {"created": "2014-12-10T16:01:52.434000Z", "edited": "2014-12-22T18:21:15.552614Z"}, "name": "T-16 skyhopper", "model": "T-16 skyhopper", "manufacturer": "Incom Corporation", "cost_in_credits": 14500, "length": 10.4, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 1, "cargo_capacity": 50, "consumables": "0", "vehicle_class": "repulsorcraft", "url": "https://swapi.co/api/vehicles/6/"} +{"_id": "Vehicle:7", "_label": "Vehicle", "system": {"created": "2014-12-10T16:13:52.586000Z", "edited": "2014-12-22T18:21:15.583700Z"}, "name": "X-34 landspeeder", "model": "X-34 landspeeder", "manufacturer": "SoroSuub Corporation", "cost_in_credits": 10550, "length": 3.4, "max_atmosphering_speed": 250, "crew": 1, "passengers": 1, "cargo_capacity": 5, "consumables": "unknown", "vehicle_class": "repulsorcraft", "url": "https://swapi.co/api/vehicles/7/"} +{"_id": "Vehicle:8", "_label": "Vehicle", "system": {"created": "2014-12-10T16:33:52.860000Z", "edited": "2014-12-22T18:21:15.606149Z"}, "name": "TIE/LN starfighter", "model": "Twin Ion Engine/Ln Starfighter", "manufacturer": "Sienar Fleet Systems", "cost_in_credits": null, "length": 6.4, "max_atmosphering_speed": 1200, "crew": 1, "passengers": 0, "cargo_capacity": 65, "consumables": "2 days", "vehicle_class": "starfighter", "url": "https://swapi.co/api/vehicles/8/"} +{"_id": "Species:5", "_label": "Species", "system": {"created": "2014-12-10T17:12:50.410000Z", "edited": "2014-12-20T21:36:42.146000Z"}, "name": "Hutt", "classification": "gastropod", "designation": "sentient", "average_height": "300", "skin_colors": ["green", "brown", "tan"], "hair_colors": [], "eye_colors": ["yellow", "red"], "average_lifespan": 1000, "language": "Huttese", "url": "https://swapi.co/api/species/5/"} +{"_id": "Species:3", "_label": "Species", "system": {"created": "2014-12-10T16:44:31.486000Z", "edited": "2015-01-30T21:23:03.074598Z"}, "name": "Wookiee", "classification": "mammal", "designation": "sentient", "average_height": "210", "skin_colors": ["gray"], "hair_colors": ["black", "brown"], "eye_colors": ["blue", "green", "yellow", "brown", "golden", "red"], "average_lifespan": 400, "language": "Shyriiwook", "url": "https://swapi.co/api/species/3/"} +{"_id": "Species:2", "_label": "Species", "system": {"created": "2014-12-10T15:16:16.259000Z", "edited": "2015-04-17T06:59:43.869528Z"}, "name": "Droid", "classification": "artificial", "designation": "sentient", "average_height": null, "skin_colors": [], "hair_colors": [], "eye_colors": [], "average_lifespan": null, "language": null, "url": "https://swapi.co/api/species/2/"} +{"_id": "Species:1", "_label": "Species", "system": {"created": "2014-12-10T13:52:11.567000Z", "edited": "2015-04-17T06:59:55.850671Z"}, "name": "Human", "classification": "mammal", "designation": "sentient", "average_height": "180", "skin_colors": ["caucasian", "black", "asian", "hispanic"], "hair_colors": ["blonde", "brown", "black", "red"], "eye_colors": ["brown", "blue", "green", "hazel", "grey", "amber"], "average_lifespan": 120, "language": "Galactic Basic", "url": "https://swapi.co/api/species/1/"} +{"_id": "Species:4", "_label": "Species", "system": {"created": "2014-12-10T17:05:26.471000Z", "edited": "2016-07-19T13:27:03.156498Z"}, "name": "Rodian", "classification": "sentient", "designation": "reptilian", "average_height": "170", "skin_colors": ["green", "blue"], "hair_colors": [], "eye_colors": ["black"], "average_lifespan": null, "language": "Galactic Basic", "url": "https://swapi.co/api/species/4/"} +{"_id": "Film:1", "_label": "Film", "system": {"created": "2014-12-10T14:23:31.880000Z", "edited": "2015-04-11T09:46:52.774897Z"}, "title": "A New Hope", "episode__id": 4, "opening_crawl": "It is a period of civil war.\r\nRebel spaceships, striking\r\nfrom a h_idden base, have won\r\ntheir first victory against\r\nthe evil Galactic Empire.\r\n\r\nDuring the battle, Rebel\r\nspies managed to steal secret\r\nplans to the Empire's\r\nultimate weapon, the DEATH\r\nSTAR, an armored space\r\nstation with enough power\r\nto destroy an entire planet.\r\n\r\nPursued by the Empire's\r\nsinister agents, Princess\r\nLeia races home aboard her\r\nstarship, custodian of the\r\nstolen plans that can save her\r\npeople and restore\r\nfreedom to the galaxy....", "director": "George Lucas", "producer": ["Gary Kurtz", "Rick McCallum"], "release_date": "1977-05-25", "url": "https://swapi.co/api/films/1/"} \ No newline at end of file diff --git a/conformance/resources/swapi_create_subgraph.py b/conformance/resources/swapi_create_subgraph.py index 2421e839c..8698cba1d 100644 --- a/conformance/resources/swapi_create_subgraph.py +++ b/conformance/resources/swapi_create_subgraph.py @@ -8,26 +8,26 @@ with open("./swapi_vertices.json") as fh: for line in fh: line = json.loads(line) - verts[line["gid"]] = line + verts[line["_id"]] = line edges = {} with open("./swapi_edges.json") as fh: for line in fh: line = json.loads(line) - edges[line["gid"]] = line + edges[line["_id"]] = line G1 = nx.DiGraph() -for gid, e in edges.items(): - G1.add_edge(e["from"], e["to"]) +for _, e in edges.items(): + G1.add_edge(e["_from"], e["_to"]) G = nx.DiGraph() whitelist = list(G1.neighbors("Film:1")) + ["Film:1"] edges_sub = [] verts_sub = [verts[x] for x in whitelist] -for gid, e in edges.items(): - if e["from"] not in whitelist or e["to"] not in whitelist: +for _, e in edges.items(): + if e["_from"] not in whitelist or e["_to"] not in whitelist: continue - G.add_edge(e["from"], e["to"]) + G.add_edge(e["_from"], e["_to"]) edges_sub.append(e) # write subgraph to output files diff --git a/conformance/resources/swapi_etl.py b/conformance/resources/swapi_etl.py index e0415f933..e8f4a40b4 100644 --- a/conformance/resources/swapi_etl.py +++ b/conformance/resources/swapi_etl.py @@ -42,8 +42,8 @@ def create_vertex(label, data): - id = data["url"].replace("https://swapi.co/api/", "").strip("/").split("/")[1] - gid = "%s:%s" % (label, id) + loadid = data["url"].replace("https://swapi.co/api/", "").strip("/").split("/")[1] + id = "%s:%s" % (label, loadid) tdata = {"system": {}} for k, v in data.items(): if v == "n/a": @@ -69,7 +69,7 @@ def create_vertex(label, data): continue else: tdata[k] = v - return {"gid": gid, "label": label, "data": tdata} + return {"_id": id, "_label": label}.update(tdata) def create_edge(label, fid, tid): @@ -77,8 +77,8 @@ def create_edge(label, fid, tid): tlab, tid = tid.replace("https://swapi.co/api/", "").strip("/").split("/") fid = "%s:%s" % (edge_lookup[flab], fid) tid = "%s:%s" % (edge_lookup[tlab], tid) - return {"gid": "(%s)-[%s]->(%s)" % (fid, label, tid), - "label": label, "from": fid, "to": tid} + return {"_id": "(%s)-[%s]->(%s)" % (fid, label, tid), + "_label": label, "_from": fid, "_to": tid} def create_all_edges(doc): diff --git a/conformance/run_conformance.py b/conformance/run_conformance.py index f388cf5eb..075d3ef0e 100755 --- a/conformance/run_conformance.py +++ b/conformance/run_conformance.py @@ -8,7 +8,7 @@ print("Running Conformance with %s" % gripql.__file__) args = create_arg_parser() - + # returns test modules starting with "ot_" tests = filter_tests(args, prefix="ot_") diff --git a/conformance/run_kafka.py b/conformance/run_kafka.py new file mode 100644 index 000000000..38bf20aa0 --- /dev/null +++ b/conformance/run_kafka.py @@ -0,0 +1,301 @@ +from __future__ import absolute_import, print_function, unicode_literals + +import json +import os +import sys +import string +import random +from run_util import gripql, create_connection, Manager +import re +from kafka import KafkaConsumer +import logging +import time +import requests +from kafka import TopicPartition + +# Configure logging +logging.basicConfig(level=logging.INFO) +logger = logging.getLogger(__name__) + +# Define BASE directory +BASE = os.path.dirname(os.path.abspath(__file__)) +TOPIC = "gripHistory" +KAFKA_HOST = "localhost:9092" +GRIP_SERVER_URL = "http://localhost:8201" +USERNAME = "admin" +PASSWORD = "adminpassword" +TIMEOUTMS = 10000 # Integer for consistency + + +class KafkaManager(Manager): + """Common test methods.""" + def __init__(self, conn, readOnly=False, server=None, grip_config_file_path=None): + super().__init__(conn, readOnly, server, grip_config_file_path) + self.loadgraphname = "swapi" + self.kafka_consumer = self.init_kafka_consumer() + + def init_kafka_consumer(self): + """Initialize Kafka consumer for TOPIC.""" + try: + consumer = KafkaConsumer( + TOPIC, + bootstrap_servers=[KAFKA_HOST], + security_protocol='SASL_PLAINTEXT', + sasl_mechanism='PLAIN', + sasl_plain_username=USERNAME, + sasl_plain_password=PASSWORD, + auto_offset_reset='earliest', + enable_auto_commit=True, + value_deserializer=lambda x: self.deserialize_message(x), + session_timeout_ms=TIMEOUTMS + ) + logger.info("Connected to Kafka consumer") + return consumer + except Exception as e: + logger.error(f"Failed to connect to Kafka consumer: {e}") + return None + + def deserialize_message(self, data): + """Safely deserialize Kafka message.""" + if not data: + logger.debug("Received empty Kafka message") + return "" + try: + decoded = data.decode('utf-8') + return json.loads(decoded) + except json.JSONDecodeError: + return decoded + except UnicodeDecodeError: + logger.warning(f"Failed to decode message: {data!r}") + return None + + def test_bulk_load_test_graph(self): + """Test loading data into TEST graph and print Kafka messages.""" + errors, edges, vertices = [], [], [] + self.curGraph = "TEST" + self.id_generator() + logger.info(f"Creating graph: {self.curGraph}") + self._conn.addGraph(self.curGraph) + logger.info("CALLING ADD GRAPH +++++++++++++++++++++++++++++++++++++++") + + G = self._conn.graph(self.curGraph) + vertex_file = os.path.join(BASE, "graphs", f"{self.loadgraphname}.vertices") + logger.info(f"Loading vertices from: {vertex_file}") + if os.path.exists(vertex_file): + with open(vertex_file) as handle: + bulk = G.bulkAdd() + for line in handle: + data = json.loads(line.strip()) + id = data.get("_id", None) + if id is not None: + vertices.append(id) + bulk.addVertex(id=id, label=data["_label"], data=self.collect_fields_dict(data)) + _ = bulk.execute() + else: + raise FileNotFoundError(f"Vertex file not found: {vertex_file}") + + edge_file = os.path.join(BASE, "graphs", f"{self.loadgraphname}.edges") + logger.info(f"Loading edges from: {edge_file}") + if os.path.exists(edge_file): + with open(edge_file) as handle: + bulk = G.bulkAdd() + for line in handle: + data = json.loads(line.strip()) + id = data.get("_id", None) + if id is not None: + edges.append(id) + G.addEdge( + src=data["_from"], + dst=data["_to"], + id=data.get("_id", None), + label=data["_label"], + data=self.collect_fields_dict(data)) + _ = bulk.execute() + else: + raise FileNotFoundError(f"Edge file not found: {edge_file}") + + # Verify graph data + vertex_count_result = list(G.V().count()) + if not vertex_count_result or 'count' not in vertex_count_result[0]: + raise ValueError("Invalid vertex count response") + vertex_count = vertex_count_result[0]['count'] + assert vertex_count > 0, f"No vertices loaded into {self.curGraph}" + edge_count_result = list(G.V().outE().count()) + edge_count = edge_count_result[0]['count'] if edge_count_result else 0 + logger.info(f"Loaded {vertex_count} vertices and {edge_count} edges") + logger.info("CALLING DELETE GRAPH ------------------------------------------") + self._conn.deleteGraph(self.curGraph) + + return errors, edges, vertices + def test_write_from_kafka(self, toggle_delete_method, toggle_post_method, orig_vertex_counts, orig_edge_counts): + bulk_re = re.compile(r"^/v1/graph$") + graph_re = re.compile(r"^/v1/graph/([^/]+)$") + delete_vertex_re = re.compile(r"^/v1/graph/([^/]+)/vertex/([^/]+)$") + delete_edge_re = re.compile(r"^/v1/graph/([^/]+)/edge/([^/]+)$") + add_vertex_re = re.compile(r"^/v1/graph/([^/]+)/vertex$") + add_edge_re = re.compile(r"^/v1/graph/([^/]+)/edge$") + + created_graphs = set() # Track created graphs to avoid duplicates + messages = [] # Collect snapshot of messages + + logger.info(f"Capturing snapshot of Kafka messages from {TOPIC} topic...") + + # Get the current end offsets for all partitions of the topic + partitions = self.kafka_consumer.partitions_for_topic(TOPIC) + if not partitions: + logger.warning(f"No partitions found for topic {TOPIC}") + return + topic_partitions = [TopicPartition(TOPIC, p) for p in partitions] + end_offsets = self.kafka_consumer.end_offsets(topic_partitions) + + # Seek to the beginning of all assigned partitions + for tp in topic_partitions: + self.kafka_consumer.seek(tp, 0) # Seek to offset 0 (beginning) + + messages_read = {tp: 0 for tp in topic_partitions} + + # Poll for messages until we reach the initial end offsets + start_time = time.time() + while True: + message_batch = self.kafka_consumer.poll(timeout_ms=100) # Short timeout + if not message_batch: + if time.time() - start_time > TIMEOUTMS / 1000: + logger.info("Timeout reached while collecting initial messages") + break + continue + + for tp, records in message_batch.items(): + for msg in records: + if msg.value is not None: + messages.append(msg) + messages_read[tp] += 1 + + # Check if we've consumed up to the initial end offset for all partitions + all_caught_up = True + for tp in topic_partitions: + if messages_read[tp] < end_offsets[tp]: + all_caught_up = False + break + + if all_caught_up and messages: + break # All initial messages consumed + + logger.info(f"Collected {len(messages)} initial Kafka messages in snapshot") + + # Unsubscribe to stop further consumption + self.kafka_consumer.unsubscribe() + + # Process the captured messages + for msg in messages: + headers = dict(msg.headers) + path = headers.get('PATH', b'').decode() + method = headers.get('METHOD', b'').decode() + if not path or not method: + continue + + logger.info(f"Processing Kafka message: PATH={path}, METHOD={method}, VALUE={msg.value}") + + if method == "DELETE" and toggle_delete_method: + parts = path.split('/') + if bulk_re.match(path): + deleteBulk = msg.value + self.curGraph = deleteBulk["graph"] + logger.info(f"Deleting bulk graph: {self.curGraph}") + self._conn.graph(deleteBulk["graph"]).delete(edges=deleteBulk["edges"], vertices=deleteBulk["vertices"]) + elif delete_vertex_re.match(path): + graph_name = parts[-3] + vertex_id = parts[-1] + logger.info(f"Deleting vertex {vertex_id} from graph {graph_name}") + self._conn.graph(graph_name).deleteVertex(vertex_id) + elif delete_edge_re.match(path): + graph_name = parts[-3] + edge_id = parts[-1] + logger.info(f"Deleting edge {edge_id} from graph {graph_name}") + self._conn.graph(graph_name).deleteEdge(edge_id) + elif graph_re.match(path): + graph_name = path.split('/')[-1] + logger.info(f"CALLING DELETE GRAPH ------------------------------------------ for {graph_name}") + self._conn.deleteGraph(graph_name) + elif method == "POST" and toggle_post_method: + if bulk_re.match(path): + G = None + bulk = None + for i, elem in enumerate(msg.value.split("\n")): + if elem != "": + elem = json.loads(elem) + if i == 0: + graph = elem.get("graph") + self.curGraph = graph + logger.info(f"Setting self.curGraph to: {self.curGraph}") + G = self._conn.graph(graph) + bulk = G.bulkAdd() + vertex = elem.get("vertex", None) + if vertex is not None: + bulk.addVertex(id=str(vertex.get("id")), label=str(vertex.get("label")), data=dict(vertex.get("data"))) + edge = elem.get("edge", None) + if edge is not None: + bulk.addEdge(src=str(edge.get("from")), dst=str(edge.get("to")), id=str(edge.get("id")), label=str(edge.get("label")), data=dict(edge.get("data"))) + if bulk is not None: + err = bulk.execute() + assert err['errorCount'] == 0, f"Err: {err}" + elif add_vertex_re.match(path): + graph_name = path.split('/')[-2] + value = msg.value + logger.info(f"Adding vertex {value['id']} to graph {graph_name}") + self._conn.graph(graph_name).addVertex( + id=value["id"], + label=value["label"], + data=value["data"] + ) + elif add_edge_re.match(path): + graph_name = path.split('/')[-2] + value = msg.value + logger.info(f"Adding edge {value['id']} to graph {graph_name}") + self._conn.graph(graph_name).addEdge( + src=value["from"], + dst=value["to"], + data=value["data"], + id=value["id"], + label=value["label"] + ) + elif graph_re.match(path): + graph_name = path.split('/')[-1] + if graph_name not in created_graphs: + logger.info(f"CALLING ADD GRAPH +++++++++++++++++++++++++++++++++++++++ for {graph_name}") + self._conn.addGraph(graph_name) + created_graphs.add(graph_name) + else: + logger.info(f"Skipping duplicate ADD GRAPH for {graph_name}") + + # Verify graph data + if toggle_post_method: + G = self._conn.graph(self.curGraph) + vertex_count_result = list(G.V().count()) + vertex_count = vertex_count_result[0]['count'] + assert vertex_count > 0, f"No vertices loaded into {self.curGraph}" + edge_count_result = list(G.V().outE().count()) + edge_count = edge_count_result[0]['count'] if edge_count_result else 0 + if orig_vertex_counts is not None and orig_edge_counts is not None: + assert orig_vertex_counts == vertex_count, f"original_vertex_counts {orig_vertex_counts} != vertex_count {vertex_count}" + assert orig_edge_counts == edge_count, f"original_edge_counts {orig_edge_counts} != edge_count {edge_count}" + logger.info("assert statements passed") + logger.info(f"Loaded {vertex_count} vertices and {edge_count} edges") + self._conn.deleteGraph(self.curGraph) + G = self._conn.graph(self.curGraph) + try: + vertex_count_result = list(G.V().count()) + except Exception as e: + assert "was not found" in str(e) + + +def main(): + conn = create_connection(GRIP_SERVER_URL, None, None) + if not conn: + sys.exit(1) + + manager = KafkaManager(conn=conn, readOnly=False, server=GRIP_SERVER_URL) + errors, edges, vertices = manager.test_bulk_load_test_graph() + manager.test_write_from_kafka(toggle_delete_method=False, toggle_post_method=True, orig_vertex_counts=len(vertices), orig_edge_counts=len(edges)) + + +if __name__ == "__main__": + main() diff --git a/conformance/run_util.py b/conformance/run_util.py index cc6651244..0b71dc9a8 100644 --- a/conformance/run_util.py +++ b/conformance/run_util.py @@ -147,6 +147,9 @@ def set_connection(self, conn): else: self.user = None + def collect_fields_dict(self, datadict): + return {key: value for key, value in datadict.items() if key not in ["_id", "_label", "_from", "_to"]} + @staticmethod def parse_grip_config(grip_config_file_path): """Parse grip config.""" @@ -158,7 +161,7 @@ def parse_grip_config(grip_config_file_path): def newGraph(self): if self.readOnly is None: - self.curGraph = "test_graph_" + id_generator() + self.curGraph = "test_graph_" + self.id_generator() self._conn.addGraph(self.curGraph) else: self.curGraph = args.readOnly @@ -173,22 +176,26 @@ def setGraph(self, name): if self.curGraph != "": self.clean() - self.curGraph = "test_graph_" + id_generator() + self.curGraph = "test_graph_" + self.id_generator() self._conn.addGraph(self.curGraph) G = self._conn.graph(self.curGraph) + bulk = G.bulkAdd() with open(os.path.join(BASE, "graphs", "%s.vertices" % (name))) as handle: for line in handle: data = json.loads(line) - G.addVertex(data["gid"], data["label"], data.get("data", {})) + + bulk.addVertex(data["_id"], data["_label"], self.collect_fields_dict(data)) with open(os.path.join(BASE, "graphs", "%s.edges" % (name))) as handle: for line in handle: data = json.loads(line) - G.addEdge(src=data["from"], dst=data["to"], - gid=data.get("gid", None), label=data["label"], - data=data.get("data", {})) + bulk.addEdge(src=data["_from"], dst=data["_to"], + id=data.get("_id", None), label=data["_label"], + data=self.collect_fields_dict(data)) + + bulk.execute() self.curName = name return G @@ -201,7 +208,7 @@ def writeTest(self): raise SkipTest self.clean() self.curName = "" - self.curGraph = "test_graph_" + id_generator() + self.curGraph = "test_graph_" + self.id_generator() self._conn.addGraph(self.curGraph) G = self._conn.graph(self.curGraph) return G @@ -275,7 +282,7 @@ def create_graphs_from_policies(self): bulk.addVertex("Foo:1", "Foo", {"bar": "foo-bar"}) err = bulk.execute() assert err['insertCount'] == 1 and err['errorCount'] == 0, f"Did not insert 1 row {err}" - results = [v for v in G.query().V().hasLabel("Foo").count()] + results = [v for v in G.V().hasLabel("Foo").count()] assert results[0]['count'] == 1, f"Could not query Foo vertex. {results}" return graph_names @@ -284,7 +291,7 @@ def test_query(self, graph_name): G = self._conn.graph(graph_name) try: # this raises an HTTP error - results = [v for v in G.query().V().hasLabel("Foo").count().execute()] + results = [v for v in G.V().hasLabel("Foo").count().execute()] assert results[0]['count'] > 0, f"test_query {results}" except requests.HTTPError as e: assert False, f"test_query graph {graph_name} {self.current_user_policies()} {e}" @@ -319,9 +326,9 @@ def current_user_account(self): return next(iter(account for account in self.accounts if account.user == self.user), None) -def id_generator(size=6, chars=string.ascii_uppercase + string.digits): - """Random 6 alpha numeric string.""" - return ''.join(random.choice(chars) for _ in range(size)).lower() + def id_generator(self, size=6, chars=string.ascii_uppercase + string.digits): + """Random 6 alpha numeric string.""" + return ''.join(random.choice(chars) for _ in range(size)).lower() def filter_tests(args, prefix="ot_"): diff --git a/conformance/tests/auth_basic.py b/conformance/tests/auth_basic.py index b22a1ee04..1f9a579fe 100644 --- a/conformance/tests/auth_basic.py +++ b/conformance/tests/auth_basic.py @@ -1,7 +1,5 @@ from __future__ import absolute_import -import requests - def test_current_user_has_policy(manager): """Ensure current user has a policy defined.""" @@ -18,7 +16,7 @@ def test_current_user_can_query(manager): account = manager.current_user_account() assert account, f"Could not find account for {manager.user}" policies = account.policies - assert len(policies) > 0, f"Should have at least one policy" + assert len(policies) > 0, "Should have at least one policy" errors = [] if not account.is_admin: @@ -56,7 +54,7 @@ def test_current_user_can_read(manager): account = manager.current_user_account() assert account, f"Could not find account for {manager.user}" policies = account.policies - assert len(policies) > 0, f"Should have at least one policy" + assert len(policies) > 0, "Should have at least one policy" errors = [] # non admin user if not account.is_admin: @@ -92,7 +90,7 @@ def test_current_user_can_write(manager): account = manager.current_user_account() assert account, f"Could not find account for {manager.user}" policies = account.policies - assert len(policies) > 0, f"Should have at least one policy" + assert len(policies) > 0, "Should have at least one policy" errors = [] # non admin user if not account.is_admin: @@ -109,7 +107,7 @@ def test_current_user_can_write(manager): try: manager.test_write('dummy') errors.append(f"{manager.user} should not be able to write dummy graph") - except AssertionError as e: + except AssertionError: pass else: diff --git a/conformance/tests/ot_aggregations.py b/conformance/tests/ot_aggregations.py index d0553c792..989eac510 100644 --- a/conformance/tests/ot_aggregations.py +++ b/conformance/tests/ot_aggregations.py @@ -21,7 +21,7 @@ def test_simple(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V().aggregate(gripql.term("simple-agg", "eye_color")): + for row in G.V().aggregate(gripql.term("simple-agg", "eye_color")): if row['name'] != 'simple-agg': errors.append("Result had Incorrect aggregation name") return errors @@ -39,7 +39,7 @@ def test_traversal_term_aggregation(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V("Film:1").out().hasLabel("Character").aggregate(gripql.term("traversal-agg", "eye_color")): + for row in G.V("Film:1").out().hasLabel("Character").aggregate(gripql.term("traversal-agg", "eye_color")): if row['name'] != 'traversal-agg': errors.append("Result had Incorrect aggregation name") return errors @@ -73,7 +73,7 @@ def test_traversal_histogram_aggregation(man): } count = 0 - for row in G.query().V("Film:1").out().hasLabel("Character").aggregate(gripql.histogram("traversal-agg", "height", 25)): + for row in G.V("Film:1").out().hasLabel("Character").aggregate(gripql.histogram("traversal-agg", "height", 25)): count += 1 if row['name'] != 'traversal-agg': errors.append("Result had Incorrect aggregation name") @@ -98,7 +98,7 @@ def test_traversal_percentile_aggregation(man): heights = np.array([96, 97, 150, 165, 167, 170, 172, 173, 175, 178, 180, 180, 180, 182, 183, 188, 202, 228]) data = [] - for row in G.query().V("Film:1").out().hasLabel("Character").aggregate(gripql.percentile("traversal-agg", "height", percents)): + for row in G.V("Film:1").out().hasLabel("Character").aggregate(gripql.percentile("traversal-agg", "height", percents)): count += 1 if row['name'] != 'traversal-agg': errors.append("Result had Incorrect aggregation name") @@ -122,7 +122,7 @@ def getMinMax(input_data, percent, accuracy=0.15): if count != len(percents): errors.append( "Unexpected number of terms: %d != %d" % - (len(row["buckets"]), len(percents)) + (len(res["buckets"]), len(percents)) ) return errors @@ -141,7 +141,7 @@ def test_traversal_edge_histogram_aggregation(man): } count = 0 - for row in G.query().V().hasLabel("Film").outE().aggregate(gripql.histogram("edge-agg", "scene_count", 4)): + for row in G.V().hasLabel("Film").outE().aggregate(gripql.histogram("edge-agg", "scene_count", 4)): count += 1 if row['name'] != 'edge-agg': errors.append("Result had Incorrect aggregation name") @@ -171,14 +171,14 @@ def test_traversal_gid_aggregation(man): } count = 0 - for row in G.query().V().hasLabel("Planet").as_("a").out("residents").select("a").aggregate(gripql.term("gid-agg", "_gid")): + for row in G.V().hasLabel("Planet").as_("a").out("residents").select("a").aggregate(gripql.term("id-agg", "_id")): count += 1 - if 'gid-agg' != row['name']: + if 'id-agg' != row['name']: errors.append("Result had Incorrect aggregation name") return errors if planet_agg_map[row["key"]] != row["value"]: - errors.append("Incorrect bucket count returned: %s" % res) + errors.append("Incorrect bucket count returned: %s" % row) if count != 2: errors.append( @@ -190,18 +190,19 @@ def test_traversal_gid_aggregation(man): def test_field_aggregation(man): errors = [] - fields = [ "id", 'orbital_period', 'gravity', 'terrain', 'name','climate', 'system', 'diameter', 'rotation_period', 'url', 'population', 'surface_water'] + # TODO: find way to get gripper driver to drop id field + fields = [ "_id", "id", "_label", 'orbital_period', 'gravity', 'terrain', 'name','climate', 'system', 'diameter', 'rotation_period', 'url', 'population', 'surface_water'] G = man.setGraph("swapi") count = 0 - for row in G.query().V().hasLabel("Planet").aggregate(gripql.field("gid-agg", "$._data")): + for row in G.V().hasLabel("Planet").aggregate(gripql.field("id-agg", "$")): if row["key"] not in fields: errors.append("unknown field returned: %s" % (row['key'])) if row["value"] != 3: errors.append("incorrect count returned: %s" % (row['value'])) count += 1 - if count not in [11, 12]: # gripper returns an id field as well, others dont.... - errors.append("Incorrect number of results returned") + if count not in [11, 12, 13]: # gripper returns an id field as well, others dont.... + errors.append("""V().hasLabel("Planet").aggregate(gripql.field("id-agg", "$")) : Incorrect number of results returned %d""" % (count)) return errors @@ -216,7 +217,7 @@ def test_field_type_aggregation(man): } G = man.setGraph("swapi") count = 0 - for row in G.query().V().hasLabel("Planet").aggregate(list( gripql.type(a) for a in ["population", "name", "gravity", "diameter"])): + for row in G.V().hasLabel("Planet").aggregate(list( gripql.type(a) for a in ["population", "name", "gravity", "diameter"])): if types[row['name']] != row['key']: errors.append("Wrong type: %s != %s" % (types[row['name']], row['key'])) count += 1 @@ -230,7 +231,7 @@ def test_count_aggregation(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V().hasLabel("Planet").aggregate(gripql.count("total")): + for row in G.V().hasLabel("Planet").aggregate(gripql.count("total")): if row["value"] != 3: errors.append("Incorrect count returned") count += 1 diff --git a/conformance/tests/ot_basic.py b/conformance/tests/ot_basic.py index 80b4a8978..fa733bd6e 100644 --- a/conformance/tests/ot_basic.py +++ b/conformance/tests/ot_basic.py @@ -5,27 +5,27 @@ def vertex_compare(val, expected): - if val["gid"] != expected["gid"]: + if val["_id"] != expected["_id"]: return False - if val["label"] != expected["label"]: + if val["_label"] != expected["_label"]: return False - for k in expected['data']: - if expected['data'][k] != val['data'].get(k, None): + for k in expected: + if expected[k] != val.get(k, None): return False return True def edge_compare(val, expected): - if val["gid"] != expected["gid"]: + if val["_id"] != expected["_id"]: return False - if val["to"] != expected["to"]: + if val["_to"] != expected["_to"]: return False - if val["from"] != expected["from"]: + if val["_from"] != expected["_from"]: return False - if val["label"] != expected["label"]: + if val["_label"] != expected["_label"]: return False - for k in expected['data']: - if expected['data'][k] != val['data'].get(k, None): + for k in expected: + if expected[k] != val.get(k, None): return False return True @@ -36,23 +36,21 @@ def test_get_vertex(man): G = man.setGraph("swapi") expected = { - "gid": "Character:1", - "label": "Character", - "data": { - "system": { - "created": "2014-12-09T13:50:51.644000Z", - "edited": "2014-12-20T21:17:56.891000Z" - }, - "name": "Luke Skywalker", - "height": 172, - "mass": 77, - "hair_color": "blond", - "skin_color": "fair", - "eye_color": "blue", - "birth_year": "19BBY", - "gender": "male", - "url": "https://swapi.co/api/people/1/" - } + "_id": "Character:1", + "_label": "Character", + "system": { + "created": "2014-12-09T13:50:51.644000Z", + "edited": "2014-12-20T21:17:56.891000Z" + }, + "name": "Luke Skywalker", + "height": 172, + "mass": 77, + "hair_color": "blond", + "skin_color": "fair", + "eye_color": "blue", + "birth_year": "19BBY", + "gender": "male", + "url": "https://swapi.co/api/people/1/" } try: @@ -79,11 +77,10 @@ def test_get_edge(man): G = man.setGraph("swapi") expected = { - "gid": "Film:1-characters-Character:1", - "label": "characters", - "from": "Film:1", - "to": "Character:1", - "data": {} + "_id": "Film:1-characters-Character:1", + "_label": "characters", + "_from": "Film:1", + "_to": "Character:1", } try: @@ -111,20 +108,20 @@ def test_V(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 if count != 39: - errors.append("Fail: G.query().V() %s != %s" % (count, 25)) + errors.append("Fail: G.V() %s != %s" % (count, 25)) count = 0 - for i in G.query().V("Character:1"): + for i in G.V("Character:1"): count += 1 - if i['gid'] != "Character:1": + if i["_id"] != "Character:1": errors.append( - "Fail: G.query().V(\"Character:1\") - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Character:1\") - Wrong vertex %s" % (i["_id"]) ) if count != 1: - errors.append("Fail: G.query().V(\"Character:1\") %s != %s" % (count, 1)) + errors.append("Fail: G.V(\"Character:1\") %s != %s" % (count, 1)) return errors @@ -135,21 +132,10 @@ def test_E(man): G = man.setGraph("swapi") count = 0 - for i in G.query().E(): + for _ in G.V().outE(): count += 1 if count != 144: - errors.append("Fail: G.query().E() %s != %d" % (count, 144)) - - count = 0 - for i in G.query().E("Film:1-characters-Character:1"): - if i['gid'] != "Film:1-characters-Character:1": - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\") - Wrong edge %s" % (i['gid']) - ) - count += 1 - if count != 1: - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\") %s != %d" % (count, 1)) + errors.append("Fail: G.V().outE() %s != %d" % (count, 144)) return errors @@ -160,38 +146,26 @@ def test_outgoing(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V("Starship:12").out(): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: + for i in G.V("Starship:12").out(): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: errors.append( - "Fail: G.query().V(\"Starship:12\").out() - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").out() - Wrong vertex %s" % (i['_id']) ) count += 1 if count != 5: errors.append( - "Fail: G.query().V(\"Starship:12\").out() %s != %d" % (count, 5)) + "Fail: G.V(\"Starship:12\").out() %s != %d" % (count, 5)) count = 0 - for i in G.query().V("Starship:12").out("pilots"): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9']: + for i in G.V("Starship:12").out("pilots"): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9']: errors.append( - "Fail: G.query().V(\"Starship:12\").out(\"pilots\") - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").out(\"pilots\") - Wrong vertex %s" % (i['_id']) ) count += 1 if count != 4: errors.append( - "Fail: G.query().V(\"Starship:12\").out(\"pilots\") %s != %d" % (count, 4) - ) - - count = 0 - for i in G.query().E("Film:1-characters-Character:1").out(): - if i['gid'] != "Character:1": - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").out() - Wrong vertex %s" % (i['gid']) - ) - count += 1 - if count != 1: - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").out() %s != %d" % (count, 1) + "Fail: G.V(\"Starship:12\").out(\"pilots\") %s != %d" % (count, 4) ) return errors @@ -203,47 +177,35 @@ def test_incoming(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V("Starship:12").in_(): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: + for i in G.V("Starship:12").in_(): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: errors.append( - "Fail: G.query().V(\"Starship:12\").in_() - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").in_() - Wrong vertex %s" % (i['_id']) ) count += 1 if count != 5: errors.append( - "Fail: G.query().V(\"Starship:12\").in_() %s != %d" % (count, 5)) + "Fail: G.V(\"Starship:12\").in_() %s != %d" % (count, 5)) count = 0 - for i in G.query().V("Starship:12").in_("starships"): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: + for i in G.V("Starship:12").in_("starships"): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: errors.append( - "Fail: G.query().V(\"Starship:12\").in_(\"starships\") - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").in_(\"starships\") - Wrong vertex %s" % (i['_id']) ) count += 1 if count != 5: errors.append( - "Fail: G.query().V(\"Starship:12\").in_(\"starships\") %s != %d" % (count, 5) + "Fail: G.V(\"Starship:12\").in_(\"starships\") %s != %d" % (count, 5) ) # sanity check since vertices are connected by multipled edges count = 0 - for i in G.query().V("Starship:12").in_("pilots"): + for i in G.V("Starship:12").in_("pilots"): count += 0 if count != 0: errors.append( - "Fail: G.query().V(\"Starship:12\").in_(\"piolots\") %s != %d" % (count, 0) - ) - - count = 0 - for i in G.query().E("Film:1-characters-Character:1").in_(): - if i['gid'] != "Film:1": - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").in_() - Wrong vertex %s" % (i['gid']) - ) - count += 1 - if count != 1: - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").in_() %s != %d" % (count, 1) + "Fail: G.V(\"Starship:12\").in_(\"piolots\") %s != %d" % (count, 0) ) return errors @@ -254,23 +216,23 @@ def test_outgoing_edge(man): G = man.setGraph("swapi") - c = G.query().V("Character:1").outE().count().execute()[0]["count"] + c = G.V("Character:1").outE().count().execute()[0]["count"] if c != 4: - errors.append("Fail: G.query().V(\"Character:1\").outE().count() %d != %d" % (c, 4)) + errors.append("Fail: G.V(\"Character:1\").outE().count() %d != %d" % (c, 4)) - for i in G.query().V("Character:1").outE(): - if not i['gid'].startswith("Character:1"): - errors.append("Fail: G.query().V(\"Character:1\").outE() - \ - Wrong edge '%s'" % (i['gid'])) + for i in G.V("Character:1").outE(): + if not i['_id'].startswith("Character:1"): + errors.append("Fail: G.V(\"Character:1\").outE() - \ + Wrong edge '%s'" % (i['_id'])) - for i in G.query().V("Character:1").outE().out(): - if i['gid'] not in ['Film:1', 'Planet:1', 'Species:1', 'Starship:12']: - errors.append("Fail: G.query().V(\"Character:1\").outE().out() - \ - Wrong vertex %s" % (i['gid'])) + for i in G.V("Character:1").outE().out(): + if i['_id'] not in ['Film:1', 'Planet:1', 'Species:1', 'Starship:12']: + errors.append("Fail: G.V(\"Character:1\").outE().out() - \ + Wrong vertex %s" % (i['_id'])) - c = G.query().V("Character:1").outE("homeworld").count().execute()[0]["count"] + c = G.V("Character:1").outE("homeworld").count().execute()[0]["count"] if c != 1: - errors.append("Fail: G.query().V(\"Character:1\").outE(\"homeworld\").count() - %s != %s" % (c, 1)) + errors.append("Fail: G.V(\"Character:1\").outE(\"homeworld\").count() - %s != %s" % (c, 1)) return errors @@ -280,23 +242,23 @@ def test_incoming_edge(man): G = man.setGraph("swapi") - c = G.query().V("Character:1").inE().count().execute()[0]["count"] + c = G.V("Character:1").inE().count().execute()[0]["count"] if c != 4: - errors.append("Fail: G.query().V(\"Character:1\").inE().count() %d != %d" % (c, 4)) + errors.append("Fail: G.V(\"Character:1\").inE().count() %d != %d" % (c, 4)) - for i in G.query().V("Character:1").inE(): - if not i['gid'].endswith("Character:1"): - errors.append("Fail: G.query().V(\"Character:1\").inE() - \ - Wrong edge %s" % (i['gid'])) + for i in G.V("Character:1").inE(): + if not i['_id'].endswith("Character:1"): + errors.append("Fail: G.V(\"Character:1\").inE() - \ + Wrong edge %s" % (i['_id'])) - for i in G.query().V("Character:1").inE().in_(): - if i['gid'] not in ['Film:1', 'Planet:1', 'Species:1', 'Starship:12']: - errors.append("Fail: G.query().V(\"Character:1\").inE().in() - \ - Wrong vertex %s" % (i['gid'])) + for i in G.V("Character:1").inE().in_(): + if i['_id'] not in ['Film:1', 'Planet:1', 'Species:1', 'Starship:12']: + errors.append("Fail: G.V(\"Character:1\").inE().in() - \ + Wrong vertex %s" % (i['_id'])) - c = G.query().V("Character:1").inE("residents").count().execute()[0]["count"] + c = G.V("Character:1").inE("residents").count().execute()[0]["count"] if c != 1: - errors.append("Fail: G.query().V(\"Character:1\").inE(\"residents\").count() - %s != %s" % (c, 1)) + errors.append("Fail: G.V(\"Character:1\").inE(\"residents\").count() - %s != %s" % (c, 1)) return errors @@ -304,35 +266,35 @@ def test_incoming_edge(man): def test_outgoing_edge_all(man): errors = [] G = man.setGraph("swapi") - for i in G.query().V().as_("a").outE().as_("b").render(["$a._gid", "$b._from", "$b._to", "$b._gid"]): + for i in G.V().as_("a").outE().as_("b").render(["$a._id", "$b._from", "$b._to", "$b._id"]): if i[0] != i[1]: - errors.append("outE _gid/from missmatch %s != %s" % (i[0], i[1])) + errors.append("outE _id/from missmatch %s != %s" % (i[0], i[1])) if i[1] == i[2]: errors.append("outE to/from the same %s == %s" % (i[1], i[2])) if not i[3].startswith(i[0]): - errors.append("outE _gid prefix %s != %s" % (i[3], i[0])) + errors.append("outE _id prefix %s != %s" % (i[3], i[0])) return errors def test_incoming_edge_all(man): errors = [] G = man.setGraph("swapi") - for i in G.query().V().as_("a").inE().as_("b").render(["$a._gid", "$b._to", "$b._gid"]): + for i in G.V().as_("a").inE().as_("b").render(["$a._id", "$b._to", "$b._id"]): if i[0] != i[1]: - errors.append("inE _gid/to missmatch %s != %s" % (i[0], i[1])) + errors.append("inE _id/to missmatch %s != %s" % (i[0], i[1])) if not i[2].endswith(i[0]): - errors.append("inE _gid wrong suffix %s != %s" % (i[2], i[0])) + errors.append("inE _id wrong suffix %s != %s" % (i[2], i[0])) return errors def test_out_edge_out_all(man): errors = [] G = man.setGraph("swapi") - for i in G.query().V().as_("a").outE().as_("b").out().as_("c").render(["$a._gid", "$b._from", "$b._to", "$c._gid"]): + for i in G.V().as_("a").outE().as_("b").out().as_("c").render(["$a._id", "$b._from", "$b._to", "$c._id"]): if i[0] != i[1]: - errors.append("outE-out _gid/from missmatch %s != %s" % (i[0], i[1])) + errors.append("outE-out _id/from missmatch '%s' != '%s'" % (i[0], i[1])) if i[2] != i[3]: - errors.append("outE-out to/_gid missmatch %s != %s" % (i[0], i[1])) + errors.append("outE-out to/_id missmatch '%s' != '%s'" % (i[2], i[3])) return errors @@ -340,11 +302,11 @@ def test_in_out_equal(man): G = man.setGraph("swapi") errors = [] count1 = 0 - for i in G.query().V().out(): + for i in G.V().out(): count1 += 1 count2 = 0 - for i in G.query().V().in_(): + for i in G.V().in_(): count2 += 1 if count1 != count2: @@ -356,11 +318,11 @@ def test_ine_oute_equal(man): G = man.setGraph("swapi") errors = [] count1 = 0 - for i in G.query().V().outE(): + for i in G.V().outE(): count1 += 1 count2 = 0 - for i in G.query().V().inE(): + for i in G.V().inE(): count2 += 1 if count1 != count2: @@ -374,41 +336,28 @@ def test_both(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V("Starship:12").both(): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: + for i in G.V("Starship:12").both(): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: errors.append( - "Fail: G.query().V(\"Starship:12\").both() - \ - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").both() - \ + Wrong vertex %s" % (i['_id']) ) count += 1 if count != 10: errors.append( - "Fail: G.query().V(\"Starship:12\").both() %s != %d" % (count, 10)) + "Fail: G.V(\"Starship:12\").both() %s != %d" % (count, 10)) count = 0 - for i in G.query().V("Starship:12").both(["pilots", "starships"]): - if i['gid'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: + for i in G.V("Starship:12").both(["pilots", "starships"]): + if i['_id'] not in ['Character:1', 'Character:18', 'Character:19', 'Character:9', 'Film:1']: errors.append( - "Fail: G.query().V(\"Starship:12\").both([\"pilots\", \"starships\"]) - \ - Wrong vertex %s" % (i['gid']) + "Fail: G.V(\"Starship:12\").both([\"pilots\", \"starships\"]) - \ + Wrong vertex %s" % (i['_id']) ) count += 1 if count != 9: errors.append( - "Fail: G.query().V(\"Starship:12\").both([\"pilots\", \"starships\"]) %s != %d" % (count, 9) - ) - - count = 0 - for i in G.query().E("Film:1-characters-Character:1").both(): - if i['gid'] not in ["Film:1", "Character:1"]: - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").both() - \ - Wrong vertex %s" % (i['gid']) - ) - count += 1 - if count != 2: - errors.append( - "Fail: G.query().E(\"Film:1-characters-Character:1\").both() %s != %d" % (count, 2) + "Fail: G.V(\"Starship:12\").both([\"pilots\", \"starships\"]) %s != %d" % (count, 9) ) return errors @@ -419,23 +368,23 @@ def test_both_edge(man): G = man.setGraph("swapi") - c = G.query().V("Character:1").bothE().count().execute()[0]["count"] + c = G.V("Character:1").bothE().count().execute()[0]["count"] if c != 8: - errors.append("Fail: G.query().V(\"Character:1\").bothE().count() %d != %d" % (c, 8)) + errors.append("Fail: G.V(\"Character:1\").bothE().count() %d != %d" % (c, 8)) - for i in G.query().V("Character:1").inE(): - if not (i['gid'].startswith("Character:1") or i['gid'].endswith("Character:1")): - errors.append("Fail: G.query().V(\"Character:1\").bothE() - \ - Wrong edge %s" % (i['gid'])) + for i in G.V("Character:1").inE(): + if not (i["_id"].startswith("Character:1") or i["_id"].endswith("Character:1")): + errors.append("Fail: G.V(\"Character:1\").bothE() - \ + Wrong edge %s" % (i["_id"])) - for i in G.query().V("Character:1").bothE().out(): - if i['gid'] not in ['Character:1', 'Character:1', 'Character:1', 'Character:1', 'Film:1', 'Planet:1', 'Species:1', 'Starship:12']: - errors.append("Fail: G.query().V(\"Character:1\").bothE().out() - \ - Wrong vertex %s" % (i['gid'])) + for i in G.V("Character:1").bothE().out(): + if i["_id"] not in ['Character:1', 'Character:1', 'Character:1', 'Character:1', 'Film:1', 'Planet:1', 'Species:1', 'Starship:12']: + errors.append("Fail: G.V(\"Character:1\").bothE().out() - \ + Wrong vertex %s" % (i["_id"])) - c = G.query().V("Character:1").bothE(["homeworld", "residents"]).count().execute()[0]["count"] + c = G.V("Character:1").bothE(["homeworld", "residents"]).count().execute()[0]["count"] if c != 2: - errors.append("Fail: G.query().V(\"Character:1\").inE([\"homeworld\", \"residents\"]).count() - %s != %s" % (c, 2)) + errors.append("Fail: G.V(\"Character:1\").bothE([\"homeworld\", \"residents\"]).count() - %s != %s" % (c, 2)) return errors @@ -446,18 +395,18 @@ def test_limit(man): G = man.setGraph("swapi") tests = [ - "G.query().V().limit(3)", - "G.query().E().limit(3)" + "G.V().limit(3)", + "G.V().outE().limit(3)" ] expected_results = [ - list(i["gid"] for i in G.query().V().execute())[:3], - list(i["gid"] for i in G.query().E().execute())[:3] + list(i["_id"] for i in G.V().execute())[:3], + list(i["_id"] for i in G.V().outE().execute())[:3] ] for test, expected in zip(tests, expected_results): results = eval(test).execute() - actual = [x["gid"] for x in results] + actual = [x["_id"] for x in results] # check contents for x in actual: @@ -483,18 +432,16 @@ def test_skip(man): G = man.setGraph("swapi") tests = [ - "G.query().V().skip(3).limit(3)", - "G.query().E().skip(3).limit(3)" + "G.V().skip(3).limit(3)", ] expected_results = [ - list(i["gid"] for i in G.query().V().execute())[3:6], - list(i["gid"] for i in G.query().E().execute())[3:6] + list(i["_id"] for i in G.V().execute())[3:6], ] for test, expected in zip(tests, expected_results): results = eval(test).execute() - actual = [x["gid"] for x in results] + actual = [x["_id"] for x in results] # check contents for x in actual: @@ -520,22 +467,18 @@ def test_range(man): G = man.setGraph("swapi") tests = [ - "G.query().V().range(3, 5)", - "G.query().V().range(34, -1)", - "G.query().E().range(120, 123)", - "G.query().E().range(140, -1)" + "G.V().range(3, 5)", + "G.V().range(34, -1)", ] expected_results = [ - list(i["gid"] for i in G.query().V().execute())[3:5], - list(i["gid"] for i in G.query().V().execute())[34:], - list(i["gid"] for i in G.query().E().execute())[120:123], - list(i["gid"] for i in G.query().E().execute())[140:] + list(i["_id"] for i in G.V().execute())[3:5], + list(i["_id"] for i in G.V().execute())[34:], ] for test, expected in zip(tests, expected_results): results = eval(test).execute() - actual = [x["gid"] for x in results] + actual = [x["_id"] for x in results] # check contents for x in actual: diff --git a/conformance/tests/ot_bulk.py b/conformance/tests/ot_bulk.py index bf12556e3..eaa2cd189 100644 --- a/conformance/tests/ot_bulk.py +++ b/conformance/tests/ot_bulk.py @@ -1,5 +1,3 @@ - - def test_bulkload(man): errors = [] @@ -22,18 +20,18 @@ def test_bulkload(man): bulk.addEdge("4", "5", "created", {"weight": 1.0}) err = bulk.execute() - print(err) + if err.get("errorCount", 0) != 0: print(err) errors.append("Bulk insertion error") - res = G.query().V().count().execute()[0] + res = G.V().count().execute()[0] if res["count"] != 6: errors.append( "Bulk Add wrong number of vertices: %s != %s" % (res["count"], 6)) - res = G.query().E().count().execute()[0] + res = G.V().outE().count().execute()[0] if res["count"] != 6: errors.append( "Bulk Add wrong number of edges: %s != %s" % @@ -64,8 +62,59 @@ def test_bulkload_validate(man): bulk.addEdge("4", "5", None, {"weight": 1.0}) err = bulk.execute() - if err["errorCount"] == 0: errors.append("Validation error not detected") - print(err) + + return errors + + +def test_bulk_delete(man): + errors = [] + G = man.writeTest() + + G.addVertex("vertex1", "Person", {"name": "marko", "age": "29"}) + G.addVertex("vertex2", "Person", {"name": "vadas", "age": "27"}) + G.addVertex("vertex3", "Software", {"name": "lop", "lang": "java"}) + G.addVertex("vertex4", "Person", {"name": "josh", "age": "32"}) + G.addVertex("vertex5", "Software", {"name": "ripple", "lang": "java"}) + G.addVertex("vertex6", "Person", {"name": "peter", "age": "35"}) + + G.addEdge("vertex1", "vertex3", "created", {"weight": 0.4}, id="edge1") + G.addEdge("vertex1", "vertex2", "knows", {"weight": 0.5}, id="edge2") + G.addEdge("vertex1", "vertex4", "knows", {"weight": 1.0}, id="edge3") + G.addEdge("vertex4", "vertex3", "created", {"weight": 0.4}, id="edge4") + G.addEdge("vertex6", "vertex3", "created", {"weight": 0.2}, id="edge5") + G.addEdge("vertex3", "vertex5", "created", {"weight": 1.0}, id="edge6") + G.addEdge("vertex6", "vertex5", "created", {"weight": 1.0}, id="edge7") + G.addEdge("vertex4", "vertex5", "created", {"weight": 0.4}, id="edge8") + G.addEdge("vertex4", "vertex6", "created", {"weight": 0.4}, id="edge9") + + G.delete(vertices=["vertex1", "vertex2", + "vertex3"], + edges=[]) + + Ecount = G.V().outE().count().execute()[0]["count"] + Vcount = G.V().count().execute()[0]["count"] + if Ecount != 3: + errors.append(f"Wrong number of edges {Ecount} != 3") + if Vcount != 3: + errors.append(f"Wrong number of vertices {Vcount} != 3") + + G.delete(vertices=[], edges=["edge7"]) + Ecount = G.V().outE().count().execute()[0]["count"] + Vcount = G.V().count().execute()[0]["count"] + if Ecount != 2: + errors.append(f"Wrong number of edges {Ecount} != 2") + if Vcount != 3: + errors.append(f"Wrong number of vertices {Vcount} != 3") + + + G.delete(vertices=["vertex5", "vertex6"], edges=["edge9"]) + Ecount = G.V().outE().count().execute()[0]["count"] + Vcount = G.V().count().execute()[0]["count"] + if Ecount != 0: + errors.append(f"Wrong number of edges {Ecount} != 0") + if Vcount != 1: + errors.append(f"Wrong number of vertices {Vcount} != 1") + return errors diff --git a/conformance/tests/ot_bulk_raw.py b/conformance/tests/ot_bulk_raw.py new file mode 100644 index 000000000..14471d656 --- /dev/null +++ b/conformance/tests/ot_bulk_raw.py @@ -0,0 +1,72 @@ +import json + +def load_json_schema(path): + with open(path, 'r') as file: + content = file.read() + return json.loads(content) + + +def test_bulk_add_raw(man): + errors = [] + + G = man.writeTest() + G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json")) + + fetchedSchema = G.getSchema() + len_vertices = len(fetchedSchema['vertices']) + if len_vertices != 2: + errors.append(f"incorrect number of vertices in schema {len_vertices} != 2") + + bulkRaw = G.bulkAddRaw() + bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders. Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]}) + bulkRaw.addJson(data={"id": "prompt:1", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]}) + bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"}) + bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"}) + err = bulkRaw.execute() + + if err["insertCount"] != 4: + errors.append(f"Wrong number of inserted vertices {err['insertCount']} != 4") + if len(err["errors"]) != 0: + errors.append(f"Wrong number of errors {len(err['errors'])} != 0") + + vertex = G.getVertex("prompt:0")['responses'] + if vertex != ['response:0']: + errors.append("prompt:0 responses != ['response:0']") + + labels = G.listLabels() + if not all(item in labels['vertexLabels'] for item in ['Prompt', 'Response']): + errors.append(f"After insert operations {labels} != expected {{'vertexLabels': ['Condition', 'Patient']}}") + + return errors + + + +def test_bulk_add_raw_validation_error(man): + errors = [] + G = man.writeTest() + G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json")) + + bulkRaw = G.bulkAddRaw() + bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders. Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]}) + bulkRaw.addJson(data={"id": ["prompt:1"], "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]}) + bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"}) + bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"}) + + err = bulkRaw.execute() + if err['insertCount'] != 3 or len(err['errors']) != 1: + errors.append(f"validation error causes -1 insertCount +1 error: {err['insertCount']} != 3 or {len(err['errors'])} != 1") + + return errors + + +def test_bulk_add_raw_no_schema(man): + errors = [] + + G = man.writeTest() + bulkRaw = G.bulkAddRaw() + bulkRaw.addJson(data={"category":[{"coding":[{"code":"encounter-diagnosis","display":"Encounter Diagnosis","system":"http://terminology.hl7.org/CodeSystem/condition-category"}]}],"clinicalStatus":{"coding":[{"code":"active","system":"http://terminology.hl7.org/CodeSystem/condition-clinical"}]},"code":{"coding":[{"code":"230690007","display":"Stroke","system":"http://snomed.info/sct"}],"text":"Stroke"},"encounter":{"reference":"Encounter/f78a1442-683a-4ea2-adca-161902be19cb"},"id":"838e42fb-a65d-4039-9f83-59c37b1ae889","links":[{"href":"Patient/45c11dad-2b38-4c8e-822e-7abff8a1ee1d","rel":"subject_Patient"}],"meta":{"lastUpdated":"2023-01-26T14:21:56.658+00:00","profile":["http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition"],"source":"#DmW9sueQ4yuQdyA9","versionId":"1"},"onsetDateTime":"2013-08-24T15:40:53-04:00","recordedDate":"2013-08-24T15:40:53-04:00","resourceType":"Condition","subject":{"reference":"Patient/45c11dad-2b38-4c8e-822e-7abff8a1ee1d"},"verificationStatus":{"coding":[{"code":"confirmed","system":"http://terminology.hl7.org/CodeSystem/condition-ver-status"}]}}) + err = bulkRaw.execute() + if len(err["errors"]) != 1: + errors.append("No schema was provided so error count should equal 1") + + return [] diff --git a/conformance/tests/ot_bulk_raw_yaml.py b/conformance/tests/ot_bulk_raw_yaml.py new file mode 100644 index 000000000..85d2ae855 --- /dev/null +++ b/conformance/tests/ot_bulk_raw_yaml.py @@ -0,0 +1,42 @@ +import json +import yaml + +def test_post_yaml_schema(man): + errors = [] + G = man.writeTest() + + prompt = process_graph_schema("conformance/graphs/prompt.yaml") + response = process_graph_schema("conformance/graphs/response.yaml") + + G.addSchema(vertices=prompt) + G.addSchema(vertices=response) + + fetchedSchema = G.getSchema() + len_vertices = len(fetchedSchema['vertices']) + if len_vertices != 2: + errors.append(f"incorrect number of vertices in schema {len_vertices} != 2") + + bulkRaw = G.bulkAddRaw() + bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders. Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]}) + bulkRaw.addJson(data={"id": "prompt:1", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]}) + bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"}) + bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"}) + err = bulkRaw.execute() + + if err["insertCount"] != 4: + errors.append(f"Wrong number of inserted vertices {err['insertCount']} != 4") + if len(err["errors"]) != 0: + errors.append(f"Wrong number of errors {len(err['errors'])} != 0") + + vertex = G.getVertex("prompt:0")['responses'] + if vertex != ['response:0']: + errors.append("prompt:0 responses != ['response:0']") + + return errors + +def process_graph_schema(path): + with open(path, 'r') as file: + content = file.read() + vertex = yaml.safe_load(content) + id = vertex["id"].split("/")[-1] + return [{"data":vertex, "label": id, "id": vertex["id"] }] diff --git a/conformance/tests/ot_count.py b/conformance/tests/ot_count.py index 63fab79dd..21fa5e583 100644 --- a/conformance/tests/ot_count.py +++ b/conformance/tests/ot_count.py @@ -5,30 +5,30 @@ def test_count(man): G = man.setGraph("swapi") - i = list(G.query().V().count()) + i = list(G.V().count()) if len(i) < 1: - errors.append("Fail: nothing returned for O.query().V().count()") + errors.append("Fail: nothing returned for O.V().count()") elif i[0]["count"] != 39: - errors.append("Fail: G.query().V().count() %s != %s" % (i[0]["count"], 39)) + errors.append("Fail: G.V().count() %s != %s" % (i[0]["count"], 39)) - i = list(G.query().V("non-existent").count()) - print(i) + i = list(G.V("non-existent").count()) + #print(i) if len(i) < 1: - errors.append("Fail: nothing returned for O.query().V(\"non-existent\").count()") + errors.append("Fail: nothing returned for O.V(\"non-existent\").count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().V(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) - i = list(G.query().E().count()) + i = list(G.V().outE().count()) if len(i) < 1: - errors.append("Fail: nothing returned for O.query().E().count()") + errors.append("Fail: nothing returned for O.V().outE().count()") elif i[0]["count"] != 144: - errors.append("Fail: G.query().E().count() %s != %s" % (i[0]["count"], 144)) + errors.append("Fail: G.V().outE().count() %s != %s" % (i[0]["count"], 144)) - i = list(G.query().E("non-existent").count()) + i = list(G.V().outE("non-existent").count()) if len(i) < 1: - errors.append("Fail: nothing returned for G.query().E(\"non-existent\").count()") + errors.append("Fail: nothing returned for G.E(\"non-existent\").count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().E(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V().outE(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) return errors @@ -40,29 +40,29 @@ def test_count_when_no_data(man): G = man.writeTest() - i = list(G.query().V().count()) - print(i) + i = list(G.V().count()) + #print(i) if len(i) < 1: - errors.append("Fail: nothing returned for G.query().V().count()") + errors.append("Fail: nothing returned for G.V().count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().V().count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V().count() %s != %s" % (i[0]["count"], 0)) - i = list(G.query().V("non-existent").count()) + i = list(G.V("non-existent").count()) if len(i) < 1: - errors.append("Fail: nothing returned for G.query().V(\"non-existent\").count()") + errors.append("Fail: nothing returned for G.V(\"non-existent\").count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().V(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) - i = list(G.query().E().count()) + i = list(G.V().outE().count()) if len(i) < 1: - errors.append("Fail: nothing returned for G.query().E().count()") + errors.append("Fail: nothing returned for G.V().outE().count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().E().count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V().outE().count() %s != %s" % (i[0]["count"], 0)) - i = list(G.query().E("non-existent").count()) + i = list(G.V().outE("non-existent").count()) if len(i) < 1: - errors.append("Fail: nothing returned for G.query().E(\"non-existent\").count()") + errors.append("Fail: nothing returned for G.E(\"non-existent\").count()") elif i[0]["count"] != 0: - errors.append("Fail: G.query().E(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) + errors.append("Fail: G.V().outE(\"non-existent\").count() %s != %s" % (i[0]["count"], 0)) return errors diff --git a/conformance/tests/ot_distinct.py b/conformance/tests/ot_distinct.py index 4084c009a..a68ccdd0d 100644 --- a/conformance/tests/ot_distinct.py +++ b/conformance/tests/ot_distinct.py @@ -4,46 +4,46 @@ def test_distinct(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().distinct(): + for i in G.V().distinct(): count += 1 if count != 39: - errors.append("Distinct %s != %s" % (count, 39)) + errors.append("V().distinct() distinct count %s != %s" % (count, 39)) count = 0 - for i in G.query().V().distinct("_gid"): + for i in G.V().distinct("_id"): count += 1 if count != 39: - errors.append("Distinct %s != %s" % (count, 39)) + errors.append("""V().distinct("_id") distinct count %s != %s""" % (count, 39)) count = 0 - for i in G.query().V().distinct("eye_color"): + for i in G.V().distinct("eye_color"): count += 1 if count != 8: - errors.append("Distinct %s != %s" % (count, 8)) + errors.append("""V().distinct("eye_color") distinct count %s != %s""" % (count, 8)) count = 0 - for i in G.query().V().distinct("gender"): + for i in G.V().distinct("gender"): count += 1 if count != 4: - errors.append("Distinct %s != %s" % (count, 4)) + errors.append("""V().distinct("gender") distinct count %s != %s""" % (count, 4)) count = 0 - for i in G.query().V().distinct("non-existent-field"): + for i in G.V().distinct("non-existent-field"): count += 1 if count != 0: errors.append("Distinct %s != %s" % (count, 0)) count = 0 - for i in G.query().V().hasLabel("Character").as_("person").out().distinct("$person.name"): + for i in G.V().hasLabel("Character").as_("person").out().distinct("$person.name"): count += 1 if count != 18: - errors.append("Distinct G.query().V().hasLabel(\"Person\").as_(\"person\").out().distinct(\"$person.name\") %s != %s" % (count, 18)) + errors.append("Distinct G.V().hasLabel(\"Character\").as_(\"person\").out().distinct(\"$person.name\") %s != %s" % (count, 18)) count = 0 - for i in G.query().V().hasLabel("Character").as_("person").out().distinct("$person.eye_color"): + for i in G.V().hasLabel("Character").as_("person").out().distinct("$person.eye_color"): count += 1 if count != 8: - errors.append("Distinct G.query().V().hasLabel(\"Person\").as_(\"person\").out().distinct(\"$person.eye_color\") %s != %s" % (count, 8)) + errors.append("Distinct G.V().hasLabel(\"Character\").as_(\"person\").out().distinct(\"$person.eye_color\") %s != %s" % (count, 8)) return errors @@ -55,7 +55,7 @@ def test_distinct_multi(man): count = 0 o = {} - for i in G.query().V().as_("a").out().distinct(["$a.eye_color", "_gid"]).render(["$a.eye_color", "_gid"]): + for i in G.V().as_("a").out().distinct(["$a.eye_color", "_id"]).render(["$a.eye_color", "_id"]): if i[0] in o and o[i[0]] != i[1]: errors.append("Non-unique pair returned: %s" % (i)) count += 1 diff --git a/conformance/tests/ot_error.py b/conformance/tests/ot_error.py index b46f31c99..8f00e9163 100644 --- a/conformance/tests/ot_error.py +++ b/conformance/tests/ot_error.py @@ -6,7 +6,7 @@ def test_fields(man): G = man.setGraph("swapi") try: - for i in G.query().out(): + for i in G.out(): pass errors.append("Bad traversal query returned without exception") except Exception: diff --git a/conformance/tests/ot_fields.py b/conformance/tests/ot_fields.py index 8ad06aa0a..c4d4f65b0 100644 --- a/conformance/tests/ot_fields.py +++ b/conformance/tests/ot_fields.py @@ -5,20 +5,19 @@ def test_fields(man): G = man.setGraph("swapi") expected = { - u"gid": u"Character:1", - u"label": u"Character", - u"data": {u"name": u"Luke Skywalker"} + u"_id": u"Character:1", + u"_label": u"Character", + u"name": u"Luke Skywalker" } - resp = G.query().V("Character:1").fields(["name"]).execute() + resp = G.V("Character:1").fields(["name"]).execute() if resp[0] != expected: - errors.append("vertex contains incorrect fields: \nexpected:%s\nresponse:%s" % (expected, resp)) + errors.append("""Query 'V("Character:1").fields(["name"])' vertex contains incorrect fields: \nexpected:%s\nresponse:%s""" % (expected, resp)) expected = { - u"gid": u"Character:1", - u"label": u"Character", - u"data": {} + u"_id": u"Character:1", + u"_label": u"Character", } - resp = G.query().V("Character:1").fields(["non-existent"]).execute() + resp = G.V("Character:1").fields(["non-existent"]).execute() if resp[0] != expected: errors.append("vertex contains incorrect fields: \nexpected:%s\nresponse:%s" % (expected, resp)) diff --git a/conformance/tests/ot_group.py b/conformance/tests/ot_group.py new file mode 100644 index 000000000..8f88094d1 --- /dev/null +++ b/conformance/tests/ot_group.py @@ -0,0 +1,31 @@ +from __future__ import absolute_import + +import gripql + +def test_childGroups(man): + errors = [] + G = man.setGraph("swapi") + + mapping = { + 'Planet:1' : ['Luke Skywalker', 'C-3PO', 'Darth Vader', 'Owen Lars', 'Beru Whitesun lars', 'R5-D4', 'Biggs Darklighter'], + 'Planet:2' : ['Leia Organa', 'Raymus Antilles'] + } + mapping_hair = { + 'Planet:1' : ["blond", None, "none", "brown, grey", "brown", None, "black"], + 'Planet:2' : ["brown", "brown"] + } + + for i in G.V().hasLabel("Planet").as_("planet").out("residents").as_("character").select("planet").group( {"people" : "$character.name"} ): + #print(i) + if sorted(i["people"]) != sorted(mapping[i["_id"]]): + errors.append("grouped output not equal: %s != %s" % (sorted(i["people"]) , sorted(mapping[i["_id"]]))) + + for i in G.V().hasLabel("Planet").as_("planet").out("residents").as_("character").select("planet").group( + {"people" : "$character.name", "hair":"$character.hair_color"} ): + #print(i) + if sorted(i["people"]) != sorted(mapping[i["_id"]]): + errors.append("grouped output not equal: %s != %s" % (sorted(i["people"]) , sorted(mapping[i["_id"]]))) + + if sorted(i["hair"], key=lambda x: (x is None, x)) != sorted(mapping_hair[i["_id"]], key=lambda x: (x is None, x)): + errors.append("grouped output not equal: %s != %s" % (sorted(i["hair"], key=lambda x: (x is None, x)) , sorted(mapping_hair[i["_id"]], key=lambda x: (x is None, x)))) + return errors diff --git a/conformance/tests/ot_has.py b/conformance/tests/ot_has.py index 89ea77238..d9c4e48fa 100644 --- a/conformance/tests/ot_has.py +++ b/conformance/tests/ot_has.py @@ -9,27 +9,27 @@ def test_hasLabel(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().hasLabel("Vehicle"): + for i in G.V().hasLabel("Vehicle"): count += 1 - if not i['gid'].startswith("Vehicle:"): + if not i["_id"].startswith("Vehicle:"): errors.append("Wrong vertex returned %s" % (i)) if count != 4: errors.append( - "Fail: G.query().V().hasLabel(\"Vehicle\") %s != %s" % + "Fail: G.V().hasLabel(\"Vehicle\") %s != %s" % (count, 4)) - for i in G.query().V().hasLabel("Starship"): - if not i['gid'].startswith("Starship:"): + for i in G.V().hasLabel("Starship"): + if not i["_id"].startswith("Starship:"): errors.append("Wrong vertex returned %s" % (i)) count = 0 - for i in G.query().V().hasLabel(["Vehicle", "Starship"]): - if "name" not in i["data"]: - errors.append("vertex %s returned without data" % (i.gid)) + for i in G.V().hasLabel(["Vehicle", "Starship"]): + if "name" not in i: + errors.append("vertex %s returned without data" % (i._id)) count += 1 if count != 12: errors.append( - "Fail: G.query().V().hasLabel([\"Vehicle\", \"Starship\"]) %s != %s" % + "Fail: G.V().hasLabel([\"Vehicle\", \"Starship\"]) %s != %s" % (count, 12)) return errors @@ -41,23 +41,23 @@ def test_hasKey(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().hasKey("manufacturer"): + for i in G.V().hasKey("manufacturer"): count += 1 - if not i['gid'].startswith("Vehicle:") and not i['gid'].startswith("Starship:"): + if not i["_id"].startswith("Vehicle:") and not i["_id"].startswith("Starship:"): errors.append("Wrong vertex returned %s" % (i)) if count != 12: errors.append( - "Fail: G.query().V().hasKey(\"manufacturer\") %s != %s" % + "Fail: G.V().hasKey(\"manufacturer\") %s != %s" % (count, 12)) count = 0 - for i in G.query().V().hasKey(["hyperdrive_rating", "manufacturer"]): + for i in G.V().hasKey(["hyperdrive_rating", "manufacturer"]): count += 1 - if not i['gid'].startswith("Starship:"): + if not i["_id"].startswith("Starship:"): errors.append("Wrong vertex returned %s" % (i)) if count != 8: errors.append( - "Fail: G.query().V().hasKey([\"hyperdrive_rating\", \"manufacturer\"]) %s != %s" % + "Fail: G.V().hasKey([\"hyperdrive_rating\", \"manufacturer\"]) %s != %s" % (count, 8)) return errors @@ -69,23 +69,23 @@ def test_hasId(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().hasId("Character:1"): + for i in G.V().hasId("Character:1"): count += 1 - if i['gid'] != "Character:1": + if i["_id"] != "Character:1": errors.append("Wrong vertex returned %s" % (i)) if count != 1: errors.append( - "Fail: G.query().V().hasId(\"01\") %s != %s" % + "Fail: G.V().hasId(\"Character:1\") %s != %s" % (count, 1)) count = 0 - for i in G.query().V().hasId(["Character:1", "Character:2"]): + for i in G.V().hasId(["Character:1", "Character:2"]): count += 1 - if i['gid'] not in ["Character:1", "Character:2"]: + if i["_id"] not in ["Character:1", "Character:2"]: errors.append("Wrong vertex returned %s" % (i)) if count != 2: errors.append( - "Fail: G.query().V().hasId([\"Character:1\", \"Character:2\"]) %s != %s" % + "Fail: G.V().hasId([\"Character:1\", \"Character:2\"]) %s != %s" % (count, 2)) return errors @@ -97,73 +97,91 @@ def test_has_eq(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.eq("_gid", "Character:3")): + for i in G.V().has(gripql.eq("_id", "Character:3")): count += 1 - if i['gid'] != "Character:3": + if i["_id"] != "Character:3": errors.append("Wrong vertex returned %s" % (i)) if count != 1: errors.append( - "Fail: G.query().V().has(gripql.eq(\"_gid\", \"Character:3\")) %s != %s" % + "Fail: G.V().has(gripql.eq(\"_id\", \"Character:3\")) %s != %s" % (count, 1)) count = 0 - for i in G.query().V().has(gripql.eq("_label", "Character")): + for i in G.V().has(gripql.eq("_label", "Character")): count += 1 - if i['label'] != "Character": - errors.append("Wrong vertex label %s" % (i['label'])) + if i["_label"] != "Character": + errors.append("Wrong vertex label %s" % (i["_label"])) if count != 18: errors.append( - "Fail: G.query().V().has(gripql.eq(\"_label\", \"person\")) %s != %s" % + "Fail: G.V().has(gripql.eq(\"_label\", \"person\")) %s != %s" % (count, 18)) count = 0 - for i in G.query().V().has(gripql.eq("eye_color", "brown")): + for i in G.V().has(gripql.eq("eye_color", "brown")): count += 1 - if i['gid'] not in ["Character:14", "Character:5", "Character:81", "Character:9"]: + if i["_id"] not in ["Character:14", "Character:5", "Character:81", "Character:9"]: errors.append("Wrong vertex returned %s" % (i)) if count != 4: errors.append( - "Fail: G.query().V().has(gripql.eq(\"eye_color\", \"brown\")) %s != %s" % + "Fail: G.V().has(gripql.eq(\"eye_color\", \"brown\")) %s != %s" % (count, 4)) return errors +def test_has_prev(man): + errors = [] + G = man.setGraph("swapi") + + q = G.V().hasLabel("Character").as_("1").out("homeworld").out("residents") + q = q.has(gripql.neq("$1._id", "$._id")) + count = 0 + for i in q.render(["$1._id", "$._id"]): + if i[0] == i[1]: + errors.append("History based filter failed: %s" % (i[0]) ) + count += 1 + if count < 10: + errors.append("Not enough elements found: %d" % (count)) + return errors + + def test_has_neq(man): errors = [] G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.neq("_gid", "Character:1")): + for i in G.V().has(gripql.neq("_id", "Character:1")): count += 1 - if i['gid'] == "Character:1": + if i["_id"] == "Character:1": errors.append("Wrong vertex returned %s" % (i)) if count != 38: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.eq(\"_gid\", \"Character:1\"))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.eq(\"_id\", \"Character:1\"))) %s != %s" % (count, 38)) count = 0 - for i in G.query().V().has(gripql.neq("_label", "Character")): + for i in G.V().has(gripql.neq("_label", "Character")): count += 1 - if i['label'] == "Character": - errors.append("Wrong vertex label %s" % (i['label'])) + if i["_label"] == "Character": + errors.append("Wrong vertex label %s" % (i["_label"])) if count != 21: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.eq(\"_label\", \"Character\"))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.eq(\"_label\", \"Character\"))) %s != %s" % (count, 21)) + count = 0 - for i in G.query().V().hasLabel("Character").has(gripql.neq("eye_color", "brown")): + for i in G.V().hasLabel("Character").has(gripql.neq("eye_color", "brown")): count += 1 - if i['data']["eye_color"] == "brown": + if i["eye_color"] == "brown": errors.append("Wrong vertex returned %s" % (i)) if count != 14: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.eq(\"eye_color\", \"brown\"))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.eq(\"eye_color\", \"brown\"))) %s != %s" % (count, 14)) + return errors @@ -173,51 +191,87 @@ def test_has_gt(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.gt("height", 202)): + for i in G.V().has(gripql.gt("height", 202)): count += 1 - if i['gid'] not in ["Character:13"]: + if i["_id"] not in ["Character:13"]: errors.append("Wrong vertex returned %s" % (i)) if count != 1: errors.append( - "Fail: G.query().V().has(gripql.gt(\"height\", 200)) %s != %s" % + "Fail: G.V().has(gripql.gt(\"height\", 200)) %s != %s" % (count, 1)) count = 0 - for i in G.query().V().has(gripql.gte("height", 202)): + for i in G.V().has(gripql.gte("height", 202)): count += 1 - if i['gid'] not in ["Character:4", "Character:13"]: + if i["_id"] not in ["Character:4", "Character:13"]: errors.append("Wrong vertex returned %s" % (i)) if count != 2: errors.append( - "Fail: G.query().V().has(gripql.gte(\"height\", 202)) %s != %s" % + "Fail: G.V().has(gripql.gte(\"height\", 202)) %s != %s" % (count, 2)) return errors +def test_has_eq_nil(man): + errors = [] + G = man.setGraph("swapi") + count = 0 + for i in G.V().has(gripql.eq("height", None)): + count += 1 + + if count != 21: + errors.append( + "Fail: G.V().has(gripql.eq(\"height\", None)) %s != %s" % + (count, 21)) + + return errors + + +def test_has_gt_nil(man): + """None, nil translates to 0 when refering to numeric values, + so this evaluates to return All characters with height value greater than 0""" + errors = [] + G = man.setGraph("swapi") + count = 0 + for i in G.V().has(gripql.gt("height", None)): + count += 1 + if count != 0: + errors.append("Fail: G.query.V().has(gripql.gt(\"height\", None)) %s != %s" % (count, 0)) + + return errors + + def test_has_lt(man): errors = [] G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.lt("height", 97)): + + for i in G.V().has(gripql.lt("height", 97)): count += 1 - if i['gid'] not in ["Character:3"]: + + if i["_id"] not in ["Character:3"]: errors.append("Wrong vertex returned %s" % (i)) if count != 1: errors.append( - "Fail: G.query().V().has(gripql.lt(\"height\", 97)) %s != %s" % + "Fail: G.V().has(gripql.lt(\"height\", 97)) %s != %s" % (count, 1)) + return errors + +def test_has_lte(man): + errors = [] + G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.lte("height", 97)): + for i in G.V().has(gripql.lte("height", 97)): count += 1 - if i['gid'] not in ["Character:3", "Character:8"]: + if i["_id"] not in ["Character:3", "Character:8"]: errors.append("Wrong vertex returned %s" % (i)) if count != 2: errors.append( - "Fail: G.query().V().has(gripql.lte(\"height\", 97)) %s != %s" % + "Fail: G.V().has(gripql.lte(\"height\", 97)) %s != %s" % (count, 2)) return errors @@ -229,13 +283,13 @@ def test_has_inside(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.inside("height", 100, 200)): + for i in G.V().has(gripql.inside("height", 100, 200)): count += 1 - if i['gid'] in ["Character:3", "Character:4", "Character:8", "Character:13"]: + if i["_id"] in ["Character:3", "Character:4", "Character:8", "Character:13"]: errors.append("Wrong vertex returned %s" % (i)) if count != 14: errors.append( - "Fail: G.query().V().has(gripql.inside(\"age\", 30, 60)) %s != %s" % + "Fail: G.V().has(gripql.inside(\"age\", 30, 60)) %s != %s" % (count, 14)) return errors @@ -247,13 +301,13 @@ def test_has_outside(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.outside("height", 100, 200)): + for i in G.V().has(gripql.outside("height", 100, 200)): count += 1 - if i['gid'] not in ["Character:3", "Character:4", "Character:8", "Character:13"]: + if i["_id"] not in ["Character:3", "Character:4", "Character:8", "Character:13"]: errors.append("Wrong vertex returned %s" % (i)) if count != 4: errors.append( - "Fail: G.query().V().has(gripql.outside(\"age\", 30, 60)) %s != %s" % + "Fail: G.V().has(gripql.outside(\"age\", 30, 60)) %s != %s" % (count, 4)) return errors @@ -265,13 +319,13 @@ def test_has_between(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.between("height", 180, 200)): + for i in G.V().has(gripql.between("height", 180, 200)): count += 1 - if i['gid'] not in ["Character:10", "Character:12", "Character:14", "Character:19", "Character:81", "Character:9"]: + if i["_id"] not in ["Character:10", "Character:12", "Character:14", "Character:19", "Character:81", "Character:9"]: errors.append("Wrong vertex returned %s" % (i)) if count != 6: errors.append( - "Fail: G.query().V().has(gripql.between(\"height\", 180, 200)) %s != %s" % + "Fail: G.V().has(gripql.between(\"height\", 180, 200)) %s != %s" % (count, 5)) return errors @@ -282,21 +336,21 @@ def test_has_within(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.within("eye_color", ["brown", "hazel"])): + for i in G.V().has(gripql.within("eye_color", ["brown", "hazel"])): count += 1 - if i['gid'] not in ["Character:14", "Character:18", "Character:5", "Character:81", "Character:9"]: + if i["_id"] not in ["Character:14", "Character:18", "Character:5", "Character:81", "Character:9"]: errors.append("Wrong vertex returned %s" % (i)) if count != 5: errors.append( - "Fail: G.query().V().has(gripql.within(\"eye_color\", [\"brown\", \"hazel\"])) %s != %s" % + "Fail: G.V().has(gripql.within(\"eye_color\", [\"brown\", \"hazel\"])) %s != %s" % (count, 5)) count = 0 - for i in G.query().V().has(gripql.within("eye_color", 0)): + for i in G.V().has(gripql.within("eye_color", 0)): count += 1 if count != 0: errors.append( - "Fail: G.query().V().has(gripql.within(\"eye_color\", 0)) %s != %s" % + "Fail: G.V().has(gripql.within(\"eye_color\", 0)) %s != %s" % (count, 0)) return errors @@ -308,21 +362,21 @@ def test_has_without(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.without("eye_color", ["brown"])): + for i in G.V().has(gripql.without("eye_color", ["brown"])): count += 1 - if i['gid'] in ["Character:5", "Character:9", "Character:14", "Character:81"]: + if i["_id"] in ["Character:5", "Character:9", "Character:14", "Character:81"]: errors.append("Wrong vertex returned %s" % (i)) if count != 35: errors.append( - "Fail: G.query().V().has(gripql.without(\"occupation\", [\"jedi\", \"sith\"])) %s != %s" % + """Fail: V().has(gripql.without("eye_color", ["brown"])) %s != %s""" % (count, 35)) count = 0 - for i in G.query().V().has(gripql.without("occupation", 0)): + for i in G.V().has(gripql.without("occupation", 0)): count += 1 if count != 39: errors.append( - "Fail: G.query().V().has(gripql.without(\"occupation\", 0)) %s != %s" % + "Fail: G.V().has(gripql.without(\"occupation\", 0)) %s != %s" % (count, 39)) return errors @@ -334,13 +388,13 @@ def test_has_contains(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.contains("terrain", "jungle")): + for i in G.V().has(gripql.contains("terrain", "jungle")): count += 1 - if i['gid'] not in ["Planet:3"]: + if i["_id"] not in ["Planet:3"]: errors.append("Wrong vertex returned %s" % (i)) if count != 1: errors.append( - "Fail: G.query().V().has(gripql.contains(\"terrain\", \"jungle\")) %s != %s" % + "Fail: G.V().has(gripql.contains(\"terrain\", \"jungle\")) %s != %s" % (count, 1)) return errors @@ -352,13 +406,13 @@ def test_has_and(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.and_(gripql.eq("_label", "Character"), gripql.eq("eye_color", "blue"))): + for i in G.V().has(gripql.and_(gripql.eq("_label", "Character"), gripql.eq("eye_color", "blue"))): count += 1 - if i['gid'] not in ["Character:1", "Character:12", "Character:13", "Character:19", "Character:6", "Character:7"]: + if i["_id"] not in ["Character:1", "Character:12", "Character:13", "Character:19", "Character:6", "Character:7"]: errors.append("Wrong vertex returned %s" % (i)) if count != 6: errors.append( - "Fail: G.query().V().has(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.eq(\"eye_color\", \"blue\"))) %s != %s" % + "Fail: G.V().has(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.eq(\"eye_color\", \"blue\"))) %s != %s" % (count, 6)) return errors @@ -370,13 +424,13 @@ def test_has_or(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.or_(gripql.eq("eye_color", "blue"), gripql.eq("eye_color", "hazel"))): + for i in G.V().has(gripql.or_(gripql.eq("eye_color", "blue"), gripql.eq("eye_color", "hazel"))): count += 1 - if i['gid'] not in ["Character:1", "Character:12", "Character:13", "Character:18", "Character:19", "Character:6", "Character:7"]: + if i["_id"] not in ["Character:1", "Character:12", "Character:13", "Character:18", "Character:19", "Character:6", "Character:7"]: errors.append("Wrong vertex returned %s" % (i)) if count != 7: errors.append( - "Fail: G.query().V().has(gripql.or_(gripql.eq(\"eye_color\", \"blue\"), gripql.eq(\"eye_color\", \"hazel\"))) %s != %s" % + "Fail: G.V().has(gripql.or_(gripql.eq(\"eye_color\", \"blue\"), gripql.eq(\"eye_color\", \"hazel\"))) %s != %s" % (count, 7)) return errors @@ -388,23 +442,23 @@ def test_has_not(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has(gripql.not_(gripql.eq("_label", "Character"))): + for i in G.V().has(gripql.not_(gripql.eq("_label", "Character"))): count += 1 - if i['gid'].startswith("Character"): + if i["_id"].startswith("Character"): errors.append("Wrong vertex returned %s" % (i)) if count != 21: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.eq(\"_label\", \"Character\"))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.eq(\"_label\", \"Character\"))) %s != %s" % (count, 21)) count = 0 - for i in G.query().V().has(gripql.not_(gripql.neq("_label", "Character"))): + for i in G.V().has(gripql.not_(gripql.neq("_label", "Character"))): count += 1 - if not i['gid'].startswith("Character"): + if not i["_id"].startswith("Character"): errors.append("Wrong vertex returned %s" % (i)) if count != 18: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.neq(\"_label\", \"Character\"))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.neq(\"_label\", \"Character\"))) %s != %s" % (count, 18)) return errors @@ -416,7 +470,7 @@ def test_has_complex(man): G = man.setGraph("swapi") count = 0 - for i in G.query().V().has( + for i in G.V().has( gripql.and_( gripql.eq("_label", "Character"), gripql.not_( @@ -428,16 +482,16 @@ def test_has_complex(man): ) ): count += 1 - if i['label'] == "Character" and (i["data"]["eye_color"] == "brown" or i["data"]["eye_color"] == "hazel"): + if i["_label"] == "Character" and (i["eye_color"] == "brown" or i["eye_color"] == "hazel"): errors.append("Wrong vertex returned %s" % (i)) if count != 13: errors.append( - "Fail: G.query().V().has(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.not_(gripql.or_(gripql.eq(\"eye_color\", \"brown\"), gripql.eq(\"eye_color\", \"hazel\"))))) %s != %s" % + "Fail: G.V().has(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.not_(gripql.or_(gripql.eq(\"eye_color\", \"brown\"), gripql.eq(\"eye_color\", \"hazel\"))))) %s != %s" % (count, 13) ) count = 0 - for i in G.query().V().has( + for i in G.V().has( gripql.not_( gripql.or_( gripql.eq("_label", "Character"), @@ -446,16 +500,16 @@ def test_has_complex(man): ) ): count += 1 - if i['label'] == "Character" or ("name" in i["data"] and i['data']["name"] == "Human"): + if i["_label"] == "Character" or ("name" in i and i["name"] == "Human"): errors.append("Wrong vertex returned %s" % (i)) if count != 20: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.eq(\"name\", \"Human\")))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.and_(gripql.eq(\"_label\", \"Character\"), gripql.eq(\"name\", \"Human\")))) %s != %s" % (count, 20) ) count = 0 - for i in G.query().V().has( + for i in G.V().has( gripql.not_( gripql.or_( gripql.eq("_label", "Character"), @@ -467,18 +521,18 @@ def test_has_complex(man): ) ): count += 1 - if not i['gid'].startswith("Vehicle:") \ - and not i["gid"].startswith("Starship:") and not i["gid"].startswith("Species:") \ - and not i["gid"].startswith("Planet:") and not i["gid"].startswith("Film:"): + if not i["_id"].startswith("Vehicle:") \ + and not i["_id"].startswith("Starship:") and not i["_id"].startswith("Species:") \ + and not i["_id"].startswith("Planet:") and not i["_id"].startswith("Film:"): errors.append("Wrong vertex returned %s" % (i)) if count != 19: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.or_(gripql.eq(\"_label\", \"Character\"), gripql.or_(gripql.eq(\"name\", \"Human\"), gripql.contains(\"terrain\", \"jungle\"))))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.or_(gripql.eq(\"_label\", \"Character\"), gripql.or_(gripql.eq(\"name\", \"Human\"), gripql.contains(\"terrain\", \"jungle\"))))) %s != %s" % (count, 19) ) count = 0 - for i in G.query().V().has( + for i in G.V().has( gripql.not_( gripql.and_( gripql.eq("_label", "Planet"), @@ -492,7 +546,7 @@ def test_has_complex(man): count += 1 if count != 37: errors.append( - "Fail: G.query().V().has(gripql.not_(gripql.and_(gripql.eq(\"_label\", \"Planet\"), gripql.or_(gripql.eq(\"surface_water\", 1), gripql.contains(\"terrain\", \"jungle\"))))) %s != %s" % + "Fail: G.V().has(gripql.not_(gripql.and_(gripql.eq(\"_label\", \"Planet\"), gripql.or_(gripql.eq(\"surface_water\", 1), gripql.contains(\"terrain\", \"jungle\"))))) %s != %s" % (count, 37) ) diff --git a/conformance/tests/ot_index.py b/conformance/tests/ot_index.py index 991d42dbb..eb4e6f5ce 100644 --- a/conformance/tests/ot_index.py +++ b/conformance/tests/ot_index.py @@ -1,15 +1,40 @@ +import gripql + + +def test_index_create_and_delete(man): + errors = [] + G = man.writeTest() + G.addIndex("Person", "name") + found = False + indices = G.listIndices() + for i in indices: + if i["field"] == "name" and i["label"] == "Person": + found = True + if not found: + errors.append("Expected index to be found") + + G.deleteIndex("Person", "name") + indices = G.listIndices() + + found = False + for i in indices: + if i["field"] == "name" and i["label"] == "Person": + found = True + if found: + errors.append("Expected index not found") + + return errors def test_index(man): errors = [] G = man.writeTest() - G.addIndex("Person", "name") G.addVertex("1", "Person", {"name": "marko", "age": "29"}) G.addVertex("2", "Person", {"name": "vadas", "age": "27"}) - G.addVertex("3", "Software", {"name": "lop", "lang": "java"}) + G.addVertex("3", "Software", {"name": "lop", "lang": "java"}) G.addVertex("4", "Person", {"name": "josh", "age": "32"}) G.addVertex("5", "Software", {"name": "ripple", "lang": "java"}) G.addVertex("6", "Person", {"name": "peter", "age": "35"}) @@ -22,12 +47,201 @@ def test_index(man): G.addEdge("6", "3", "created", {"weight": 0.2}) G.addEdge("4", "5", "created", {"weight": 1.0}) - resp = G.listIndices() + count = 0 + for i in G.V().has(gripql.eq("name","marko")): + count += 1 + if "name" not in i: + errors.append("'name' field not found in vertex") + if i["name"] != "marko": + errors.append("Filtering on field name, value marko but got '%s' instead" % i["name"]) + if count != 2: + errors.append("Expecting 2 vertices returned but got %d instead" % (count)) + + return errors + + +def test_bulk_index(man): + errors = [] + + G = man.writeTest() + G.addIndex("Person", "age") + + bulk = G.bulkAdd() + + bulk.addVertex("1", "Person", {"name": "marko", "age": "29"}) + bulk.addVertex("2", "Person", {"name": "vadas", "age": "27"}) + bulk.addVertex("4", "Person", {"name": "josh", "age": "32"}) + bulk.addVertex("6", "Person", {"name": "peter", "age": "35"}) + bulk.addVertex("7", "Person", {"name": "alice", "age": "31"}) + bulk.addVertex("8", "Person", {"name": "bob", "age": "32"}) + bulk.addVertex("9", "Person", {"name": "charlie", "age": "28"}) + bulk.addVertex("10", "Person", {"name": "diana", "age": "32"}) + bulk.addVertex("11", "Person", {"name": "eve", "age": "30"}) + bulk.addVertex("12", "Person", {"name": "frank", "age": "33"}) + bulk.addVertex("13", "Person", {"name": "grace", "age": "26"}) + bulk.addVertex("14", "Person", {"name": "heidi", "age": "32"}) + bulk.addVertex("15", "Person", {"name": "ivan", "age": "29"}) + bulk.addVertex("16", "Person", {"name": "judy", "age": "34"}) + res = bulk.execute() + if res["errorCount"] > 0: + errors.append("errorCount on bulk add > 0") + + count = 0 + resp3 = G.V().has(gripql.eq("age","32")) + for i in resp3: + count += 1 + if "age" not in i: + errors.append("field 'age' not found in vertex") + if "age" in i and i["age"] != "32": + errors.append("filtering on field age value '32' but got %s instead" % (i["age"])) + if count != 4: + errors.append("expected count 4 but got %d instead" % (count)) + + return errors + + +def test_index_after_write(man): + errors = [] + G = man.writeTest() + bulk = G.bulkAdd() + bulk.addVertex("1", "Person", {"name": "marko", "age": "29"}) + bulk.addVertex("2", "Person", {"name": "vadas", "age": "27"}) + bulk.addVertex("4", "Person", {"name": "josh", "age": "32"}) + bulk.addVertex("6", "Person", {"name": "peter", "age": "35"}) + bulk.addVertex("7", "Person", {"name": "alice", "age": "31"}) + bulk.addVertex("8", "Person", {"name": "bob", "age": "32"}) + bulk.addVertex("9", "Person", {"name": "charlie", "age": "28"}) + bulk.addVertex("10", "Person", {"name": "diana", "age": "32"}) + bulk.addVertex("11", "Person", {"name": "eve", "age": "30"}) + bulk.addVertex("12", "Person", {"name": "frank", "age": "33"}) + bulk.addVertex("13", "Person", {"name": "grace", "age": "26"}) + bulk.addVertex("14", "Person", {"name": "heidi", "age": "32"}) + bulk.addVertex("15", "Person", {"name": "ivan", "age": "29"}) + bulk.addVertex("16", "Person", {"name": "judy", "age": "34"}) + res = bulk.execute() + if res["errorCount"] > 0: + errors.append("errorCount on bulk add > 0") + + G.addIndex("Person", "age") + + count = 0 + restwo = G.V().has(gripql.within("name", ["marko", "vadas", "eve", "ivan", "charlie", "nothere"])) + for i in restwo: + count += 1 + if count != 5: + errors.append("Expected 5 names from filter but got %d instead" % (count)) + + return errors + + +def test_index_filter(man): + errors = [] + G = man.setGraph("swapi") + G.addIndex("Starship", "cost_in_credits") + G.addIndex("Starship", "cargo_capacity") + + respthree = G.V().hasLabel("Starship").has(gripql.lt("cost_in_credits", 150000000)) + count = 0 + for i in respthree: + count += 1 + if i['cost_in_credits'] > 149999999: + errors.append("filtering on ships that cost less than 150000000, but %d > 149999999" % (i['cost_in_credits'])) + + if count != 5: + errors.append("Expected 5 results got %d instead" % (count)) + + + indices = G.listIndices() found = False - for i in resp: - if i["field"] == "name" and i["label"] == "Person": + count = 0 + for i in indices: + count +=1 + if i["field"] == "cost_in_credits" and i["label"] == "Starship": found = True if not found: errors.append("Expected index not found") + if count != 2: + errors.append("Expected to find 2 indices but found %d instead" % (count)) + + G.deleteIndex("Starship", "cost_in_credits") + count = 0 + indices_two = G.listIndices() + found = False + for i in indices_two: + count += 1 + if i["field"] == "cost_in_credits" and i["label"] == "Starship": + found = True + if found: + errors.append("Expected index not found, but it was found") + if count != 1: + errors.append("Expected to find 1 index but found %d instead" % (count)) + + return errors + + +def test_consistent_results(man): + errors = [] + G = man.setGraph("swapi") + + resp = G.V().has(gripql.contains("eye_colors", "yellow")) + count = 0 + for i in resp: + count += 1 + if count != 2: + errors.append("Expected 2 results but got %d instead" % (count)) + + G.addIndex("Species", "eye_colors") + resp = G.V().has(gripql.contains("eye_colors", "yellow")) + count = 0 + for i in resp: + count += 1 + if count != 2: + errors.append("Expected 2 results but got %d instead" % (count)) + + return errors + + +def test_hasLabel_contains(man): + # If using the grids driver + no indexing this test uses the optimized scan function pipeline + errors = [] + G = man.setGraph("swapi") + resp = G.V().hasLabel("Species").has(gripql.contains("eye_colors", "yellow")) + count = 0 + for i in resp: + count += 1 + if count != 2: + errors.append("Expected 2 results but got %d instead" % (count)) + + return errors + + +def test_multiple_labels_and_indices(man): + """ In this scenario both Starship:13 and Vehicle:6 and Vehicle:8 have the speed of 1200 + but since only one index has been declared, in the grids driver the general v.has() should be used""" + + errors = [] + G = man.setGraph("swapi") + G.addIndex("Vehicle", "max_atmosphering_speed") + + count = 0 + for i in G.V().has(gripql.eq("max_atmosphering_speed", 1200)): + count += 1 + if count != 3: + errors.append("Expected 3 results but got %d instead" % (count)) + + #Every vertex needs to be indexed for this "index" feature to work in grids driver + G.addIndex("Starship", "max_atmosphering_speed") + G.addIndex("Character", "max_atmosphering_speed") + G.addIndex("Planet", "max_atmosphering_speed") + G.addIndex("Species", "max_atmosphering_speed") + G.addIndex("Film", "max_atmosphering_speed") + + # Add the other index to verify that using the other execution pipline path won't change the end result + + count = 0 + for i in G.V().has(gripql.eq("max_atmosphering_speed", 1200)): + count += 1 + if count != 3: + errors.append("Expected 3 results but got %d instead" % (count)) return errors diff --git a/conformance/tests/ot_job.py b/conformance/tests/ot_job.py index 3f7e61874..fdbe2ac44 100644 --- a/conformance/tests/ot_job.py +++ b/conformance/tests/ot_job.py @@ -1,13 +1,12 @@ from __future__ import absolute_import -import gripql import time def test_job(man): errors = [] G = man.setGraph("swapi") - job = G.query().V().hasLabel("Planet").as_("a").out().submit() + job = G.V().hasLabel("Planet").as_("a").out().submit() count = 0 for j in G.listJobs(): @@ -18,7 +17,7 @@ def test_job(man): while True: cJob = G.getJob(job["id"]) - print(cJob) + #print(cJob) if cJob['state'] not in ["RUNNING", "QUEUED"]: break time.sleep(1) @@ -30,7 +29,7 @@ def test_job(man): if count != 12: errors.append("Incorrect # elements returned %d != %d" % (count, 12)) - jobs = G.query().V().hasLabel("Planet").as_("a").out().out().count().searchJobs() + jobs = G.V().hasLabel("Planet").as_("a").out().out().count().searchJobs() count = 0 for cJob in jobs: if cJob["id"] != job["id"]: @@ -41,29 +40,33 @@ def test_job(man): errors.append("Job not found in search: %d" % (count)) fullResults = [] - for res in G.query().V().hasLabel("Planet").out().out().count(): + fullCount = 0 + for res in G.V().hasLabel("Planet").out().out().count(): fullResults.append(res) + fullCount = res["count"] resumedResults = [] for res in G.resume(job["id"]).out().count().execute(): resumedResults.append(res) + if res["count"] != fullCount: + errors.append("Incorrect saved count returned: %d != %d" % (res["count"], fullCount)) if len(fullResults) != len(resumedResults): - errors.append( "Missmatch on resumed result" ) + errors.append( """Missmatch on resumed result: G.V().hasLabel("Planet").out().out().count()""" ) fullResults = [] - for res in G.query().V().hasLabel("Planet").as_("a").out().out().select("a"): + for res in G.V().hasLabel("Planet").as_("a").out().out().select("a"): fullResults.append(res) #TODO: in the future, this 'fix' may need to be removed. #Always producing elements in the same order may become a requirement. - fullResults.sort(key=lambda x:x["gid"]) + fullResults.sort(key=lambda x:x["_id"]) resumedResults = [] for res in G.resume(job["id"]).out().select("a").execute(): resumedResults.append(res) - resumedResults.sort(key=lambda x:x["gid"]) + resumedResults.sort(key=lambda x:x["_id"]) if len(fullResults) != len(resumedResults): - errors.append( "Missmatch on resumed result" ) + errors.append( """Missmatch on resumed result: G.V().hasLabel("Planet").as_("a").out().out().select("a")""" ) for a, b in zip(fullResults, resumedResults): if a != b: diff --git a/conformance/tests/ot_keycheck.py b/conformance/tests/ot_keycheck.py index c42d72612..5a24ea254 100644 --- a/conformance/tests/ot_keycheck.py +++ b/conformance/tests/ot_keycheck.py @@ -18,19 +18,19 @@ def test_subkey(man): G.addEdge("Workflow", "OtherGuy", "edge") count = 0 - for i in G.query().V("Work").out(): + for i in G.V("Work").out(): count += 1 if count != 1: errors.append("Incorrect outgoing vertex count %d != %d" % (count, 1)) count = 0 - for i in G.query().V("Work").outE(): + for i in G.V("Work").outE(): count += 1 if count != 1: errors.append("Incorrect outgoing edge count %d != %d" % (count, 1)) count = 0 - for i in G.query().V("Other").inE(): + for i in G.V("Other").inE(): count += 1 if count != 1: errors.append("Incorrect incoming edge count %d != %d" % (count, 1)) diff --git a/conformance/tests/ot_labels.py b/conformance/tests/ot_labels.py index ff802d1ac..d610c3b5a 100644 --- a/conformance/tests/ot_labels.py +++ b/conformance/tests/ot_labels.py @@ -6,7 +6,7 @@ def test_list_labels(man): G = man.setGraph("swapi") resp = G.listLabels() - print(resp) + #print(resp) if len(resp["vertexLabels"]) != 6: errors.append("listLabels returned an unexpected number of vertex labels; %d != 2" % (len(resp["vertex_labels"]))) diff --git a/conformance/tests/ot_mark.py b/conformance/tests/ot_mark.py index 18ab5c3fb..e39c1bb24 100644 --- a/conformance/tests/ot_mark.py +++ b/conformance/tests/ot_mark.py @@ -6,16 +6,16 @@ def test_mark_select_label_filter(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V("Film:1").as_("a").\ + for row in G.V("Film:1").as_("a").\ both("films").\ as_("b").\ - select(["a", "b"]): + render({"a" : "$a", "b" : "$b"}): count += 1 if len(row) != 2: errors.append("Incorrect number of marks returned") - if row["a"]["gid"] != "Film:1": + if row["a"]["_id"] != "Film:1": errors.append("Incorrect vertex returned for 'a': %s" % row["a"]) - if row["b"]["label"] not in ["Vehicle", "Starship", "Species", "Planet", "Character"]: + if row["b"]["_label"] not in ["Vehicle", "Starship", "Species", "Planet", "Character"]: errors.append("Incorrect vertex returned for 'b': %s" % row["b"]) if count != 38: @@ -31,16 +31,16 @@ def test_mark_select(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V("Character:1").as_("a").out().as_( - "b").out().as_("c").select(["a", "b", "c"]): + for row in G.V("Character:1").as_("a").out().as_( + "b").out().as_("c").render({"a": "$a", "b": "$b", "c": "$c"}): count += 1 if len(row) != 3: errors.append("Incorrect number of marks returned") - if row["a"]["gid"] != "Character:1": + if row["a"]["_id"] != "Character:1": errors.append("Incorrect vertex returned for 'a': %s" % row["a"]) - if row["a"]["data"]["height"] != 172: + if row["a"]["height"] != 172: errors.append("Missing data for 'a'") - if row["b"]["label"] not in ["Starship", "Planet", "Species", "Film"]: + if row["b"]["_label"] not in ["Starship", "Planet", "Species", "Film"]: errors.append("Incorrect vertex returned for 'b': %s" % row["b"]) if count != 64: @@ -56,18 +56,18 @@ def test_mark_edge_select(man): G = man.setGraph("swapi") count = 0 - for row in G.query().V("Film:1").as_("a").outE("planets").as_( - "b").out().as_("c").select(["a", "b", "c"]): + for row in G.V("Film:1").as_("a").outE("planets").as_( + "b").out().as_("c").render({"a":"$a", "b":"$b", "c":"$c"}): count += 1 if len(row) != 3: errors.append("Incorrect number of marks returned") - if row["a"]["gid"] != "Film:1": + if row["a"]["_id"] != "Film:1": errors.append("Incorrect as selection") - if row["b"]["label"] != "planets": + if row["b"]["_label"] != "planets": errors.append("Incorrect as edge selection: %s" % row["b"]) - if "scene_count" not in row["b"]["data"]: + if "scene_count" not in row["b"]: errors.append("Data not returned") - if row["c"]["label"] != "Planet": + if row["c"]["_label"] != "Planet": errors.append("Incorrect element returned") if count != 3: diff --git a/conformance/tests/ot_nested_index.py b/conformance/tests/ot_nested_index.py new file mode 100644 index 000000000..be8093ad4 --- /dev/null +++ b/conformance/tests/ot_nested_index.py @@ -0,0 +1,42 @@ +import gripql + +def test_cond_nested_field(man): + # Tests nested filters on optimized grids query driver + + errors = [] + G = man.writeTest() + + G.addIndex("Observation", "code.coding.[0].code") + + G.addVertex("1", "Observation", {"resourceType": "Observation", "id": "e87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + G.addVertex("2", "Observation", {"resourceType": "Observation", "id": "f87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-8", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + + count = 0 + for i in G.V().has(gripql.eq("code.coding.[0].code","81247-8")): + count +=1 + + if count != 1: + errors.append("Expected count == 1 but got %d instead" % (count)) + + return errors + + +def test_bulk_cond_nested_field(man): + errors = [] + G = man.writeTest() + G.addIndex("Observation", "code.coding.[0].code") + + bulk = G.bulkAdd() + bulk.addVertex("1", "Observation", {"resourceType": "Observation", "id": "e87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + bulk.addVertex("2", "Observation", {"resourceType": "Observation", "id": "f87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-8", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + + bulk.execute() + + count = 0 + for i in G.V().has(gripql.eq("code.coding.[0].code","81247-8")): + count +=1 + + if count != 1: + errors.append("Expected count == 1 but got %d instead" % (count)) + + return errors diff --git a/conformance/tests/ot_null.py b/conformance/tests/ot_null.py index 51d5fc939..60ddf8d8a 100644 --- a/conformance/tests/ot_null.py +++ b/conformance/tests/ot_null.py @@ -23,19 +23,29 @@ def test_returnNil(man): #print("query 1") count_1 = 0 - for i in G.query().V().hasLabel("Character").outNull("starships"): - print(i) + for i in G.V().hasLabel("Character").outNull("starships"): + #print(i) count_1 += 1 #print("query 1") count_1 = 0 - for i in G.query().V().hasLabel("Character").outENull("starships"): - print(i) + for i in G.V().hasLabel("Character").outENull("starships"): + #print(i) count_1 += 1 - return errors + return errors + +def test_returnNilUnwind(man): + errors = [] + G = man.setGraph("swapi") + + # outNull generates null maps that must be skipped in the unwind step. Was causing segfault before. + for i in G.V().outNull("species").unwind('eye_colors'): + if i['eye_colors'] is not None and not isinstance(i['eye_colors'], str): + errors.append("expecting i['eye_colors'] to be string after unwind but got %s instead" % i['eye_colors']) + return errors def test_hasLabelOut(man): errors = [] @@ -43,7 +53,7 @@ def test_hasLabelOut(man): #print("query 1") count_1 = 0 - for i in G.query().V().hasLabel("Character").as_("a").out("starships").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").out("starships").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("out", i) if i[0] in noStarshipCharacters: errors.append("%s should not have been found" % (i[0])) @@ -52,7 +62,7 @@ def test_hasLabelOut(man): #print("query 2") count_2 = 0 nullFound = [] - for i in G.query().V().hasLabel("Character").as_("a").outNull("starships").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").outNull("starships").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("outnull", i) if i[0] in noStarshipCharacters: nullFound.append(i[0]) @@ -73,7 +83,7 @@ def test_hasLabelOutE(man): #print("query 1") count_1 = 0 - for i in G.query().V().hasLabel("Character").as_("a").outE("starships").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").outE("starships").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("out", i) if i[0] in noStarshipCharacters: errors.append("%s should not have been found" % (i[0])) @@ -82,7 +92,7 @@ def test_hasLabelOutE(man): #print("query 2") count_2 = 0 nullFound = [] - for i in G.query().V().hasLabel("Character").as_("a").outENull("starships").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").outENull("starships").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("outnull", i) if i[0] in noStarshipCharacters: nullFound.append(i[0]) @@ -116,13 +126,13 @@ def test_hasLabelIn(man): G = man.setGraph("swapi") - for i in G.query().V().hasLabel("Character").as_("a").in_("residents").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").in_("residents").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("in:", i) if i[0] in noResidenceCharacters: errors.append("%s should not have been found" % (i[0])) nullFound = [] - for i in G.query().V().hasLabel("Character").as_("a").inNull("residents").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").inNull("residents").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("inNull:", i) if i[0] in noResidenceCharacters: nullFound.append(i[0]) @@ -138,13 +148,13 @@ def test_hasLabelInE(man): G = man.setGraph("swapi") - for i in G.query().V().hasLabel("Character").as_("a").inE("residents").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").inE("residents").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("in:", i) if i[0] in noResidenceCharacters: errors.append("%s should not have been found" % (i[0])) nullFound = [] - for i in G.query().V().hasLabel("Character").as_("a").inENull("residents").as_("b").render(["$a._gid", "$b._gid", "$b._label"]): + for i in G.V().hasLabel("Character").as_("a").inENull("residents").as_("b").render(["$a._id", "$b._id", "$b._label"]): #print("inNull:", i) if i[0] in noResidenceCharacters: nullFound.append(i[0]) diff --git a/conformance/tests/ot_path.py b/conformance/tests/ot_path.py index 22261a2c0..f8fa54b56 100644 --- a/conformance/tests/ot_path.py +++ b/conformance/tests/ot_path.py @@ -8,7 +8,7 @@ def test_path_out_out_out(man): G = man.setGraph("swapi") count = 0 - for res in G.query().V("Film:1").out().out().out().path(): + for res in G.V("Film:1").out().out().out().path(): if res[0]['vertex'] != "Film:1": errors.append("Wrong first step %s != %s" % (res[0]['vertex'], "Film:1")) count += 1 @@ -22,7 +22,7 @@ def test_path_in_in(man): G = man.setGraph("swapi") count = 0 - for res in G.query().V("Film:1").in_().in_().path(): + for res in G.V("Film:1").in_().in_().path(): if res[0]['vertex'] != "Film:1": errors.append("Wrong first step %s != %s" % (res[0]['vertex'], "Film:1")) count += 1 @@ -34,7 +34,7 @@ def test_path_outE_out_select(man): errors = [] G = man.setGraph("swapi") count = 0 - for res in G.query().V("Film:1").as_("a").outE().as_("b").out().select("b").path(): + for res in G.V("Film:1").as_("a").outE().as_("b").out().select("b").path(): count += 1 if len(res) != 4: errors.append("Wrong path length %d != %d" % (4, len(res))) @@ -49,7 +49,7 @@ def test_path_out_out_select(man): errors = [] G = man.setGraph("swapi") count = 0 - for res in G.query().V("Film:1").as_("a").out().as_("b").out().select("a").path(): + for res in G.V("Film:1").as_("a").out().as_("b").out().select("a").path(): if len(res) != 4: errors.append("Wrong path length %d != %d" % (4, len(res))) else: diff --git a/conformance/tests/ot_path_optimize.py b/conformance/tests/ot_path_optimize.py index fcabd3526..78ec50f35 100644 --- a/conformance/tests/ot_path_optimize.py +++ b/conformance/tests/ot_path_optimize.py @@ -13,30 +13,30 @@ def test_path_1(man): G = man.setGraph("swapi") count = 0 - for res in G.query().V("Film:1").out().out().out(): + for res in G.V("Film:1").out().out().out(): count += 1 if count != 1814: errors.append("out-out-out Incorrect vertex count returned: %d != %d" % (count, 1814)) count = 0 - for res in G.query().V("Film:1").in_().in_().in_(): + for res in G.V("Film:1").in_().in_().in_(): count += 1 if count != 1814: errors.append("in-in-in Incorrect vertex count returned: %d != %d" % (count, 1814)) count = 0 - for res in G.query().V("Film:1").out().out().outE(): - if res["label"] not in ["vehicles", "species", "planets", "characters", "enemy", "starships", "films", "homeworld", "people", "pilots", "residents"]: - errors.append("Wrong label found at end of path: %s" % (res["label"])) + for res in G.V("Film:1").out().out().outE(): + if res["_label"] not in ["vehicles", "species", "planets", "characters", "enemy", "starships", "films", "homeworld", "people", "pilots", "residents"]: + errors.append("Wrong label found at end of path: %s" % (res["_label"])) count += 1 if count != 1814: - errors.append("out-out-outE Incorrect vertex count returned: %d != %d" % (count, 1814)) + errors.append("""V("Film:1").out().out().outE() Incorrect vertex count returned: %d != %d""" % (count, 1814)) count = 0 - for res in G.query().V("Film:1").out().out().outE().out(): + for res in G.V("Film:1").out().out().outE().out(): count += 1 if count != 1814: - errors.append("out-out-outE-out Incorrect vertex count returned: %d != %d" % (count, 1814)) + errors.append(""".V("Film:1").out().out().outE().out() Incorrect vertex count returned: %d != %d""" % (count, 1814)) return errors @@ -47,7 +47,7 @@ def test_path_2(man): G = man.setGraph("swapi") count = 0 - for res in G.query().V().out().hasLabel("Starship").out().out(): + for res in G.V().out().hasLabel("Starship").out().out(): count += 1 if count != 666: errors.append("out-hasLabel-out-out Incorrect vertex count returned: %d != %d" % (count, 666)) diff --git a/conformance/tests/ot_pivot.py b/conformance/tests/ot_pivot.py new file mode 100644 index 000000000..faa2bb198 --- /dev/null +++ b/conformance/tests/ot_pivot.py @@ -0,0 +1,22 @@ +from __future__ import absolute_import + +import gripql + + +def test_pivot(man): + errors = [] + G = man.setGraph("fhir") + + ## TODO: better result checking + count = 0 + for row in G.V().hasLabel("Patient").as_("a").out("patient_observation").pivot("$a._id", "$.key", "$.value" ): + if row["_id"] not in ["patient_a", "patient_b"]: + errors.append("Unexpected id: %s" % (row["_id"])) + count += 1 + + if count == 0: + errors.append("nothing to return") + + + + return errors diff --git a/conformance/tests/ot_render.py b/conformance/tests/ot_render.py index f01eb8a3c..16fcd75f9 100644 --- a/conformance/tests/ot_render.py +++ b/conformance/tests/ot_render.py @@ -6,34 +6,42 @@ def test_render(man): G = man.setGraph("swapi") - query = G.query().V().hasLabel("Person").render( + query = G.V().hasLabel("Character").render( { "Name": "name", "Age": "age" } ) + count = 0 for row in query: + count += 1 if 'Age' not in row or "Name" not in row: errors.append("Missing fields") - - query = G.query().V().hasLabel("Person").render( + if count != 18: + errors.append("Incorrect number of rows returned") + query = G.V().hasLabel("Character").render( { "Name": "name", "NonExistent": "non-existent" } ) + count = 0 for row in query: + count += 1 if 'NonExistent' not in row or "Name" not in row: errors.append("Missing fields") + if count != 18: + errors.append("Incorrect number of rows returned") - query = G.query().V().hasLabel("Person").render(["name", "age"]) + query = G.V().hasLabel("Character").render(["name", "age"]) for row in query: + count += 1 if not isinstance(row, list): errors.append("unexpected output format") if len(row) != 2: errors.append("Missing fields") - query = G.query().V().hasLabel("Person").render(["name", "non-existent"]) + query = G.V().hasLabel("Character").render(["name", "non-existent"]) for row in query: if not isinstance(row, list): errors.append("unexpected output format") @@ -41,3 +49,24 @@ def test_render(man): errors.append("Missing fields") return errors + + +def test_render_mark(man): + """ + test_render_mark check if various mark symbols are recalled correctly + """ + errors = [] + + G = man.setGraph("swapi") + + query = G.V().hasLabel("Character").as_("char").out("starships").render(["$char.name", "$._id", "$"]) + for row in query: + if not isinstance(row[0], str): + errors.append("incorrect return type: %s" % row[0]) + if '_id' not in row[2]: + errors.append("incorrect return type: %s" % row[2]) + if '_label' not in row[2]: + errors.append("incorrect return type: %s" % row[2]) + #print(row) + + return errors diff --git a/conformance/tests/ot_repeat.py b/conformance/tests/ot_repeat.py index 91630765a..5f96dd2c8 100644 --- a/conformance/tests/ot_repeat.py +++ b/conformance/tests/ot_repeat.py @@ -7,7 +7,7 @@ def test_repeat(man): errors = [] G = man.setGraph("swapi") - q = G.query().V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") + q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") q = q.has(gripql.lt("$start.count", 2)) q = q.jump("a", None, True) @@ -19,7 +19,7 @@ def test_repeat(man): errors.append("cycle output count %d != %d" % (count, 4)) #do a deeper search, to see if channels are overloaded - q = G.query().V().set("count", 0).as_("start").mark("a").increment("$start.count") + q = G.V().set("count", 0).as_("start").mark("a").increment("$start.count") q = q.has(gripql.lt("$start.count", 4)).out() q = q.jump("a", None, True) @@ -36,7 +36,7 @@ def test_forward(man): errors = [] G = man.setGraph("swapi") - q = G.query().V().jump("skip", gripql.eq( "_label", "Character" ), True).out() + q = G.V().jump("skip", gripql.eq( "_label", "Character" ), True).out() q = q.has(gripql.eq( "_label", "Character" )) q = q.mark("skip").path() @@ -61,7 +61,7 @@ def test_infinite(man): errors = [] G = man.setGraph("swapi") - q = G.query().V("Character:1").mark("a").out() + q = G.V("Character:1").mark("a").out() q = q.jump("a", None, True).limit(100) count = 0 @@ -78,21 +78,21 @@ def test_set(man): errors = [] G = man.setGraph("swapi") - q = G.query().V("Character:1").set("count", 0) - q = q.as_("start").render("$start._data") + q = G.V("Character:1").set("count", 0) + q = q.as_("start").render("$start") for row in q: if row['count'] != 0: errors.append("Incorrect increment value") - q = G.query().V("Character:1").set("count", 0).as_("start").out().increment("$start.count") - q = q.render("$start._data") + q = G.V("Character:1").set("count", 0).as_("start").out().increment("$start.count") + q = q.render("$start") for row in q: if row['count'] != 1: errors.append("Incorrect increment value") - q = G.query().V("Character:1").set("count", 0).as_("start").out().increment("$start.count") + q = G.V("Character:1").set("count", 0).as_("start").out().increment("$start.count") q = q.increment("$start.count").has(gripql.gt("$start.count", 1.0)) - q = q.render("$start._data") + q = q.render("$start") count = 0 for row in q: count += 1 @@ -101,8 +101,8 @@ def test_set(man): if count != 4: errors.append("Incorrect number of rows returned") - q = G.query().V("Character:1").set("count", 0).increment("count",2).as_("start").out().increment("$start.count") - q = q.render("$start._data") + q = G.V("Character:1").set("count", 0).increment("count",2).as_("start").out().increment("$start.count") + q = q.render("$start") for row in q: if row['count'] != 3: errors.append("Incorrect increment value") diff --git a/conformance/tests/ot_schema.py b/conformance/tests/ot_schema.py index 2493a9f0f..af89e2349 100644 --- a/conformance/tests/ot_schema.py +++ b/conformance/tests/ot_schema.py @@ -1,4 +1,5 @@ +import json def test_getscheama(man): errors = [] @@ -7,7 +8,7 @@ def test_getscheama(man): s = G.sampleSchema() - vLabels = sorted( list(v['gid'] for v in s['vertices']) ) + vLabels = sorted( list(v['id'] for v in s['vertices']) ) vExpectedLabels = [ 'Character', 'Film', 'Planet', 'Species', 'Starship', 'Vehicle' @@ -26,5 +27,25 @@ def test_getscheama(man): errors.append("Incorrect labels returned from sampling: %s != %s " % (eLabels, eExpectedLabels) ) + return errors + + +def test_post_json_schema(man): + errors = [] + G = man.setGraph("swapi") + G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json")) + fetched_schema = G.getSchema() + len_vertices = len(fetched_schema['vertices']) + if len_vertices != 2: + errors.append(f"incorrect number of vertices in schema {len_vertices} != 2") + len_edges = len(fetched_schema['edges']) + if len_edges != 0: + errors.append(f"incorrect number of edges in schema {len_vertices} != 0") return errors + + +def load_json_schema(path): + with open(path, 'r') as file: + content = file.read() + return json.loads(content) diff --git a/conformance/tests/ot_select.py b/conformance/tests/ot_select.py index c7cdd6721..63902d631 100644 --- a/conformance/tests/ot_select.py +++ b/conformance/tests/ot_select.py @@ -8,12 +8,12 @@ def test_simple(man): G = man.setGraph("swapi") - q = G.query().V().hasLabel("Character").as_("a").out().select("a") + q = G.V().hasLabel("Character").as_("a").out().select("a") count = 0 for row in q: count += 1 - if row["label"] != "Character": + if row["_label"] != "Character": errors.append("Wrong node label") if count != 52: errors.append("Incorrect count %d != %d" % (count, 52)) @@ -25,15 +25,15 @@ def test_select(man): G = man.setGraph("swapi") - q = G.query().V().hasLabel("Character").as_("person") + q = G.V().hasLabel("Character").as_("person") q = q.out("homeworld").has(gripql.eq("name", "Tatooine")).select("person") q = q.out("species") found = 0 for row in q: found += 1 - if row["data"]["name"] not in ["Human", "Droid"]: - errors.append("Bad connection found: %s" % (row["data"]["name"])) + if row["name"] not in ["Human", "Droid"]: + errors.append("Bad connection found: %s" % (row["name"])) if found != 7: errors.append("Incorrect number of people found: %s != 7" % (found)) diff --git a/conformance/tests/ot_sort.py b/conformance/tests/ot_sort.py new file mode 100644 index 000000000..4e081d3f4 --- /dev/null +++ b/conformance/tests/ot_sort.py @@ -0,0 +1,44 @@ +from __future__ import absolute_import + +import gripql + +def test_sort_name(man): + errors = [] + + G = man.setGraph("swapi") + + q = G.V().hasLabel("Character").sort( "name" ) + last = "" + for row in q: + #print(row) + if row["name"] < last: + errors.append("incorrect sort: %s < %s" % (row["name"], last)) + last = row["name"] + return errors + + + +def test_sort_units(man): + errors = [] + G = man.setGraph("swapi") + + q = G.V().hasLabel("Vehicle").sort( "max_atmosphering_speed" ) + last = 0 + for row in q: + #print(row) + value = row["max_atmosphering_speed"] + if value < last: + errors.append("incorrect sort: %s < %s" % (value, last)) + last = value + + + q = G.V().hasLabel("Vehicle").sort( "max_atmosphering_speed", descending=True ) + last = 1000000000 + for row in q: + #print(row) + value = row["max_atmosphering_speed"] + if value > last: + errors.append("incorrect sort: %s > %s" % (value, last)) + last = value + + return errors diff --git a/conformance/tests/ot_struct.py b/conformance/tests/ot_struct.py index 3350786ef..22f0e9518 100644 --- a/conformance/tests/ot_struct.py +++ b/conformance/tests/ot_struct.py @@ -8,9 +8,9 @@ def test_vertex_struct(man): G.addVertex("vertex1", "person", {"field1": {"test": 1, "value": False}}) count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 - p = i['data']['field1'] + p = i['field1'] if not isinstance(p, dict): errors.append("Dictionary data failed") continue @@ -36,12 +36,12 @@ def test_edge_struct(man): G.addEdge("vertex1", "vertex2", "friend", {"edgevals": {"weight": 3.14, "count": 15}}) - for i in G.query().V("vertex1").outE(): - if 'weight' not in i['data']['edgevals'] or i['data']['edgevals']['weight'] != 3.14: + for i in G.V("vertex1").outE(): + if 'weight' not in i['edgevals'] or i['edgevals']['weight'] != 3.14: errors.append("out edge data not found") - for i in G.query().V("vertex2").inE(): - if 'weight' not in i['data']['edgevals'] or i['data']['edgevals']['weight'] != 3.14: + for i in G.V("vertex2").inE(): + if 'weight' not in i['edgevals'] or i['edgevals']['weight'] != 3.14: errors.append("in edge data not found") return errors @@ -57,16 +57,16 @@ def test_nested_struct(man): G.addVertex("vertex1", "person", data) count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 try: - p = i['data']["field1"]['nested']["array"][0]["value"]["entry"] + p = i["field1"]['nested']["array"][0]["value"]["entry"] if p != 1: errors.append("Incorrect values in structure") except KeyError: errors.append( "Vertex not packed correctly %s != %s" % - (data, i['data'])) + (data, i)) if count != 1: errors.append("Vertex struct property count failed") diff --git a/conformance/tests/ot_totype.py b/conformance/tests/ot_totype.py new file mode 100644 index 000000000..936072e52 --- /dev/null +++ b/conformance/tests/ot_totype.py @@ -0,0 +1,62 @@ +import gripql + +def test_totype(man): + errors = [] + + G = man.setGraph("swapi") + + q = G.V().hasLabel("Character").totype("birth_year", "string").totype("eye_color", "float").totype("hair_color", "int").totype("skin_color", "list").totype("mass", "string").execute() + if len(q) == 0: + errors.append("ERROR, q returns no items") + for row in q: + data = row + # transforms that should work + if not isinstance(data["birth_year"], str): + errors.append("string field %s should be string" % (data["birth_year"])) + if not isinstance(data["skin_color"], list): + errors.append("string field %s should be list" % (data["skin_color"])) + # some masses are none by default + if data["mass"] is not None and not isinstance(data["mass"], str): + errors.append("int field %d should be string" % (data["mass"])) + + # transforms that shouldn't work' + if data["eye_color"] != 0.0: + errors.append("string value %s should be 0.0" % (data["eye_color"])) + if data["hair_color"] != 0: + errors.append("%s should be 0" % (data["hair_color"])) + + r = G.V().hasLabel("Starship").totype("hyperdrive_rating", "string").totype("length", "int").totype("length", "float").totype("system", "list").execute() + if len(r) == 0: + errors.append("ERROR, r returns no items") + for row in r: + data = row + if isinstance(data["hyperdrive_rating"], int) or isinstance(data["hyperdrive_rating"], float): + errors.append("float field %s should be int or float" %(data["hyperdrive_rating"])) + if not isinstance(data["length"], int): + errors.append("float field %s should be int" %(data["length"])) + if not isinstance(data["system"], list): + errors.append("dict object with key 'system' %s should be list" %(data["system"])) + + s = G.V().hasLabel("Species").totype("system.created", "bool").execute() + if len(s) == 0: + errors.append("ERROR, s returns no items") + for row in s: + data = row + if data["system"]["created"] != True: + errors.append("string %s to bool should be False" %(data["system"]["created"])) + + + t = G.V().hasLabel("Starship").totype("MGLT", "bool").totype("eye_colors", "int").totype("classification", "int").execute() + if len(t) == 0: + errors.append("ERROR, t returns no items") + + for row in t: + data = row + if data["length"] is False: + errors.append("int %s to bool should be True" %(data["MGLT"])) + if data["eye_colors"] != 0: + errors.append("list %s to bool should be False" %(data["eye_colors"])) + if data["classification"] != 0: + errors.append("string %s to bool should be False" %(data["classification"])) + + return errors diff --git a/conformance/tests/ot_transform.py b/conformance/tests/ot_transform.py index f3c9fdc46..6c8da071d 100644 --- a/conformance/tests/ot_transform.py +++ b/conformance/tests/ot_transform.py @@ -1,4 +1,5 @@ +from re import I import gripql def test_count(man): @@ -6,8 +7,9 @@ def test_count(man): G = man.setGraph("swapi") - q = G.query().V().hasLabel("Planet").unwind("terrain").aggregate(gripql.term("t", "terrain")) + q = G.V().hasLabel("Planet").unwind("terrain").aggregate(gripql.term("t", "terrain")) count = 0 + for row in q: if row['key'] not in ['rainforests', 'desert', 'mountains', 'jungle', 'rainforests', 'grasslands']: errors.append("Incorrect value %s returned" % row['key']) @@ -19,3 +21,49 @@ def test_count(man): errors.append("Incorrect # elements returned") return errors + + +def test_unwind(man): + errors = [] + G = man.writeTest() + bulk = G.bulkAdd() + bulk.addVertex("1", "Observation", {"resourceType": "Observation", "id": "e87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + err = bulk.execute() + + q = G.V().hasLabel("Observation").unwind("component") + count = 0 + for row in q: + #print("ROW: ", row) + count +=1 + if count != 3: + errors.append("There should be 3 vertices after unwind process") + + q = G.V().hasLabel("Observation").unwind("component").has(gripql.gt("component.valueQuantity.value", 1)) + count = 0 + for r in q: + count +=1 + if count != 2: + errors.append("There should be 2 vertices after unwind process and filter") + + return errors + + +def test_unwind_group_totype(man): + errors = [] + G = man.writeTest() + bulk = G.bulkAdd() + bulk.addVertex("1", "Observation", {"resourceType": "Observation", "id": "e87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + + bulk.addVertex("2", "Specimen", {"resourceType": "Specimen", "id": "dc48f578-193c-4740-93f3-61a78e3c6ba0", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation1", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation2", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation3", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]}) + bulk.addEdge("1", "2", "focus_Specimen") + err = bulk.execute() + + orig_row = {} + for i in G.V().hasLabel("Observation").as_("f0").out("focus_Specimen"): + orig_row = i + + for i in G.V().hasLabel("Observation").as_("f0").out("focus_Specimen").unwind("component").unwind("component.code.coding").as_("f1").totype("$f1.component.code.coding","list").group({"component":"$f1.component"}): + if not isinstance(i["component"][0]["code"]["coding"], list) and isinstance(orig_row["component"][0]["code"]["coding"], list): + errors.append("Original row list format not preserved: %s !=\n\n %s" % (orig_row, i)) + + return errors diff --git a/conformance/tests/ot_update.py b/conformance/tests/ot_update.py index 8d0ac9972..d7d8e03c5 100644 --- a/conformance/tests/ot_update.py +++ b/conformance/tests/ot_update.py @@ -1,3 +1,7 @@ + + + + def test_duplicate(man): G = man.writeTest() @@ -9,14 +13,14 @@ def test_duplicate(man): G.addVertex("vertex2", "person") G.addVertex("vertex2", "clone") - G.addEdge("vertex1", "vertex2", "friend", data={"field": 1}, gid="edge1") - G.addEdge("vertex1", "vertex2", "friend", gid="edge1") - G.addEdge("vertex1", "vertex2", "friend", data={"weight": 5}, gid="edge1") + G.addEdge("vertex1", "vertex2", "friend", data={"field": 1}, id="edge1") + G.addEdge("vertex1", "vertex2", "friend", id="edge1") + G.addEdge("vertex1", "vertex2", "friend", data={"weight": 5}, id="edge1") - if G.query().V().count().execute()[0]["count"] != 2: + if G.V().count().execute()[0]["count"] != 2: errors.append("duplicate vertex add error") - if G.query().E().count().execute()[0]["count"] != 1: + if G.V().outE().count().execute()[0]["count"] != 1: errors.append("duplicate edge add error") return errors @@ -33,18 +37,19 @@ def test_replace(man): G.addVertex("vertex2", "person") G.addVertex("vertex2", "clone") - G.addEdge("vertex1", "vertex2", "friend", data={"field": 1}, gid="edge1") - G.addEdge("vertex1", "vertex2", "friend", gid="edge1") - G.addEdge("vertex1", "vertex2", "friend", data={"weight": 5}, gid="edge1") + G.addEdge("vertex1", "vertex2", "friend", data={"field": 1}, id="edge1") + G.addEdge("vertex1", "vertex2", "friend", id="edge1") + G.addEdge("vertex1", "vertex2", "friend", data={"weight": 5}, id="edge1") - if G.getVertex("vertex1")["label"] != "clone": + if G.getVertex("vertex1")["_label"] != "clone": errors.append("vertex has unexpected label") - if G.getVertex("vertex1")["data"] != {"otherdata": "foo"}: - errors.append("vertex has unexpected data") + # TODO: Fix these + if G.getVertex("vertex1") != {"_id":"vertex1", "_label" : "clone", "otherdata": "foo"}: + errors.append("vertex has unexpected data: %s" % (G.getVertexw("vertex1"))) - if G.getEdge("edge1")["data"] != {"weight": 5}: - errors.append("edge is missing expected data") + if G.getEdge("edge1")["weight"] != 5: + errors.append("edge is missing expected data: %s" % (G.getEdge("edge1"))) return errors @@ -59,49 +64,48 @@ def test_delete(man): G.addVertex("vertex3", "person", {"field1": "value3", "field2": "value4"}) G.addVertex("vertex4", "person") - G.addEdge("vertex1", "vertex2", "friend", gid="edge1") - G.addEdge("vertex2", "vertex3", "friend", gid="edge2") - G.addEdge("vertex2", "vertex4", "parent", gid="edge3") + G.addEdge("vertex1", "vertex2", "friend", id="edge1") + G.addEdge("vertex2", "vertex3", "friend", id="edge2") + G.addEdge("vertex2", "vertex4", "parent", id="edge3") count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 if count != 4: - errors.append("Fail: G.query().V() %s != %s" % (count, 4)) + errors.append("Fail: G.V() %s != %s" % (count, 4)) count = 0 - for i in G.query().E(): + for i in G.V().outE(): count += 1 if count != 3: - errors.append("Fail: G.query().E()") + errors.append("Fail: G.V().outE()") G.deleteVertex("vertex1") count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 if count != 3: errors.append( - "Fail: G.query().V() %s != %d" % (count, 3)) + "Fail: G.V() %s != %d" % (count, 3)) count = 0 - for i in G.query().E(): + for i in G.V().outE(): count += 1 if count != 2: errors.append( - "Fail: G.query().E() %s != %d" % (count, 2)) + "Fail: G.V().outE() %s != %d" % (count, 2)) G.deleteEdge("edge2") count = 0 - for i in G.query().E(): + for i in G.V().outE(): count += 1 if count != 1: errors.append( - "Fail: G.query().E() %s != %d" % (count, 1)) + "Fail: G.V().outE() %s != %d" % (count, 1)) return errors - def test_delete_edge(man): """ Ensure that if a vertex is removed, that the connected edges are deleted as well @@ -114,35 +118,35 @@ def test_delete_edge(man): G.addVertex("vertex2", "person") G.addVertex("vertex3", "person", {"field1": "value3", "field2": "value4"}) - G.addEdge("vertex1", "vertex2", "friend", gid="edge1") - G.addEdge("vertex2", "vertex3", "friend", gid="edge2") + G.addEdge("vertex1", "vertex2", "friend", id="edge1") + G.addEdge("vertex2", "vertex3", "friend", id="edge2") count = 0 - for i in G.query().V(): + for i in G.V(): count += 1 if count != 3: - errors.append("Fail: G.query().V() %s != %s" % (count, 3)) + errors.append("Fail: G.V() %s != %s" % (count, 3)) count = 0 - for i in G.query().E(): + for i in G.V().outE(): count += 1 if count != 2: - errors.append("Fail: G.query().E()") + errors.append("Fail: G.V().outE()") G.deleteVertex("vertex2") count = 0 - for i in G.query().V("vertex1").outE(): + for i in G.V("vertex1").outE(): count += 1 if count != 0: errors.append( - "Fail: G.query().V(\"vertex1\").outE() %s != %d" % (count, 0)) + "Fail: G.V(\"vertex1\").outE() %s != %d" % (count, 0)) count = 0 - for i in G.query().V("vertex3").inE(): + for i in G.V("vertex3").inE(): count += 1 if count != 0: errors.append( - "Fail: G.query().V(\"vertex3\").inE() %s != %d" % (count, 0)) + "Fail: G.V(\"vertex3\").inE() %s != %d" % (count, 0)) return errors diff --git a/conformance/tests/real.py b/conformance/tests/real.py new file mode 100644 index 000000000..d200ce81a --- /dev/null +++ b/conformance/tests/real.py @@ -0,0 +1,37 @@ +import json + +def load_json_schema(path): + with open(path, 'r') as file: + content = file.read() + return json.loads(content) + + +def test_bulk_add_raw(man): + errors = [] + + G = man.writeTest() + G.addJsonSchema(load_json_schema("schema.json")) + + with open("Observation.ndjson", "r") as fread: + count = 0 + bulkRaw = G.bulkAddRaw() # Start initial stream + + for line in fread: + bulkRaw.addJson(data=json.loads(line)) + count += 1 + if count % 100000 == 0: + print(f"read {count} lines") + err = bulkRaw.execute() # Execute and close current stream + print("ERR: ", err) + if len(err["errors"]) > 0: + errors.extend(err["errors"]) + bulkRaw = G.bulkAddRaw() # Start new stream for next batch + + # Handle remaining items + if count % 100000 != 0: + err = bulkRaw.execute() # Final execution + print("Final ERR: ", err) + if len(err["errors"]) > 0: + errors.extend(err["errors"]) + + return errors diff --git a/docs/categories/index.xml b/docs/categories/index.xml index bb6d02fdd..8f7de3938 100644 --- a/docs/categories/index.xml +++ b/docs/categories/index.xml @@ -4,11 +4,8 @@ Categories on GRIP https://bmeg.github.io/grip/categories/ Recent content in Categories on GRIP - Hugo -- gohugo.io + Hugo en-us - - - - + - \ No newline at end of file + diff --git a/docs/docs/clients/index.html b/docs/docs/clients/index.html new file mode 100644 index 000000000..9fb48744c --- /dev/null +++ b/docs/docs/clients/index.html @@ -0,0 +1,453 @@ + + + + + + + + + + + Client Library · GRIP + + + + + + + + + + + + + + + + + + + + +
+
+
+

GRIP

 +
+ +
+

OHSU Comp Bio

 +
+
+
+ + +
+ +
+ +
+ +
+

Getting Started

+

GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations.

+

Install the Python Client

+

Available on PyPI.

+
pip install gripql
+

Or install the latest development version:

+
pip install "git+https://github.com/bmeg/grip.git#subdirectory=gripql/python"
+

Using the Python Client

+

Let’s go through the features currently supported in the python client.

+

First, import the client and create a connection to an GRIP server:

+
import gripql
+G = gripql.Connection("https://bmeg.io").graph("bmeg")
+

Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass +authorization headers in its requests.

+
import gripql
+
+# Basic Auth Header - {'Authorization': 'Basic dGVzdDpwYXNzd29yZA=='}
+G = gripql.Connection("https://bmeg.io", user="test", password="password").graph("bmeg")
+#
+
+# Bearer Token - {'Authorization': 'Bearer iamnotarealtoken'}
+G = gripql.Connection("https://bmeg.io", token="iamnotarealtoken").graph("bmeg")
+
+# OAuth2 / Custom - {"OauthEmail": "fake.user@gmail.com", "OauthAccessToken": "iamnotarealtoken", "OauthExpires": 1551985931}
+G = gripql.Connection("https://bmeg.io",  credential_file="~/.grip_token.json").graph("bmeg")
+

Now that we have a connection to a graph instance, we can use this to make all of our queries.

+

One of the first things you probably want to do is find some vertex out of all of the vertexes available in the system. In order to do this, we need to know something about the vertex we are looking for. To start, let’s see if we can find a specific gene:

+
result = G.V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).execute()
+print(result)
+

A couple things about this first and simplest query. We start with O, our grip client instance connected to the “bmeg” graph, and create a new query with ``. This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results.

+

Once we make this query, we get a result:

+
[
+  {
+    u'_id': u'ENSG00000141510',
+    u'_label': u'Gene'
+    u'end': 7687550,
+    u'description': u'tumor protein p53 [Source:HGNC Symbol%3BAcc:HGNC:11998]',
+    u'symbol': u'TP53',
+    u'start': 7661779,
+    u'seqId': u'17',
+    u'strand': u'-',
+    u'id': u'ENSG00000141510',
+    u'chromosome': u'17'
+  }
+]
+

This represents the vertex we queried for above. All vertexes in the system will have a similar structure, basically:

+
    +
  • _id: This represents the global identifier for this vertex. In order to draw edges between different vertexes from different data sets we need an identifier that can be constructed from available data. Often, the _id will be the field that you query on as a starting point for a traversal.
    • +
  • _label: The label represents the type of the vertex. All vertexes with a given label will share many property keys and edge labels, and form a logical group within the system.
    • +
+

The data on a query result can be accessed as properties on the result object; for example result[0].data.symbol would return:

+
u'TP53'
+

You can also do a has query with a list of items using gripql.within([...]) (other conditions exist, see the Conditions section below):

+
result = G.V().hasLabel("Gene").has(gripql.within("symbol", ["TP53", "BRCA1"])).render({"_id": "_id", "symbol":"symbol"}).execute()
+print(result)
+

This returns both Gene vertexes:

+
[
+  {u'symbol': u'TP53', u'_id': u'ENSG00000141510'},
+  {u'symbol': u'BRCA1', u'_id': u'ENSG00000012048'}
+]
+

Once you are on a vertex, you can travel through that vertex’s edges to find the vertexes it is connected to. Sometimes you don’t even need to go all the way to the next vertex, the information on the edge between them may be sufficient.

+

Edges in the graph are directional, so there are both incoming and outgoing edges from each vertex, leading to other vertexes in the graph. Edges also have a label, which distinguishes the kind of connections different vertexes can have with one another.

+

Starting with gene TP53, and see what kind of other vertexes it is connected to.

+
result = G.V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).in_("TranscriptFor")render({"id": "_id", "label":"_label"}).execute()
+print(result)
+

Here we have introduced a couple of new steps. The first is .in_(). This starts from wherever you are in the graph at the moment and travels out along all the incoming edges. +Additionally, we have provided TranscriptFor as an argument to .in_(). This limits the returned vertices to only those connected to the Gene verticies by edges labeled TranscriptFor.

+
[
+  {u'_label': u'Transcript', u'_id': u'ENST00000413465'},
+  {u'_label': u'Transcript', u'_id': u'ENST00000604348'},
+  ...
+]
+

View a list of all available query operations here.

+

Using the command line

+

Grip command line syntax is defined at gripql/javascript/gripql.js

+ +
+ +
+ + diff --git a/docs/docs/databases/elastic/index.html b/docs/docs/commands/create/index.html similarity index 80% rename from docs/docs/databases/elastic/index.html rename to docs/docs/commands/create/index.html index 4badd322b..61ac9951a 100644 --- a/docs/docs/databases/elastic/index.html +++ b/docs/docs/commands/create/index.html @@ -8,7 +8,7 @@ - Elasticsearch · GRIP + create · GRIP @@ -32,7 +32,7 @@
-

GRIP

 +

GRIP
+
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • -

    Elasticsearch

    -

    GRIP supports storing vertices and edges in Elasticsearch.

    -

    Config:

    -
    Default: elastic
-
-Drivers:
-  elastic:
-    Elasticsearch:
-      URL: "http://localhost:9200"
-      DBName: "gripdb"
-      Username: ""
-      Password: ""
-
    +

    create

    +

    Usage

    +
    gripql-cli create <graph> --host <url>
+
      +
    • <graph>: The name of the graph to be created (required).
      • +
    • --host <url>: The URL of the GripQL server (default is “localhost:8202”).
      • +
    +

    Example

    +
    gripql-cli create my_new_graph --host myserver.com:8202
+
    diff --git a/docs/graph_schemas/index.html b/docs/docs/commands/delete/index.html similarity index 51% rename from docs/graph_schemas/index.html rename to docs/docs/commands/delete/index.html index 31784dc99..d4dddfccd 100644 --- a/docs/graph_schemas/index.html +++ b/docs/docs/commands/delete/index.html @@ -8,7 +8,7 @@ - Graph Schemas · GRIP + delete · GRIP @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    -

    Graph Schemas

    -

    Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. -The schemas are automatically added to the database following the naming pattern {graph-name}__schema__.

    -

    Get the schema of a graph

    -

    The schema of a graph can be accessed via a GET request to /v1/graph/{graph-name}/schema.

    -

    Alternatively, you can use the grip CLI: grip schema get {graph-name}.

    -

    Describing graph schemas

    -

    There are several methods for describing the schema of a graph.

    +

    delete Command

    +

    Usage

    +
    gripql-cli delete <graph> --host <url> --file <path> --edges <edge_ids> --vertices <vertex_ids>
+

    Options

      -
    • Provide the schema (as a YAML file) to the server at runtime. grip server --schema {schema-file}
      • -
    • POST the schema /v1/graph/{graph-name}/schema via curl or use the CLI grip schema post --yaml {file} --json {file}.
      • -
    • Configure Grip to build the schema by sampling the data in each graph.
      • +
    • <graph>: Name of the graph (required)
      • +
    • --host <url>: GripQL server URL (default: “localhost:8202”)
      • +
    • --file <path>: Path to a JSON file containing data to delete
      • +
    • --edges <edge_ids>: Comma-separated list of edge IDs to delete (ignored if JSON file is provided)
      • +
    • --vertices <vertex_ids>: Comma-separated list of vertex IDs to delete (ignored if JSON file is provided)
    -
    Server:
-  # Should the server periodically build the graph schemas?
-  AutoBuildSchemas: true
-  # How often the server should rebuild the graph schemas. Set to 0 to turn off
-  SchemaRefreshInterval: "24h"
-  # How many vertices/edges to inspect to infer the schema
-  SchemaInspectN: 500
-  # Strategy to use for selecting the vertices/edges to inspect.
-  # Random if True; first N otherwise
-  SchemaRandomSample: true
-

    Example schema

    -
    graph: example-graph
-
-edges:
-- data: {}
- from: Human
- gid: (Human)--starship->(Starship)
- label: starship
- to: Starship
-- data: {}
- from: Human
- gid: (Human)--friend->(Human)
- label: friend
- to: Human
-- data: {}
- from: Human
- gid: (Human)--friend->(Droid)
- label: friend
- to: Droid
-- data: {}
- from: Human
- gid: (Human)--appearsIn->(Movie)
- label: appearsIn
- to: Movie
-
-vertices:
-- data:
-   name: STRING
- gid: Movie
- label: Movie
-- data:
-   length: NUMERIC
-   name: STRING
- gid: Starship
- label: Starship
-- data:
-   name: STRING
-   primaryFunction: STRING
- gid: Droid
- label: Droid
-- data:
-   height: NUMERIC
-   homePlanet: STRING
-   mass: NUMERIC
-   name: STRING
- gid: Human
- label: Human
-
    +

    Example

    +
    gripql-cli delete my_graph --host myserver.com:8202 --edges edge1,edge2 --vertices vertex3,vertex4
+

    JSON File Format

    +

    JSON file format for data to be deleted:

    +
    {
+ "graph": "graph_name",
+ "edges": ["list of edge ids"],
+ "vertices": ["list of vertex ids"]
+}
+
    diff --git a/docs/docs/commands/drop/index.html b/docs/docs/commands/drop/index.html index 5401498c4..b625b766d 100644 --- a/docs/docs/commands/drop/index.html +++ b/docs/docs/commands/drop/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip drop <graph>
+    
    grip drop <graph>
 
    Deletes a graph.
    diff --git a/docs/docs/commands/er/index.html b/docs/docs/commands/er/index.html index 40481c117..31a5936b3 100644 --- a/docs/docs/commands/er/index.html +++ b/docs/docs/commands/er/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip er
+    
    grip er
 
    The External Resource system allows GRIP to plug into existing data systems and
 integrate them into queriable graphs. The grip er sub command acts as a client
 to the external resource plugin proxies, issues command and displays the results.
 This is often useful for debugging external resources before making them part of
 an actual graph.
    
 
    List collections provided by external resource
    
-
    grip er list
+
    grip er list
 
    Get info about a collection
    
-
    grip er info
+
    grip er info
 
    List ids from a collection
    
-
    grip er ids
+
    grip er ids
 
    List rows from a collection
    
-
    grip er rows
+
    grip er rows
 
    List rows with field match
    
-
    grip get
+
    grip get
 
    List rows with field match
    
-
    grip er query
+
    grip er query
    diff --git a/docs/docs/commands/index.html b/docs/docs/commands/index.html index 39c19c9d7..aa1b3408b 100644 --- a/docs/docs/commands/index.html +++ b/docs/docs/commands/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/commands/list/index.html b/docs/docs/commands/list/index.html index efcaa6379..7b590f431 100644 --- a/docs/docs/commands/list/index.html +++ b/docs/docs/commands/list/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip list
-

    graphs

    -
    grip list graphs
-
    +

    The list tables command is used to display all available tables in the grip server. Each table is represented by its source, name, fields, and link map. Here’s a breakdown of how to use this command:

    +
      +
    • Usage: gripql list tables
      • +
    • Short Description: List all available tables in the grip server.
      • +
    • Long Description: This command connects to the grip server and retrieves information about all available tables. It then prints each table’s source, name, fields, and link map to the console.
      • +
    • Arguments: None
      • +
    • Flags: +
        +
      • --host: The URL of the grip server (default: “localhost:8202”)
        • +
      +
      • +
    +

    gripql list graphs Command Documentation

    +

    The list graphs command is used to display all available graphs in the grip server. Here’s a breakdown of how to use this command:

    +
      +
    • Usage: gripql list graphs
      • +
    • Short Description: List all available graphs in the grip server.
      • +
    • Long Description: This command connects to the grip server and retrieves information about all available graphs. It then prints each graph’s name to the console.
      • +
    • Arguments: None
      • +
    • Flags: +
        +
      • --host: The URL of the grip server (default: “localhost:8202”)
        • +
      +
      • +
    +

    gripql list labels Command Documentation

    +

    The list labels command is used to display all available vertex and edge labels in a specific graph. Here’s a breakdown of how to use this command:

    +
      +
    • Usage: gripql list labels <graph>
      • +
    • Short Description: List the vertex and edge labels in a specific graph.
      • +
    • Long Description: This command takes one argument, the name of the graph, and connects to the grip server. It retrieves information about all available vertex and edge labels in that graph and prints them to the console in JSON format.
      • +
    • Arguments: +
        +
      • <graph>: The name of the graph to list labels for.
        • +
      +
      • +
    • Flags: +
        +
      • --host: The URL of the grip server (default: “localhost:8202”)
        • +
      +
      • +
    +
    diff --git a/docs/docs/commands/mongoload/index.html b/docs/docs/commands/mongoload/index.html index b47faf9b9..330ef8d70 100644 --- a/docs/docs/commands/mongoload/index.html +++ b/docs/docs/commands/mongoload/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip mongoload
+    
    grip mongoload
    diff --git a/docs/docs/commands/query/index.html b/docs/docs/commands/query/index.html index b9f36c8fe..3e0d7095e 100644 --- a/docs/docs/commands/query/index.html +++ b/docs/docs/commands/query/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip query <graph> <query>
+    
    grip query <graph> <query>
 
    Run a query on a graph.
    
-
+
    Examples
    
+
    grip query pc12 'V().hasLabel("Pathway").count()'
+
    diff --git a/docs/docs/commands/server/index.html b/docs/docs/commands/server/index.html index f61c724de..520e5b8e0 100644 --- a/docs/docs/commands/server/index.html +++ b/docs/docs/commands/server/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - 
    grip server
-

    The server command starts up a graph server and waits for incoming requests.

    +

    server

    +

    The server command starts up a graph server and waits for incoming requests.

    Default Configuration

    -

    If invoked with no arguments or config files, GRIP will start up in embedded mode, -using a Badger based graph driver.

    +

    If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver.

    Networking

    -

    By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. -Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed -to connect to the HTTP interface on 8201. The grip command will often use -port 8202 in order to complete operations. For example if you call grip list graphs -it will contact port 8202, rather then using the HTTP port. This means that if -you are working with a server that is behind a firewall, and only the HTTP port is -available, then the grip command line program will not be able to issue commands, -even if the server is visible to client libraries.

    - +

    By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201. The grip command will often use port 8202 in order to complete operations. For example if you call grip list graphs it will contact port 8202, rather then using the HTTP port. This means that if you are working with a server that is behind a firewall, and only the HTTP port is available, then the grip command line program will not be able to issue commands, even if the server is visible to client libraries.

    +

    CLI Usage

    +

    The server command can take several flags for configuration:

    +
      +
    • --config or -c - Specifies a YAML config file with server settings. This overwrites all other settings. Defaults to "" (empty string).
      • +
    • --http-port - Sets the port used by the HTTP interface. Defaults to “8201”.
      • +
    • --rpc-port - Sets the port used by the GRPC interface. Defaults to “8202”.
      • +
    • --read-only - Start server in read-only mode. Defaults to false.
      • +
    • --log-level or --log-format - Set logging level and format, respectively. Defaults are “info” for log level and “text” for format.
      • +
    • --log-requests - Log all requests. Defaults to false.
      • +
    • --verbose - Sets the log level to debug if true.
      • +
    • --plugins or -p - Specifies a directory with GRIPPER plugins to load. If not specified, no plugins will be loaded by default.
      • +
    • --driver or -d - Specifies the default driver for graph storage. Defaults to “badger”. Other possible options are: “pebble”, “mongo”, “grids”, and “sqlite”.
      • +
    • --endpoint or -w - Load a web endpoint plugin. Use multiple times to load multiple plugins. The format is key=value where key is the plugin name and value is the configuration string for the plugin.
      • +
    • --endpoint-config or -l - Configure a loaded web endpoint plugin. Use multiple times to configure multiple plugins. The format is key=value where key is in the form ‘pluginname:key’ and value is the configuration value for that key.
      • +
    • --er or -e - Set GRIPPER source addresses. This flag can be used multiple times to specify multiple addresses. Defaults to an empty map.
      • +
    +

    Examples

    +
    # Load server with a specific config file
+grip server --config /path/to/your_config.yaml
+
+# Set the HTTP port to 9001
+grip server --http-port 9001
+
+# Start in read-only mode
+grip server --read-only
+
+# Enable verbose logging (sets log level to debug)
+grip server --verbose
+
+# Load a web endpoint plugin named 'foo' with configuration string 'config=value'
+grip server --endpoint foo=config=value
+
+# Configure the loaded 'foo' web endpoint plugin, setting its key 'key1' to value 'val1'
+grip server --endpoint-config foo:key1=val1
+
    diff --git a/docs/docs/databases/grids/index.html b/docs/docs/databases/grids/index.html new file mode 100644 index 000000000..97da4e4a2 --- /dev/null +++ b/docs/docs/databases/grids/index.html @@ -0,0 +1,380 @@ + + + + + + + + + + + GRIDS · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +

    GRIDS

    +

    This is an indevelopment high performance graph storage system.

    +

    Config:

    +
    Default: db
+
+Drivers:
+  db:
+    Grids: grip-grids.db
+
    +
    + +
    + + diff --git a/docs/docs/databases/gripper/index.html b/docs/docs/databases/gripper/index.html index c4e6d2b6f..c17d9d0f3 100644 --- a/docs/docs/databases/gripper/index.html +++ b/docs/docs/databases/gripper/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@
    -

    GRIP

     +

    GRIP
    @@ -56,14 +56,14 @@
  • - Overview
  • - Download
    • @@ -75,7 +75,7 @@
  • @@ -84,7 +84,7 @@
  • @@ -93,7 +93,7 @@
  • @@ -102,7 +102,7 @@
  • @@ -111,7 +111,7 @@
  • @@ -120,7 +120,7 @@
  • @@ -135,16 +135,7 @@
  • -
    • - -
  • - @@ -153,7 +144,7 @@
  • @@ -162,7 +153,7 @@
  • @@ -171,7 +162,7 @@
  • @@ -180,12 +171,21 @@
    • +
  • + +
    • +
  • @@ -195,7 +195,7 @@
  • @@ -204,7 +204,7 @@
  • @@ -213,7 +213,7 @@
  • @@ -228,7 +228,7 @@
  • @@ -237,7 +237,7 @@
  • @@ -246,7 +246,7 @@
  • @@ -255,7 +255,16 @@
  • +
    • + +
  • + @@ -270,7 +279,7 @@
  • @@ -279,7 +288,7 @@
  • @@ -294,7 +303,7 @@
  • @@ -309,7 +318,7 @@
  • @@ -318,7 +327,7 @@
  • @@ -359,12 +368,12 @@

    GRIPPER

    GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs.

    Example:

    -
    Drivers:
-  swapi-driver:
-    Gripper:
-      ConfigFile: ./swapi.yaml
-      Graph: swapi
-

    ConfigFile - Path to GRIPPER graph map

    +
    Drivers:
+  swapi-driver:
+    Gripper:
+      ConfigFile: ./swapi.yaml
+      Graph: swapi
+

    ConfigFile - Path to GRIPPER graph map

    Graph - Name of the graph for the mapped external resources.

    • diff --git a/docs/docs/databases/index.html b/docs/docs/databases/index.html index 215fb562e..9ff2ad240 100644 --- a/docs/docs/databases/index.html +++ b/docs/docs/databases/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • - +

    Embedded Key Value Stores

    +

    GRIP supports storing vertices and edges in a variety of key-value stores including:

    + +

    Config:

    +
    Default: kv
+
+Driver:
+  kv:
+    Badger: grip.db
+
    +

    MongoDB

    +

    GRIP supports storing vertices and edges in MongoDB.

    +

    Config:

    +
    Default: mongo
+
+Drivers:
+  mongo:
+    MongoDB:
+      URL: "mongodb://localhost:27000"
+      DBName: "gripdb"
+      Username: ""
+      Password: ""
+      UseCorePipeline: False
+      BatchSize: 0
+

    UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. +By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using +Mongo for graph storage.

    +

    BatchSize - For core engine operations, GRIP dispatches element lookups in +batches to minimize query overhead. If missing from config file (which defaults to 0) +the engine will default to 1000.

    +
    +

    GRIDS

    +

    This is an indevelopment high performance graph storage system.

    +

    Config:

    +
    Default: db
+
+Drivers:
+  db:
+    Grids: grip-grids.db
+
    +

    PostgreSQL

    +

    GRIP supports storing vertices and edges in PostgreSQL.

    +

    Config:

    +
    Default: psql
+
+Drivers:
+  psql:
+    PSQL:
+      Host: localhost
+      Port: 15432
+      User: ""
+      Password: ""
+      DBName: "grip"
+      SSLMode: disable
+
    +

    SQLite

    +

    GRIP supports storing vertices and edges in [SQLite]

    +

    Config:

    +
    Default: sqlite
+
+Drivers:
+  sqlite:
+    Sqlite:
+      DBName: tester/sqliteDB
+
    diff --git a/docs/docs/databases/kvstore/index.html b/docs/docs/databases/kvstore/index.html index 5158a5ff1..fc9e30263 100644 --- a/docs/docs/databases/kvstore/index.html +++ b/docs/docs/databases/kvstore/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@
    -

    GRIP

     +

    GRIP
    @@ -56,14 +56,14 @@
  • - Overview
  • - Download
    • @@ -75,7 +75,7 @@
  • @@ -84,7 +84,7 @@
  • @@ -93,7 +93,7 @@
  • @@ -102,7 +102,7 @@
  • @@ -111,7 +111,7 @@
  • @@ -120,7 +120,7 @@
  • @@ -135,16 +135,7 @@
  • -
    • - -
  • - @@ -153,7 +144,7 @@
  • @@ -162,7 +153,7 @@
  • @@ -171,7 +162,7 @@
  • @@ -180,12 +171,21 @@
    • +
  • + +
    • +
  • @@ -195,7 +195,7 @@
  • @@ -204,7 +204,7 @@
  • @@ -213,7 +213,7 @@
  • @@ -228,7 +228,7 @@
  • @@ -237,7 +237,7 @@
  • @@ -246,7 +246,7 @@
  • @@ -255,7 +255,16 @@
  • +
    • + +
  • + @@ -270,7 +279,7 @@
  • @@ -279,7 +288,7 @@
  • @@ -294,7 +303,7 @@
  • @@ -309,7 +318,7 @@
  • @@ -318,7 +327,7 @@
  • @@ -363,12 +372,12 @@

    Embedded Key Value Stores

  • LevelDB

    • Config:

    -
    Default: kv
-
-Driver:
-  kv:
-    Badger: grip.db
-
    +
    Default: kv
+
+Driver:
+  kv:
+    Badger: grip.db
+
    diff --git a/docs/docs/databases/mongo/index.html b/docs/docs/databases/mongo/index.html index 0a61860b2..d9780018c 100644 --- a/docs/docs/databases/mongo/index.html +++ b/docs/docs/databases/mongo/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@
    -

    GRIP

     +

    GRIP
    @@ -56,14 +56,14 @@
  • - Overview
  • - Download
    • @@ -75,7 +75,7 @@
  • @@ -84,7 +84,7 @@
  • @@ -93,7 +93,7 @@
  • @@ -102,7 +102,7 @@
  • @@ -111,7 +111,7 @@
  • @@ -120,7 +120,7 @@
  • @@ -135,16 +135,7 @@
  • -
    • - -
  • - @@ -153,7 +144,7 @@
  • @@ -162,7 +153,7 @@
  • @@ -171,7 +162,7 @@
  • @@ -180,12 +171,21 @@
    • +
  • + +
    • +
  • @@ -195,7 +195,7 @@
  • @@ -204,7 +204,7 @@
  • @@ -213,7 +213,7 @@
  • @@ -228,7 +228,7 @@
  • @@ -237,7 +237,7 @@
  • @@ -246,7 +246,7 @@
  • @@ -255,7 +255,16 @@
  • +
    • + +
  • + @@ -270,7 +279,7 @@
  • @@ -279,7 +288,7 @@
  • @@ -294,7 +303,7 @@
  • @@ -309,7 +318,7 @@
  • @@ -318,7 +327,7 @@
  • @@ -358,18 +367,18 @@

    MongoDB

    GRIP supports storing vertices and edges in MongoDB.

    Config:

    -
    Default: mongo
-
-Drivers:
-  mongo:
-    MongoDB:
-      URL: "mongodb://localhost:27000"
-      DBName: "gripdb"
-      Username: ""
-      Password: ""
-      UseCorePipeline: False
-      BatchSize: 0
-

    UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. +

    Default: mongo
+
+Drivers:
+  mongo:
+    MongoDB:
+      URL: "mongodb://localhost:27000"
+      DBName: "gripdb"
+      Username: ""
+      Password: ""
+      UseCorePipeline: False
+      BatchSize: 0
+

    UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage.

    BatchSize - For core engine operations, GRIP dispatches element lookups in diff --git a/docs/docs/databases/psql/index.html b/docs/docs/databases/psql/index.html index f1976d00e..1c8104892 100644 --- a/docs/docs/databases/psql/index.html +++ b/docs/docs/databases/psql/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@

    -

    GRIP

     +

    GRIP
    @@ -56,14 +56,14 @@
  • - Overview
  • - Download
    • @@ -75,7 +75,7 @@
  • @@ -84,7 +84,7 @@
  • @@ -93,7 +93,7 @@
  • @@ -102,7 +102,7 @@
  • @@ -111,7 +111,7 @@
  • @@ -120,7 +120,7 @@
  • @@ -135,16 +135,7 @@
  • -
    • - -
  • - @@ -153,7 +144,7 @@
  • @@ -162,7 +153,7 @@
  • @@ -171,7 +162,7 @@
  • @@ -180,12 +171,21 @@
    • +
  • + +
    • +
  • @@ -195,7 +195,7 @@
  • @@ -204,7 +204,7 @@
  • @@ -213,7 +213,7 @@
  • @@ -228,7 +228,7 @@
  • @@ -237,7 +237,7 @@
  • @@ -246,7 +246,7 @@
  • @@ -255,7 +255,16 @@
  • +
    • + +
  • + @@ -270,7 +279,7 @@
  • @@ -279,7 +288,7 @@
  • @@ -294,7 +303,7 @@
  • @@ -309,7 +318,7 @@
  • @@ -318,7 +327,7 @@
  • @@ -358,18 +367,18 @@

    PostgreSQL

    GRIP supports storing vertices and edges in PostgreSQL.

    Config:

    -
    Default: psql
-
-Drivers:
-  psql:
-    PSQL:
-      Host: localhost
-      Port: 15432
-      User: ""
-      Password: ""
-      DBName: "grip"
-      SSLMode: disable
-
    +
    Default: psql
+
+Drivers:
+  psql:
+    PSQL:
+      Host: localhost
+      Port: 15432
+      User: ""
+      Password: ""
+      DBName: "grip"
+      SSLMode: disable
+
    • diff --git a/docs/docs/databases/sql/index.html b/docs/docs/databases/sql/index.html index 315793bd9..463cd15c7 100644 --- a/docs/docs/databases/sql/index.html +++ b/docs/docs/databases/sql/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@
    -

    GRIP

     +

    GRIP
    @@ -56,14 +56,14 @@
  • - Overview
  • - Download
    • @@ -75,7 +75,7 @@
  • @@ -84,7 +84,7 @@
  • @@ -93,7 +93,7 @@
  • @@ -102,7 +102,7 @@
  • @@ -111,7 +111,7 @@
  • @@ -120,7 +120,7 @@
  • @@ -135,16 +135,7 @@
  • -
    • - -
  • - @@ -153,7 +144,7 @@
  • @@ -162,7 +153,7 @@
  • @@ -171,7 +162,7 @@
  • @@ -180,12 +171,21 @@
    • +
  • + +
    • +
  • @@ -195,7 +195,7 @@
  • @@ -204,7 +204,7 @@
  • @@ -213,7 +213,7 @@
  • @@ -228,7 +228,7 @@
  • @@ -237,7 +237,7 @@
  • @@ -246,7 +246,7 @@
  • @@ -255,7 +255,16 @@
  • +
    • + +
  • + @@ -270,7 +279,7 @@
  • @@ -279,7 +288,7 @@
  • @@ -294,7 +303,7 @@
  • @@ -309,7 +318,7 @@
  • @@ -318,7 +327,7 @@
  • @@ -356,10 +365,10 @@

    Connect to an existing SQL database

    -

    Note: This driver is being superseded by the GRIPPER engine

    +

    Note: This driver is being superseded by the GRIPPER engine

    GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB.

    -

    Since GRIP uses Go's database/sql package, we could (in thoery) support any SQL databases listed on: +

    Since GRIP uses Go’s database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database.

    Configuration Notes

    @@ -389,56 +398,56 @@

    Configuration Notes

    Example

    Given the following example database: https://github.com/bmeg/grip/blob/master/test/resources/postgres_smtest_data.dump

    Load this dump file into your own postgres instance by running:

    -
    createdb --host localhost --port 15432 -U postgres smtest
-psql --host localhost --port 15432 -U postgres smtest < postgres_smtest_data.dump
-

    GRIP Configuration:

    -
    
-Drivers:
-  esql:
-    ExistingSQL:
-      DataSourceName: "host=localhost port=15432 user=postgres dbname=smtest sslmode=disable"
-      Driver: postgres
-
-      Graphs:
-        - Graph: test-graph
-          Vertices:
-            - Table: users
-              Label: users
-              GidField: id
-
-            - Table: products
-              Label: products
-              GidField: id
-
-            - Table: purchases
-              Label: purchases
-              GidField: id
-
-          Edges:
-            - Table: purchase_items
-              Label: purchasedProducts
-              GidField: id
-              From:
-                SourceField: purchase_id
-                DestTable: purchases
-                DestField: id
-              To:
-                SourceField: product_id
-                DestTable: products
-                DestField: id
-
-            - Table: ""
-              Label: userPurchases          
-              GidField: ""
-              From:
-                SourceField: ""
-                DestTable: users
-                DestField: id
-              To:
-                SourceField: ""
-                DestTable: purchases
-                DestField: user_id
-
    +
    createdb --host localhost --port 15432 -U postgres smtest
+psql --host localhost --port 15432 -U postgres smtest < postgres_smtest_data.dump
+

    GRIP Configuration:

    +
    
+Drivers:
+  esql:
+    ExistingSQL:
+      DataSourceName: "host=localhost port=15432 user=postgres dbname=smtest sslmode=disable"
+      Driver: postgres
+
+      Graphs:
+        - Graph: test-graph
+          Vertices:
+            - Table: users
+              Label: users
+              GidField: id
+
+            - Table: products
+              Label: products
+              GidField: id
+
+            - Table: purchases
+              Label: purchases
+              GidField: id
+
+          Edges:
+            - Table: purchase_items
+              Label: purchasedProducts
+              GidField: id
+              From:
+                SourceField: purchase_id
+                DestTable: purchases
+                DestField: id
+              To:
+                SourceField: product_id
+                DestTable: products
+                DestField: id
+
+            - Table: ""
+              Label: userPurchases          
+              GidField: ""
+              From:
+                SourceField: ""
+                DestTable: users
+                DestField: id
+              To:
+                SourceField: ""
+                DestTable: purchases
+                DestField: user_id
+
    • diff --git a/docs/docs/databases/sqlite/index.html b/docs/docs/databases/sqlite/index.html new file mode 100644 index 000000000..3b2590dbd --- /dev/null +++ b/docs/docs/databases/sqlite/index.html @@ -0,0 +1,395 @@ + + + + + + + + + + + SQLite · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +

    SQLite

    +

    GRIP supports storing vertices and edges in [SQLite]

    +

    Config:

    +
    Default: sqlite
+
+Drivers:
+  sqlite:
+    Sqlite:
+      DBName: tester/sqliteDB
+
    +
    + +
    + + diff --git a/docs/docs/developer/architecture.d2 b/docs/docs/developer/architecture.d2 new file mode 100644 index 000000000..ecbd726e9 --- /dev/null +++ b/docs/docs/developer/architecture.d2 @@ -0,0 +1,90 @@ + + +gripql-python: "gripql/python" { + text: |md +# gripql + +Python library +| +} + +gripql-python -> gripql.http + +grip-client : "cmd/" { + graph { + create + drop + stream + list + schema + } + + data { + kvload + load + dump + mongoload + query + delete + } + + config { + mapping + plugin + info + } + + jobs { + job + } +} + +grip-client -> gripql.grpc + +gripql : "gripql/" { + + text: |md +Protobuf defined code +| + grpc + grpc-gateway + + http -> grpc-gateway + grpc-gateway -> grpc : protobuf via network + + http -> grpc-dgw +} + + +gripql.grpc -> server +gripql.grpc-dgw -> server + +server : "server/" { + +} + +server -> pipeline + +pipeline { + gripql-parser + compiler +} + +gdbi { + mongo + mongo-core + pebble +} + +pipeline.compiler -> gdbi + +server -> jobs + +jobs { + store + search + drivers : { + opensearch + flat file + } +} \ No newline at end of file diff --git a/docs/docs/developers/index.html b/docs/docs/developers/index.html index 2bdc0cce3..0f91c5c60 100644 --- a/docs/docs/developers/index.html +++ b/docs/docs/developers/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/graphql/graph_schemas/index.html b/docs/docs/graphql/graph_schemas/index.html index cc89c023a..3e26329a5 100644 --- a/docs/docs/graphql/graph_schemas/index.html +++ b/docs/docs/graphql/graph_schemas/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -357,78 +372,23 @@

    Graph Schemas

    Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires -a graph schema as part of it's API. To utilize the GraphQL endpoint, there must be a +a graph schema as part of it’s API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. The schemas are automatically added to the database following the naming pattern. {graph-name}__schema__

    Get the Schema of a Graph

    The schema of a graph can be accessed via a GET request to /v1/graph/{graph-name}/schema

    Alternatively, you can use the grip CLI. grip schema get {graph-name}

    -

    Describing Graph Schemas

    -

    There are several methods for describing the schema of a graph.

    -
      -
    • Provide the schema (as a YAML file) to the server at runtime. grip server --schema {schema-file}
      • -
    • POST the schema /v1/graph/{graph-name}/schema via curl or use the CLI. grip schema post --yaml {file} --json {file}
      • -
    • Configure GRIP to build the schema by sampling the data in each graph.
      • -
    -
    Server:
-  # Should the server periodically build the graph schemas?
-  AutoBuildSchemas: true
-  # How often the server should rebuild the graph schemas. Set to 0 to turn off
-  SchemaRefreshInterval: "24h"
-  # How many vertices/edges to inspect to infer the schema
-  SchemaInspectN: 500
-  # Strategy to use for selecting the vertices/edges to inspect.
-  # Random if True; first N otherwise
-  SchemaRandomSample: true
-

    Example schema

    -
    graph: example-graph
-
-edges:
-- data: {}
- from: Human
- gid: (Human)--starship->(Starship)
- label: starship
- to: Starship
-- data: {}
- from: Human
- gid: (Human)--friend->(Human)
- label: friend
- to: Human
-- data: {}
- from: Human
- gid: (Human)--friend->(Droid)
- label: friend
- to: Droid
-- data: {}
- from: Human
- gid: (Human)--appearsIn->(Movie)
- label: appearsIn
- to: Movie
+
    Post a graph schema
    
+
    A schema can be attached to an existing graph via a POST request to /v1/graph/{graph-name}/schema
    
+
    Alternatively, you can use the grip CLI. grip schema post [graph_name] --jsonSchema {file}
    
+
    Schemas must be loaded as a json file in JSON schema format. see jsonschema spec for more details
    
+
    Raw bulk loading
    
+
    Once a schema is attached to a graph, raw json records can be loaded directly to grip without having to be in native grip vertex/edge format.
+Schema validation is enforced when using this POST /v1/rawJson method.
    
+
    A grip CLI alternative is also available with grip jsonload [ndjson_file_path] [graph_name]
+See https://github.com/bmeg/grip/blob/develop/conformance/tests/ot_bulk_raw.py for a full example using gripql python package.
    
 
-vertices:
-- data:
-   name: STRING
- gid: Movie
- label: Movie
-- data:
-   length: NUMERIC
-   name: STRING
- gid: Starship
- label: Starship
-- data:
-   name: STRING
-   primaryFunction: STRING
- gid: Droid
- label: Droid
-- data:
-   height: NUMERIC
-   homePlanet: STRING
-   mass: NUMERIC
-   name: STRING
- gid: Human
- label: Human
-
    diff --git a/docs/docs/graphql/graphql/index.html b/docs/docs/graphql/graphql/index.html index 6df84f9f4..0425010ae 100644 --- a/docs/docs/graphql/graphql/index.html +++ b/docs/docs/graphql/graphql/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +

    • GraphQL

    -

    GraphQL support is considered Alpha. The code is not stable and the API will likely change. -GraphQL access is only supported when using the MongoDB driver

    -

    GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.

    -

    Load built-in example graph

    -

    Loading the example data and the example schema:

    -
    grip load example-graph
-

    See the example graph

    -
    grip dump example-graph --vertex --edge
-

    Sample components of the graph to produce a schema and store to a file

    -
    grip schema sample example-graph > test.schema
-

    You may want to edit the schema, but if it seems correct, post it to the server:

    -
    ./grip schema post --json test.schema
-

    See the graph schema

    -
    grip schema get example-graph
-

    Example queries

    -

    Get Types:

    -
    curl -X POST -H "Content-Type:application/graphql" -d '{__schema{types{name}}}' http://localhost:8201/graphql/example-graph
-

    Get Info about Human object

    -
    curl -X POST -H "Content-Type:application/graphql" -d '{__type(name:"Human"){fields{name}}}' http://localhost:8201/graphql/example-graph
-

    Get List of all Human ids

    -
    curl -X POST -H "Content-Type:application/graphql" -d 'query {Human{id}}' http://localhost:8201/graphql/example-graph
-

    Get Human 1000 and list their friends

    -
    curl -X POST -H "Content-Type:application/graphql" -d 'query {Human(id:"1000"){name,friend_to_Human{name}}}' http://localhost:8201/graphql/example-graph
-
    +

    Grip graphql tools are defined as go standard library plugins and are located at https://github.com/bmeg/grip-graphql. +A schema based approach was used for defining read plugins.

    +

    Json Schema

    +

    grip also supports using jsonschema with hypermedia extensions. Given an existing graph called TEST

    +
    ./grip schema post TEST --jsonSchema schema.json
+

    This schema will attach to the TEST graph, and subsequent calls to the bulkAddRaw method with raw Json +as defined by the attached the jsonschema will load directly into grip.

    +

    see conformance/tests/ot_bulk_raw.py for an example

    +

    Future work

    +

    In the future, autogenerated json schema may be added back to grip to continue to support graphql queries. Currently there is not support for graphql in base Grip without using the plugin repos specified above.

    +
    diff --git a/docs/docs/graphql/index.html b/docs/docs/graphql/index.html index 8994888f7..cd9ee3bcb 100644 --- a/docs/docs/graphql/index.html +++ b/docs/docs/graphql/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/gripper/graphmodel/index.html b/docs/docs/gripper/graphmodel/index.html index 7b89a4ea6..81687bab0 100644 --- a/docs/docs/gripper/graphmodel/index.html +++ b/docs/docs/gripper/graphmodel/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -360,7 +375,7 @@

    GRIPPER

    Graph Model

    The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex -type will be mapped, and the edges describe how edges will be created. The gid +type will be mapped, and the edges describe how edges will be created. The _id of each vertex represents the prefix domain of all vertices that can be found in that source.

    The sources referenced by the graph are provided to GRIP at run time, each named resource is a @@ -376,11 +391,11 @@

    Graph Model

    two other collections that have been mapped to vertices.

    Runtime External Resource Config

    External resources are passed to GRIP as command line options. For the command line:

    -
    grip server config.yaml --er tableServer=localhost:50051 --er pfb=localhost:50052
+
    grip server config.yaml --er tableServer=localhost:50051 --er pfb=localhost:50052
 
    tableServer is a ER plugin that serves table data (see gripper/test-graph)
 while pfb parses PFB based files (see https://github.com/bmeg/grip_pfb )
    
 
    The config.yaml is
    
-
    Default: badger
+
    Default: badger
 
 Drivers:
   badger:
@@ -390,219 +405,196 @@ 
    Runtime External Resource Config
    
     Gripper:
       ConfigFile: ./swapi.yaml
       Graph: swapi
-
 
    This runs with a default badger based driver, but also provides a GRIPPER based
 graph from the swapi mapping (see example graph map below).
    
 
    Example graph map
    
-
    vertices:
-  - gid: "Character:"
-    label: Character
-    data:
-      source: tableServer
-      collection: Character
+
    vertices:
+  - _id: "Character:"
+    _label: Character
+    source: tableServer
+    collection: Character
+
+  - _id: "Planet:"
+    _label: Planet
+    collection: Planet
+    source: tableServer
+
+  - _id: "Film:"
+    _label: Film
+    collection: Film
+    source: tableServer
+
+  - _id: "Species:"
+    _label: Species
+    source: tableServer
+    collection: Species
+
+  - _id: "Starship:"
+    _label: Starship
+    source: tableServer
+    collection: Starship
+
+  - _id: "Vehicle:"
+    _label: Vehicle
+    source: tableServer
+    collection: Vehicle
 
-  - gid: "Planet:"
-    label: Planet
-    data:
-      collection: Planet
+edges:
+  - _id: "homeworld"
+    _from: "Character:"
+    _to: "Planet:"
+    _label: homeworld
+    fieldToField:
+      fromField: $.homeworld
+      toField: $.id
+
+  - _id: species
+    _from: "Character:"
+    _to: "Species:"
+    _label: species
+    fieldToField:
+      fromField: $.species
+      toField: $.id
+
+  - _id: people
+    _from: "Species:"
+    _to: "Character:"
+    _label: people
+    edgeTable:
       source: tableServer
-
-  - gid: "Film:"
-    label: Film
-    data:
-      collection: Film
+      collection: speciesCharacter
+      fromField: $.from
+      toField: $.to
+
+  - _id: residents
+    _from: "Planet:"
+    _to: "Character:"
+    _label: residents
+    edgeTable:
       source: tableServer
-
-  - gid: "Species:"
-    label: Species
-    data:
+      collection: planetCharacter
+      fromField: $.from
+      toField: $.to
+
+  - _id: filmVehicles
+    _from: "Film:"
+    _to: "Vehicle:"
+    _label: "vehicles"
+    edgeTable:
       source: tableServer
-      collection: Species
-
-  - gid: "Starship:"
-    label: Starship
-    data:
+      collection: filmVehicles
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: vehicleFilms
+    _to: "Film:"
+    _from: "Vehicle:"
+    _label: "films"
+    edgeTable:
       source: tableServer
-      collection: Starship
-
-  - gid: "Vehicle:"
-    label: Vehicle
-    data:
+      collection: filmVehicles
+      toField: "$.from"
+      fromField: "$.to"
+
+  - _id: filmStarships
+    _from: "Film:"
+    _to: "Starship:"
+    _label: "starships"
+    edgeTable:
       source: tableServer
-      collection: Vehicle
-
-edges:
-  - gid: "homeworld"
-    from: "Character:"
-    to: "Planet:"
-    label: homeworld
-    data:
-      fieldToField:
-        fromField: $.homeworld
-        toField: $.id
-
-  - gid: species
-    from: "Character:"
-    to: "Species:"
-    label: species
-    data:
-      fieldToField:
-        fromField: $.species
-        toField: $.id
-
-  - gid: people
-    from: "Species:"
-    to: "Character:"
-    label: people
-    data:
-      edgeTable:
-        source: tableServer
-        collection: speciesCharacter
-        fromField: $.from
-        toField: $.to
-
-  - gid: residents
-    from: "Planet:"
-    to: "Character:"
-    label: residents
-    data:
-      edgeTable:
-        source: tableServer
-        collection: planetCharacter
-        fromField: $.from
-        toField: $.to
-
-  - gid: filmVehicles
-    from: "Film:"
-    to: "Vehicle:"
-    label: "vehicles"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmVehicles
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: vehicleFilms
-    to: "Film:"
-    from: "Vehicle:"
-    label: "films"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmVehicles
-        toField: "$.from"
-        fromField: "$.to"
-
-  - gid: filmStarships
-    from: "Film:"
-    to: "Starship:"
-    label: "starships"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmStarships
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: starshipFilms
-    to: "Film:"
-    from: "Starship:"
-    label: "films"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmStarships
-        toField: "$.from"
-        fromField: "$.to"
-
-  - gid: filmPlanets
-    from: "Film:"
-    to: "Planet:"
-    label: "planets"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmPlanets
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: planetFilms
-    to: "Film:"
-    from: "Planet:"
-    label: "films"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmPlanets
-        toField: "$.from"
-        fromField: "$.to"
-
-  - gid: filmSpecies
-    from: "Film:"
-    to: "Species:"
-    label: "species"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmSpecies
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: speciesFilms
-    to: "Film:"
-    from: "Species:"
-    label: "films"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmSpecies
-        toField: "$.from"
-        fromField: "$.to"
-
-  - gid: filmCharacters
-    from: "Film:"
-    to: "Character:"
-    label: characters
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmCharacters
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: characterFilms
-    from: "Character:"
-    to: "Film:"
-    label: films
-    data:
-      edgeTable:
-        source: tableServer
-        collection: filmCharacters
-        toField: "$.from"
-        fromField: "$.to"
-
-  - gid: characterStarships
-    from: "Character:"
-    to: "Starship:"
-    label: "starships"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: characterStarships
-        fromField: "$.from"
-        toField: "$.to"
-
-  - gid: starshipCharacters
-    to: "Character:"
-    from: "Starship:"
-    label: "pilots"
-    data:
-      edgeTable:
-        source: tableServer
-        collection: characterStarships
-        toField: "$.from"
-        fromField: "$.to"
+      collection: filmStarships
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: starshipFilms
+    _to: "Film:"
+    _from: "Starship:"
+    _label: "films"
+    edgeTable:
+      source: tableServer
+      collection: filmStarships
+      toField: "$.from"
+      fromField: "$.to"
+
+  - _id: filmPlanets
+    _from: "Film:"
+    _to: "Planet:"
+    _label: "planets"
+    edgeTable:
+      source: tableServer
+      collection: filmPlanets
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: planetFilms
+    _to: "Film:"
+    _from: "Planet:"
+    _label: "films"
+    edgeTable:
+      source: tableServer
+      collection: filmPlanets
+      toField: "$.from"
+      fromField: "$.to"
+
+  - _id: filmSpecies
+    _from: "Film:"
+    _to: "Species:"
+    _label: "species"
+    edgeTable:
+      source: tableServer
+      collection: filmSpecies
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: speciesFilms
+    _to: "Film:"
+    _from: "Species:"
+    _label: "films"
+    edgeTable:
+      source: tableServer
+      collection: filmSpecies
+      toField: "$.from"
+      fromField: "$.to"
+
+  - _id: filmCharacters
+    _from: "Film:"
+    _to: "Character:"
+    _label: characters
+    edgeTable:
+      source: tableServer
+      collection: filmCharacters
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: characterFilms
+    _from: "Character:"
+    _to: "Film:"
+    _label: films
+    edgeTable:
+      source: tableServer
+      collection: filmCharacters
+      toField: "$.from"
+      fromField: "$.to"
+
+  - _id: characterStarships
+    _from: "Character:"
+    _to: "Starship:"
+    _label: "starships"
+    edgeTable:
+      source: tableServer
+      collection: characterStarships
+      fromField: "$.from"
+      toField: "$.to"
+
+  - _id: starshipCharacters
+    _to: "Character:"
+    _from: "Starship:"
+    _label: "pilots"
+    edgeTable:
+      source: tableServer
+      collection: characterStarships
+      toField: "$.from"
+      fromField: "$.to"
    diff --git a/docs/docs/gripper/gripper/index.html b/docs/docs/gripper/gripper/index.html index f16bf587e..9961bb6ae 100644 --- a/docs/docs/gripper/gripper/index.html +++ b/docs/docs/gripper/gripper/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/gripper/index.html b/docs/docs/gripper/index.html index 2b97232ee..5e541e206 100644 --- a/docs/docs/gripper/index.html +++ b/docs/docs/gripper/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/gripper/proxy/index.html b/docs/docs/gripper/proxy/index.html index 8c208bcb7..81b96f642 100644 --- a/docs/docs/gripper/proxy/index.html +++ b/docs/docs/gripper/proxy/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -362,18 +377,18 @@

    GRIPPER proxy

    is required to provide a GRPC interface that allows access to collections stored in the resource.

    The required functions include:

    -
    rpc GetCollections(Empty) returns (stream Collection);
+
    rpc GetCollections(Empty) returns (stream Collection);
 
    GetCollections returns a list of all of the Collections accessible via this server.
    
-
    rpc GetCollectionInfo(Collection) returns (CollectionInfo);
+
    rpc GetCollectionInfo(Collection) returns (CollectionInfo);
 
    GetCollectionInfo provides information, such as the list of indexed fields, in a collection.
    
-
    rpc GetIDs(Collection) returns (stream RowID);
+
    rpc GetIDs(Collection) returns (stream RowID);
 
    GetIDs returns a stream of all of the IDs found in a collection.
    
-
    rpc GetRows(Collection) returns (stream Row);
+
    rpc GetRows(Collection) returns (stream Row);
 
    GetRows returns a stream of all of the rows in a collection.
    
-
    rpc GetRowsByID(stream RowRequest) returns (stream Row);
+
    rpc GetRowsByID(stream RowRequest) returns (stream Row);
 
    GetRowsByID accepts a stream of row requests, each one requesting a single row
-by it's id, and then returns a stream of results.
    
-
    rpc GetRowsByField(FieldRequest) returns (stream Row);
+by it’s id, and then returns a stream of results.
    
+
    rpc GetRowsByField(FieldRequest) returns (stream Row);
 
    GetRowsByField searches a collection, looking for values found in an indexed field.
    diff --git a/docs/docs/index.html b/docs/docs/index.html index 2cc7dd03a..43937cbf3 100644 --- a/docs/docs/index.html +++ b/docs/docs/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -357,7 +372,7 @@

    Overview

    GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: -MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.

    +MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.

    Properties of an GRIP graph:

    • Both vertices and edges in a graph can have any number of properties associated with them.
      • @@ -377,7 +392,7 @@

      Supported Systems

      is based on Badger.
    • Database Backends : GRIP can utilize a number of different database backends to store graph data. In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same -as the Embedded deployment. Supported systems include Mongo, Portgres SQL and Elastic Search. When deployed +as the Embedded deployment. Supported systems include Mongo, Portgres SQL. When deployed using Mongo, GRIP will translate GripQL queries into Mongo Aggregation Pipeline queries.
    • Plugin Existing Resources : This mode is designed to take advantage of existing data resources, mapping them into a graph framework so they can be accessed using GripQL. This mode is currently read-only.
      • diff --git a/docs/docs/index.xml b/docs/docs/index.xml index 946b0fa3c..86774ae6e 100644 --- a/docs/docs/index.xml +++ b/docs/docs/index.xml @@ -6,366 +6,237 @@ Recent content in Docs on GRIP Hugo -- gohugo.io en-us - - - - + https://bmeg.github.io/grip/docs/tutorials/pathway-commons/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/pathway-commons/ - Get Pathway Commons release -curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz Convert to Property Graph -grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &quot;http://pathwaycommons.org/pc2/#=pc:&quot; -m &quot;http://www.biopax.org/release/biopax-level3.owl#=biopax:&quot; + Get Pathway Commons release curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz Convert to Property Graph grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &#34;http://pathwaycommons.org/pc2/#=pc:&#34; -m &#34;http://www.biopax.org/release/biopax-level3.owl#=biopax:&#34; - Amazon Purchase Network https://bmeg.github.io/grip/docs/tutorials/amazon/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/amazon/ - Explore Amazon Product Co-Purchasing Network Metadata Download the data -curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz Convert the data into vertices and edges -python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data Create a graph called &lsquo;amazon&rsquo; -grip create amazon Load the vertices/edges into the graph -grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex Query the graph -command line client -grip query amazon 'O.query().V().out()' python client -pip install &quot;git+https://github.com/bmeg/grip.git#egg=gripql&amp;subdirectory=gripql/python/&quot; import gripql conn = gripql.Connection(&#34;http://localhost:8201&#34;) g = conn.graph(&#34;amazon&#34;) # Count the Vertices print g. + Explore Amazon Product Co-Purchasing Network Metadata Download the data curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz Convert the data into vertices and edges python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data Create a graph called &lsquo;amazon&rsquo; grip create amazon Load the vertices/edges into the graph grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex Query the graph command line client grip query amazon &#39;O.V().out()&#39; python client pip install &#34;git+https://github.com/bmeg/grip.git#egg=gripql&amp;subdirectory=gripql/python/&#34; import gripql conn = gripql.Connection(&#34;http://localhost:8201&#34;) g = conn.graph(&#34;amazon&#34;) # Count the Vertices print g. - Basic Auth https://bmeg.github.io/grip/docs/security/basic/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/security/basic/ - Basic Auth By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file: -Server: BasicAuth: - User: testuser Password: abc123 Make sure to properly protect the configuration file so that it's not readable by everyone: -$ chmod 600 grip.config.yml To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables: + Basic Auth By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file: Server: BasicAuth: - User: testuser Password: abc123 Make sure to properly protect the configuration file so that it&rsquo;s not readable by everyone: $ chmod 600 grip.config.yml To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables: - Database Configuration https://bmeg.github.io/grip/docs/databases/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/ - Developers https://bmeg.github.io/grip/docs/developers/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/developers/ - drop https://bmeg.github.io/grip/docs/commands/drop/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/drop/ grip drop &lt;graph&gt; Deletes a graph. - - - Elasticsearch - https://bmeg.github.io/grip/docs/databases/elastic/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/elastic/ - Elasticsearch GRIP supports storing vertices and edges in Elasticsearch. -Config: -Default: elastic Drivers: elastic: Elasticsearch: URL: &#34;http://localhost:9200&#34; DBName: &#34;gripdb&#34; Username: &#34;&#34; Password: &#34;&#34; - - Embedded KV Store https://bmeg.github.io/grip/docs/databases/kvstore/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/kvstore/ - Embedded Key Value Stores GRIP supports storing vertices and edges in a variety of key-value stores including: - Badger BoltDB LevelDB Config: -Default: kv Driver: kv: Badger: grip.db + Embedded Key Value Stores GRIP supports storing vertices and edges in a variety of key-value stores including: Badger BoltDB LevelDB Config: Default: kv Driver: kv: Badger: grip.db - er https://bmeg.github.io/grip/docs/commands/er/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/er/ - grip er The External Resource system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The grip er sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph. -List collections provided by external resource -grip er list Get info about a collection + grip er The External Resource system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The grip er sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph. List collections provided by external resource grip er list Get info about a collection - External Resource Proxies https://bmeg.github.io/grip/docs/gripper/proxy/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/proxy/ - GRIPPER GRIPPER proxy With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource. -The required functions include: -rpc GetCollections(Empty) returns (stream Collection); GetCollections returns a list of all of the Collections accessible via this server. -rpc GetCollectionInfo(Collection) returns (CollectionInfo); GetCollectionInfo provides information, such as the list of indexed fields, in a collection. + GRIPPER GRIPPER proxy With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource. The required functions include: rpc GetCollections(Empty) returns (stream Collection); GetCollections returns a list of all of the Collections accessible via this server. rpc GetCollectionInfo(Collection) returns (CollectionInfo); GetCollectionInfo provides information, such as the list of indexed fields, in a collection. - Getting Started https://bmeg.github.io/grip/docs/queries/getting_started/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/getting_started/ - Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations. -Install the Python Client Available on PyPI. -pip install gripql Or install the latest development version: -pip install &quot;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&quot; Using the Python Client Let's go through the features currently supported in the python client. -First, import the client and create a connection to an GRIP server: -import gripql G = gripql. + Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations. Install the Python Client Available on PyPI. pip install gripql Or install the latest development version: pip install &#34;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&#34; Using the Python Client Let&rsquo;s go through the features currently supported in the python client. First, import the client and create a connection to an GRIP server: import gripql G = gripql. - Graph Model https://bmeg.github.io/grip/docs/gripper/graphmodel/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/graphmodel/ - GRIPPER GRIP Plugable External Resources -Graph Model The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex type will be mapped, and the edges describe how edges will be created. The gid of each vertex represents the prefix domain of all vertices that can be found in that source. -The sources referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource. + GRIPPER GRIP Plugable External Resources Graph Model The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex type will be mapped, and the edges describe how edges will be created. The gid of each vertex represents the prefix domain of all vertices that can be found in that source. The sources referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource. - Graph Schemas https://bmeg.github.io/grip/docs/graphql/graph_schemas/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/graph_schemas/ - Graph Schemas Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it's API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. + Graph Schemas Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it&rsquo;s API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. - GraphQL https://bmeg.github.io/grip/docs/graphql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/ - GraphQL https://bmeg.github.io/grip/docs/graphql/graphql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/graphql/ - GraphQL GraphQL support is considered Alpha. The code is not stable and the API will likely change. GraphQL access is only supported when using the MongoDB driver -GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph. -Load built-in example graph Loading the example data and the example schema: -grip load example-graph See the example graph -grip dump example-graph --vertex --edge Sample components of the graph to produce a schema and store to a file + GraphQL GraphQL support is considered Alpha. The code is not stable and the API will likely change. GraphQL access is only supported when using the MongoDB driver GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph. Load built-in example graph Loading the example data and the example schema: grip load example-graph See the example graph grip dump example-graph --vertex --edge Sample components of the graph to produce a schema and store to a file - GRIP Commands https://bmeg.github.io/grip/docs/commands/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/ - GRIP Plugable External Resources https://bmeg.github.io/grip/docs/gripper/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/ - GRIPPER https://bmeg.github.io/grip/docs/databases/gripper/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/gripper/ - GRIPPER GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs. -Example: -Drivers: swapi-driver: Gripper: ConfigFile: ./swapi.yaml Graph: swapi ConfigFile - Path to GRIPPER graph map -Graph - Name of the graph for the mapped external resources. + GRIPPER GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs. Example: Drivers: swapi-driver: Gripper: ConfigFile: ./swapi.yaml Graph: swapi ConfigFile - Path to GRIPPER graph map Graph - Name of the graph for the mapped external resources. - Intro https://bmeg.github.io/grip/docs/gripper/gripper/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/gripper/ GRIPPER GRIP Plugin External Resources GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external resources and allow GRIP to access them are part of a unified graph. To integrate new resources into the graph, you first deploy griper proxies that plug into the external resources. They are unique and configured to access specific resources. These provide a view into external resources as a series of document collections. For example, an SQL gripper would plug into an SQL server and provide the tables as a set of collections with each every row a document. - + + Iteration + https://bmeg.github.io/grip/docs/queries/iterations/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/iterations/ + Iteration API A common operation in graph search is the ability to iterative repeat a search pattern. For example, a &lsquo;friend of a friend&rsquo; search may become a &lsquo;friend of a friend of a friend&rsquo; search. In the GripQL language cycles, iterations and conditional operations are encoded using &lsquo;mark&rsquo; and &lsquo;jump&rsquo; based interface. This operations are similar to using a &lsquo;goto&rsquo; statement in a traditional programming language. While more primitive than the repeat mechanisms seen in Gremlin, this pattern allows for a much more simple query compilation and implementation. + Jobs API https://bmeg.github.io/grip/docs/queries/jobs_api/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/jobs_api/ - Jobs API Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time. -Submitting a job job = G.query().V().hasLabel(&quot;Planet&quot;).out().submit() Getting job status jinfo = G.getJob(job[&quot;id&quot;]) Example job info: -{ &#34;id&#34;: &#34;job-326392951&#34;, &#34;graph&#34;: &#34;test_graph_qd7rs7&#34;, &#34;state&#34;: &#34;COMPLETE&#34;, &#34;count&#34;: &#34;12&#34;, &#34;query&#34;: [{&#34;v&#34;: []}, {&#34;hasLabel&#34;: [&#34;Planet&#34;]}, {&#34;as&#34;: &#34;a&#34;}, {&#34;out&#34;: []}], &#34;timestamp&#34;: &#34;2021-03-30T23:12:01-07:00&#34; } Reading job results for row in G. + Jobs API Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time. Submitting a job job = G.V().hasLabel(&#34;Planet&#34;).out().submit() Getting job status jinfo = G.getJob(job[&#34;id&#34;]) Example job info: { &#34;id&#34;: &#34;job-326392951&#34;, &#34;graph&#34;: &#34;test_graph_qd7rs7&#34;, &#34;state&#34;: &#34;COMPLETE&#34;, &#34;count&#34;: &#34;12&#34;, &#34;query&#34;: [{&#34;v&#34;: []}, {&#34;hasLabel&#34;: [&#34;Planet&#34;]}, {&#34;as&#34;: &#34;a&#34;}, {&#34;out&#34;: []}], &#34;timestamp&#34;: &#34;2021-03-30T23:12:01-07:00&#34; } Reading job results for row in G. - list https://bmeg.github.io/grip/docs/commands/list/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/list/ grip list graphs grip list graphs - MongoDB https://bmeg.github.io/grip/docs/databases/mongo/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/mongo/ - MongoDB GRIP supports storing vertices and edges in MongoDB. -Config: -Default: mongo Drivers: mongo: MongoDB: URL: &#34;mongodb://localhost:27000&#34; DBName: &#34;gripdb&#34; Username: &#34;&#34; Password: &#34;&#34; UseCorePipeline: False BatchSize: 0 UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage. -BatchSize - For core engine operations, GRIP dispatches element lookups in batches to minimize query overhead. + MongoDB GRIP supports storing vertices and edges in MongoDB. Config: Default: mongo Drivers: mongo: MongoDB: URL: &#34;mongodb://localhost:27000&#34; DBName: &#34;gripdb&#34; Username: &#34;&#34; Password: &#34;&#34; UseCorePipeline: False BatchSize: 0 UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage. BatchSize - For core engine operations, GRIP dispatches element lookups in batches to minimize query overhead. - mongoload https://bmeg.github.io/grip/docs/commands/mongoload/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/mongoload/ grip mongoload - Operations https://bmeg.github.io/grip/docs/queries/operations/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/operations/ - Start a Traversal .V([ids]) Start query from Vertex -G.query().V() Returns all vertices in graph -G.query().V([&#34;vertex1]&#34;) Returns: -{&#34;gid&#34; : &#34;vertex1&#34;, &#34;label&#34;:&#34;TestVertex&#34;, &#34;data&#34;:{}} .E([ids]) Start query from Edge -G.query().E() Returns all edges in graph -G.query().E([&#34;edge1&#34;]) Returns: -{&#34;gid&#34; : &#34;edge1&#34;, &#34;label&#34;:&#34;TestEdge&#34;, From: &#34;vertex1&#34;, To: &#34;vertex2&#34;, data&#34;:{}} Traverse the graph .in_(), inV() Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges. + Start a Traversal .V([ids]) Start query from Vertex G.V() Returns all vertices in graph G.V([&#34;vertex1&#34;]) Returns: {&#34;gid&#34; : &#34;vertex1&#34;, &#34;label&#34;:&#34;TestVertex&#34;, &#34;data&#34;:{}} .E([ids]) Start query from Edge G.E() Returns all edges in graph G.E([&#34;edge1&#34;]) Returns: {&#34;gid&#34; : &#34;edge1&#34;, &#34;label&#34;:&#34;TestEdge&#34;, &#34;from&#34;: &#34;vertex1&#34;, &#34;to&#34;: &#34;vertex2&#34;, &#34;data&#34;:{}} Traverse the graph .in_(), inV() Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges. - PostgreSQL https://bmeg.github.io/grip/docs/databases/psql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/psql/ - PostgreSQL GRIP supports storing vertices and edges in PostgreSQL. -Config: -Default: psql Drivers: psql: PSQL: Host: localhost Port: 15432 User: &#34;&#34; Password: &#34;&#34; DBName: &#34;grip&#34; SSLMode: disable + PostgreSQL GRIP supports storing vertices and edges in PostgreSQL. Config: Default: psql Drivers: psql: PSQL: Host: localhost Port: 15432 User: &#34;&#34; Password: &#34;&#34; DBName: &#34;grip&#34; SSLMode: disable - query https://bmeg.github.io/grip/docs/commands/query/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/query/ grip query &lt;graph&gt; &lt;query&gt; Run a query on a graph. - Query a Graph https://bmeg.github.io/grip/docs/queries/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/ - Referencing Fields https://bmeg.github.io/grip/docs/queries/jsonpath/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/jsonpath/ - Referencing Vertex/Edge Properties Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals. -The following query: -O.query().V([&quot;ENSG00000012048&quot;]).as_(&quot;gene&quot;).out(&quot;variant&quot;) Starts at vertex ENSG00000012048 and marks as gene: -{ &quot;gid&quot;: &quot;ENSG00000012048&quot;, &quot;label&quot;: &quot;gene&quot;, &quot;data&quot;: { &quot;symbol&quot;: { &quot;ensembl&quot;: &quot;ENSG00000012048&quot;, &quot;hgnc&quot;: 1100, &quot;entrez&quot;: 672, &quot;hugo&quot;: &quot;BRCA1&quot; } &quot;transcipts&quot;: [&quot;ENST00000471181.7&quot;, &quot;ENST00000357654.8&quot;, &quot;ENST00000493795.5&quot;] } } as &ldquo;gene&rdquo; and traverses the graph to: + Referencing Vertex/Edge Properties Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals. The following query: O.V([&#34;ENSG00000012048&#34;]).as_(&#34;gene&#34;).out(&#34;variant&#34;) Starts at vertex ENSG00000012048 and marks as gene: { &#34;gid&#34;: &#34;ENSG00000012048&#34;, &#34;label&#34;: &#34;gene&#34;, &#34;data&#34;: { &#34;symbol&#34;: { &#34;ensembl&#34;: &#34;ENSG00000012048&#34;, &#34;hgnc&#34;: 1100, &#34;entrez&#34;: 672, &#34;hugo&#34;: &#34;BRCA1&#34; } &#34;transcipts&#34;: [&#34;ENST00000471181.7&#34;, &#34;ENST00000357654.8&#34;, &#34;ENST00000493795.5&#34;] } } as &ldquo;gene&rdquo; and traverses the graph to: - Security https://bmeg.github.io/grip/docs/security/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/security/ - server https://bmeg.github.io/grip/docs/commands/server/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/server/ - grip server The server command starts up a graph server and waits for incoming requests. -Default Configuration If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver. -Networking By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201. + grip server The server command starts up a graph server and waits for incoming requests. Default Configuration If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver. Networking By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201. - SQL https://bmeg.github.io/grip/docs/databases/sql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/sql/ - Connect to an existing SQL database Note: This driver is being superseded by the GRIPPER engine -GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB. -Since GRIP uses Go's database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database. + Connect to an existing SQL database Note: This driver is being superseded by the GRIPPER engine GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB. Since GRIP uses Go&rsquo;s database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database. - TCGA RNA Expression https://bmeg.github.io/grip/docs/tutorials/tcga-rna/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/tcga-rna/ - Explore TCGA RNA Expression Data Create the graph -grip create tcga-rna Get the data -curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz Load clinical data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor' Load RNASeq data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &quot;RNA:&quot; --exclude RNA:Hugo_Symbol Connect RNASeq data to Clinical data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge 'RNA:{_gid}' rna Connect Clinical data to subtypes -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &quot;{EXPRESSION_SUBTYPE}&quot; subtype --dst-vertex &quot;{EXPRESSION_SUBTYPE}&quot; Subtype Load Hugo Symbol to EntrezID translation table from RNA matrix annotations + Explore TCGA RNA Expression Data Create the graph grip create tcga-rna Get the data curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz Load clinical data ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &#39;Donor&#39; Load RNASeq data ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &#34;RNA:&#34; --exclude RNA:Hugo_Symbol Connect RNASeq data to Clinical data ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge &#39;RNA:{_gid}&#39; rna Connect Clinical data to subtypes ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &#34;{EXPRESSION_SUBTYPE}&#34; subtype --dst-vertex &#34;{EXPRESSION_SUBTYPE}&#34; Subtype Load Hugo Symbol to EntrezID translation table from RNA matrix annotations - Tutorials https://bmeg.github.io/grip/docs/tutorials/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/ - - \ No newline at end of file + diff --git a/docs/docs/jobs_api/index.html b/docs/docs/jobs_api/index.html new file mode 100644 index 000000000..094e2896d --- /dev/null +++ b/docs/docs/jobs_api/index.html @@ -0,0 +1,408 @@ + + + + + + + + + + + Jobs API · GRIP + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +

      GRIP

       +
      + +
      +

      OHSU Comp Bio

       +
      +
      +
      + + +
      + +
      + +
      + +
      +

      Jobs API

      +

      Not all queries return instantaneously, additionally some queries elements are used +repeatedly. The query Jobs API provides a mechanism to submit graph traversals +that will be evaluated asynchronously and can be retrieved at a later time.

      +

      Submitting a job

      +
      job = G.V().hasLabel("Planet").out().submit()
+

      Getting job status

      +
      jinfo = G.getJob(job["id"])
+

      Example job info:

      +
      {
+  "id": "job-326392951",
+  "graph": "test_graph_qd7rs7",
+  "state": "COMPLETE",
+  "count": "12",
+  "query": [{"v": []}, {"hasLabel": ["Planet"]}, {"as": "a"}, {"out": []}],
+  "timestamp": "2021-03-30T23:12:01-07:00"
+}
+

      Reading job results

      +
      for row in G.readJob(job["id"]):
+   print(row)
+

      Search for jobs

      +

      Find jobs that match the prefix of the current request (example should find job from G.V().hasLabel(“Planet”).out())

      +
      jobs = G.V().hasLabel("Planet").out().out().count().searchJobs()
+

      If there are multiple jobs that match the prefix of the search, all of them will be returned. It will be a client side +job to decide which of the jobs to use as a starting point. This can either be the job with the longest matching prefix, or +the most recent job. Note, that if the underlying database has changed since the job was run, adding additional steps to the +traversal may produce inaccurate results.

      +

      Once job has been selected from the returned list you can use these existing results and continue the traversal.

      +
      for res in G.resume(job["id"]).out().count():
+    print(res)
+
      +
      + +
      + + diff --git a/docs/docs/queries/aggregation/index.html b/docs/docs/queries/aggregation/index.html new file mode 100644 index 000000000..26e17129d --- /dev/null +++ b/docs/docs/queries/aggregation/index.html @@ -0,0 +1,421 @@ + + + + + + + + + + + Aggregation · GRIP + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +

      GRIP

       +
      + +
      +

      OHSU Comp Bio

       +
      +
      +
      + + +
      + +
      + +
      + +
      +

      Aggregation

      +

      These methods provide a powerful way to analyze and summarize data in your GripQL graph database. They allow you to perform various types of aggregations, including term frequency, histograms, percentiles, and more. By combining these with other traversal functions like has, hasLabel, etc., you can create complex queries that extract specific insights from your data.

      +

      .aggregate([aggregations])

      +

      Groups and summarizes data from the graph. It allows you to perform calculations on vertex or edge properties. The following aggregation types are available:

      +

      Aggregation Types

      +

      .gripql.term(name, field, size)

      +

      Return top n terms and their counts for a field.

      +
      G.V().hasLabel("Person").aggregate(gripql.term("top-names", "name", 10))
+

      Counts name occurrences across Person vertices and returns the 10 most frequent name values.

      +

      .gripql.histogram(name, field, interval)

      +

      Return binned counts for a field.

      +
      G.V().hasLabel("Person").aggregate(gripql.histogram("age-hist", "age", 5))
+

      Creates a histogram of age values with bins of width 5 across Person vertices.

      +

      .gripql.percentile(name, field, percents=[])

      +

      Return percentiles for a field.

      +
      G.V().hasLabel("Person").aggregate(gripql.percentile("age-percentiles", "age", [25, 50, 75]))
+

      Calculates the 25th, 50th, and 75th percentiles for age values across Person vertices.

      +

      .gripql.field("fields", "$")

      +

      Returns all of the fields found in the data structure. Use $ to get a listing of all fields found at the root level of the data property of vertices or edges.

      +
      +

      .count()

      +

      Returns the total number of elements in the traversal.

      +
      G.V().hasLabel("Person").count()
+

      This query returns the total number of vertices with the label “Person”.

      +
      +

      .distinct([fields])

      +

      Filters the traversal to return only unique elements. If fields are provided, uniqueness is determined by the combination of values in those fields; otherwise, the _id is used.

      +
      G.V().hasLabel("Person").distinct(["name", "age"])
+

      This query returns only unique “Person” vertices, where uniqueness is determined by the combination of “name” and “age” values.

      +
      +

      .sort([fields])

      +

      Sort the output using the field values. You can sort in ascending or descending order by providing descending=True as an argument to sort() method.

      +
      G.V().hasLabel("Person").sort("age")
+

      This query sorts “Person” vertices based on their age in ascending order.

      +

      .limit(n)

      +

      Limits the number of results returned by your query.

      +
      G.V().hasLabel("Person").limit(10)
+

      This query limits the results to the first 10 “Person” vertices found.

      +
      +

      .skip(n)

      +

      Offsets the results returned by your query.

      +
      G.V().hasLabel("Person").skip(5)
+

      This query skips the first 5 “Person” vertices and returns the rest.

      + +
      + +
      + + diff --git a/docs/docs/queries/filtering/index.html b/docs/docs/queries/filtering/index.html new file mode 100644 index 000000000..1a02b867f --- /dev/null +++ b/docs/docs/queries/filtering/index.html @@ -0,0 +1,452 @@ + + + + + + + + + + + Filtering · GRIP + + + + + + + + + + + + + + + + + + + + +
      +
      +
      +

      GRIP

       +
      + +
      +

      OHSU Comp Bio

       +
      +
      +
      + + +
      + +
      + +
      + +
      +

      Filtering in GripQL

      +

      GripQL provides powerful filtering capabilities using the .has() method and various condition functions. +Here’s a comprehensive guide:.has()The .has() method is used to filter elements (vertices or edges) based on specified conditions.

      +

      Conditions are functions provided by the gripql module that define the filtering criteria.

      +

      Comparison Operators

      +

      gripql.eq(variable, value)

      +

      Equal to (==)

      +
      G.V().has(gripql.eq("symbol", "TP53"))
+# Returns vertices where the 'symbol' property is equal to 'TP53'.
+

      gripql.neq(variable, value)

      +

      Not equal to (!=)

      +
      G.V().has(gripql.neq("symbol", "TP53"))
+# Returns vertices where the 'symbol' property is not equal to 'TP53'.
+

      gripql.gt(variable, value)

      +

      Greater than (>)

      +
      G.V().has(gripql.gt("age", 45))
+# Returns vertices where the 'age' property is greater than 45.
+

      gripql.lt(variable, value)

      +

      Less than (<)

      +
      G.V().has(gripql.lt("age", 45))
+# Returns vertices where the 'age' property is less than 45.
+

      gripql.gte(variable, value)

      +

      Greater than or equal to (>=)

      +
      G.V().has(gripql.gte("age", 45))
+# Returns vertices where the 'age' property is greater than or equal to 45.
+

      gripql.lte(variable, value)

      +

      Less than or equal to (<=)

      +
      G.V().has(gripql.lte("age", 45))
+# Returns vertices where the 'age' property is less than or equal to 45.
+
      +

      Range Operators

      +

      gripql.inside(variable, [lower_bound, upper_bound])

      +

      lower_bound < variable < upper_bound (exclusive)

      +
      G.V().has(gripql.inside("age", [30, 45]))
+# Returns vertices where the 'age' property is greater than 30 and less than 45.
+

      gripql.outside(variable, [lower_bound, upper_bound])

      +

      variable < lower_bound OR variable > upper_bound

      +
      G.V().has(gripql.outside("age", [30, 45]))
+# Returns vertices where the 'age' property is less than 30 or greater than 45.
+

      gripql.between(variable, [lower_bound, upper_bound])

      +

      lower_bound <= variable < upper_bound

      +
      G.V().has(gripql.between("age", [30, 45]))
+# Returns vertices where the 'age' property is greater than or equal to 30 and less than 45.
+
      +

      Set Membership Operators

      +

      gripql.within(variable, values)

      +

      variable is in values

      +
      G.V().has(gripql.within("symbol", ["TP53", "BRCA1"]))
+# Returns vertices where the 'symbol' property is either 'TP53' or 'BRCA1'.
+

      gripql.without(variable, values)

      +

      variable is not in values

      +
      G.V().has(gripql.without("symbol", ["TP53", "BRCA1"]))
+# Returns vertices where the 'symbol' property is neither 'TP53' nor 'BRCA1'.
+
      +

      String/Array Containment

      +

      gripql.contains(variable, value)

      +

      The variable (which is typically a list/array) contains value.

      +
      G.V().has(gripql.contains("groups", "group1"))
+# Returns vertices where the 'groups' property (which is a list) contains the value "group1".
+# Example: {"groups": ["group1", "group2", "group3"]} would match.
+
      +

      Logical Operators

      +

      gripql.and_([condition1, condition2, ...])

      +

      Logical AND; all conditions must be true.

      +
      G.V().has(gripql.and_([gripql.lte("age", 45), gripql.gte("age", 35)]))
+# Returns vertices where the 'age' property is less than or equal to 45 AND greater than or equal to 35.
+

      gripql.or_([condition1, condition2, ...])

      +

      Logical OR; at least one condition must be true.

      +
      G.V().has(gripql.or_([gripql.eq("symbol", "TP53"), gripql.eq("symbol", "BRCA1")]))
+# Returns vertices where the 'symbol' property is either 'TP53' OR 'BRCA1'.
+

      gripql.not_(condition)

      +

      Logical NOT; negates the condition

      +
      G.V().has(gripql.not_(gripql.eq("symbol", "TP53")))
+# Returns vertices where the 'symbol' property is NOT equal to 'TP53'.
+
      +
      + +
      + + diff --git a/docs/docs/queries/getting_started/index.html b/docs/docs/queries/getting_started/index.html index 3dc7ffd98..d530c5417 100644 --- a/docs/docs/queries/getting_started/index.html +++ b/docs/docs/queries/getting_started/index.html @@ -1,6 +1,6 @@ - + @@ -12,18 +12,18 @@ - - - - - + + + + + - - + + - + @@ -32,11 +32,11 @@
      -

      GRIP

       +

      GRIP
      @@ -56,14 +56,14 @@
    • - Overview
    • - Download
      • @@ -75,7 +75,7 @@
    • @@ -84,7 +84,7 @@
    • @@ -93,7 +93,7 @@
    • @@ -102,7 +102,7 @@
    • @@ -111,7 +111,7 @@
    • @@ -120,7 +120,7 @@
    • @@ -130,123 +130,98 @@
    • - Database Configuration
      • + Client Library -
    • - -
      • + +
    • -
    • - -
      • + Database Configuration -
    • - -
      • + +
    • + + Query a Graph
      • - SQL
        • + >Operations
      • - - -
    • - - GRIP Plugable External Resources
      • -
      • - Intro
        • + >Traverse the Graph
      • - - -
    • - - Query a Graph
      • -
    • @@ -255,7 +230,7 @@
    • @@ -270,7 +245,7 @@
    • @@ -279,7 +254,7 @@
    • @@ -294,7 +269,7 @@
    • @@ -309,7 +284,7 @@
    • @@ -318,7 +293,7 @@
    • @@ -350,86 +325,45 @@ +
    • + + GRIP Plugable External Resources
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + + +
    -

    Getting Started

    -

    GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations.

    -

    Install the Python Client

    -

    Available on PyPI.

    -
    pip install gripql
-

    Or install the latest development version:

    -
    pip install "git+https://github.com/bmeg/grip.git#subdirectory=gripql/python"
-

    Using the Python Client

    -

    Let's go through the features currently supported in the python client.

    -

    First, import the client and create a connection to an GRIP server:

    -
    import gripql
-G = gripql.Connection("https://bmeg.io").graph("bmeg")
-

    Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass -authorization headers in its requests.

    -
    import gripql
-
-# Basic Auth Header - {'Authorization': 'Basic dGVzdDpwYXNzd29yZA=='}
-G = gripql.Connection("https://bmeg.io", user="test", password="password").graph("bmeg")
-#
-
-# Bearer Token - {'Authorization': 'Bearer iamnotarealtoken'}
-G = gripql.Connection("https://bmeg.io", token="iamnotarealtoken").graph("bmeg")
-
-# OAuth2 / Custom - {"OauthEmail": "fake.user@gmail.com", "OauthAccessToken": "iamnotarealtoken", "OauthExpires": 1551985931}
-G = gripql.Connection("https://bmeg.io",  credential_file="~/.grip_token.json").graph("bmeg")
-

    Now that we have a connection to a graph instance, we can use this to make all of our queries.

    -

    One of the first things you probably want to do is find some vertex out of all of the vertexes available in the system. In order to do this, we need to know something about the vertex we are looking for. To start, let's see if we can find a specific gene:

    -
    result = G.query().V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).execute()
-print(result)
-

    A couple things about this first and simplest query. We start with O, our grip client instance connected to the “bmeg” graph, and create a new query with .query(). This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results.

    -

    Once we make this query, we get a result:

    -
    [
-  {u'gid': u'ENSG00000141510',
-  u'data': {
-    u'end': 7687550,
-    u'description': u'tumor protein p53 [Source:HGNC Symbol%3BAcc:HGNC:11998]',
-    u'symbol': u'TP53',
-    u'start': 7661779,
-    u'seqId': u'17',
-    u'strand': u'-',
-    u'id': u'ENSG00000141510',
-    u'chromosome': u'17'
-  },
-  u'label': u'Gene'})
-]
-

    This represents the vertex we queried for above. All vertexes in the system will have a similar structure, basically:

    -
      -
    • gid: This represents the global identifier for this vertex. In order to draw edges between different vertexes from different data sets we need an identifier that can be constructed from available data. Often, the gid will be the field that you query on as a starting point for a traversal.
      • -
    • label: The label represents the type of the vertex. All vertexes with a given label will share many property keys and edge labels, and form a logical group within the system.
      • -
    • data: This is where all the data goes. data can be an arbitrary map, and these properties can be referenced during traversals.
      • -
    -

    The data on a query result can be accessed as properties on the result object; for example result[0].data.symbol would return:

    -
    u'TP53'
-

    You can also do a has query with a list of items using gripql.within([...]) (other conditions exist, see the Conditions section below):

    -
    result = G.query().V().hasLabel("Gene").has(gripql.within("symbol", ["TP53", "BRCA1"])).render({"gid": "_gid", "symbol":"symbol"}).execute()
-print(result)
-

    This returns both Gene vertexes:

    -
    [
-  {u'symbol': u'TP53', u'gid': u'ENSG00000141510'},
-  {u'symbol': u'BRCA1', u'gid': u'ENSG00000012048'}
-]
-

    Once you are on a vertex, you can travel through that vertex's edges to find the vertexes it is connected to. Sometimes you don't even need to go all the way to the next vertex, the information on the edge between them may be sufficient.

    -

    Edges in the graph are directional, so there are both incoming and outgoing edges from each vertex, leading to other vertexes in the graph. Edges also have a label, which distinguishes the kind of connections different vertexes can have with one another.

    -

    Starting with gene TP53, and see what kind of other vertexes it is connected to.

    -
    result = G.query().V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).in_("TranscriptFor")render({"gid": "_gid", "label":"_label"}).execute()
-print(result)
-

    Here we have introduced a couple of new steps. The first is .in_(). This starts from wherever you are in the graph at the moment and travels out along all the incoming edges. -Additionally, we have provided TranscriptFor as an argument to .in_(). This limits the returned vertices to only those connected to the Gene verticies by edges labeled TranscriptFor.

    -
    [
-  {u'label': u'Transcript', u'gid': u'ENST00000413465'},
-  {u'label': u'Transcript', u'gid': u'ENST00000604348'},
-  ...
-]
-

    View a list of all available query operations here.

    - +
    diff --git a/docs/docs/queries/graph_schemas/index.html b/docs/docs/queries/graph_schemas/index.html deleted file mode 100644 index 769af6f14..000000000 --- a/docs/docs/queries/graph_schemas/index.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - Graph Schemas · GRIP - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -

    GRIP

     -
    - -
    -

    OHSU Comp Bio

     -
    -
    -
    - - -
    - -
    - -
    - -
    - - -

    Graph Schemas

    - -

    Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. -The schemas are automatically added to the database following the naming pattern {graph-name}__schema__.

    - -

    Get the schema of a graph

    - -

    The schema of a graph can be accessed via a GET request to /v1/graph/{graph-name}/schema.

    - -

    Alternatively, you can use the grip CLI: grip schema get {graph-name}.

    - -

    Describing graph schemas

    - -

    There are several methods for desribing the schema of a graph.

    - -
      -
    • Provide the schema (as a YAML file) to the server at runtime. grip server --schema {schema-file}
      • -
    • POST the schema /v1/graph/{graph-name}/schema via curl or use the CLI grip schema post --yaml {file} --json {file}.
      • -
    • Configure Grip to build the schema by sampling the data in each graph.
      • -
    - -
    Server:
-  # Should the server periodically build the graph schemas?
-  AutoBuildSchemas: true
-  # How often the server should rebuild the graph schemas. Set to 0 to turn off
-  SchemaRefreshInterval: "24h"
-  # How many vertices/edges to inspect to infer the schema
-  SchemaInspectN: 500
-  # Strategy to use for selecting the vertices/edges to inspect.
-  # Random if True; first N otherwise
-  SchemaRandomSample: true
-
    - -

    Example schema

    - -
     graph: example-graph
-
- edges:
-- data: {}
-  from: Human
-  gid: (Human)--starship->(Starship)
-  label: starship
-  to: Starship
-- data: {}
-  from: Human
-  gid: (Human)--friend->(Human)
-  label: friend
-  to: Human
-- data: {}
-  from: Human
-  gid: (Human)--friend->(Droid)
-  label: friend
-  to: Droid
-- data: {}
-  from: Human
-  gid: (Human)--appearsIn->(Movie)
-  label: appearsIn
-  to: Movie
-
-vertices:
-- data:
-    name: STRING
-  gid: Movie
-  label: Movie
-- data:
-    length: NUMERIC
-    name: STRING
-  gid: Starship
-  label: Starship
-- data:
-    name: STRING
-    primaryFunction: STRING
-  gid: Droid
-  label: Droid
-- data:
-    height: NUMERIC
-    homePlanet: STRING
-    mass: NUMERIC
-    name: STRING
-  gid: Human
-  label: Human
-
    - -
    - -
    - - diff --git a/docs/docs/queries/index.html b/docs/docs/queries/index.html index 5b64d24a2..0fafa9bcf 100644 --- a/docs/docs/queries/index.html +++ b/docs/docs/queries/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/queries/iterations/index.html b/docs/docs/queries/iterations/index.html index 540fa8ca3..9c0670b75 100644 --- a/docs/docs/queries/iterations/index.html +++ b/docs/docs/queries/iterations/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • -
  • - -
    • + +
  • + + Jobs API
  • @@ -359,42 +332,88 @@ +
  • + + GRIP Plugable External Resources
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + + +
    -

    Iteration API

    -

    A common operation in graph search is the ability to iterative repeat a search pattern. -For example, a ‘friend of a friend’ search may become a ‘friend of a friend of a friend’ search.

    -

    In the GripQL language cycles, iterations and conditional operations are encoded using -‘mark’ and ‘jump’ based interface. This operations are similar to using a ‘goto’ -statement in a traditional programming language. While more primitive than the -repeat mechanisms seen in Gremlin, this pattern allows for a much more simple -query compilation and implementation.

    -

    Because the mark and jump pattern can be abused for denial of service attacks, -ie to create infinite loops, the authorization model will allow this particular set -of operations to be turned off for some accounts. This means that queries from -unauthorized users that utilize the ‘mark’ or ‘jump’ commands will be rejected -by the server without execution. One additional proposed security feature, that -is being discussed for in future upgrades, will allow the server to -track the total number of iterations a traveler has made in a cycle, and provide a -hard cutoff. For example, a user could submit code with a maximum of 5 iterations.

    +

    Iteration Commands

    +

    A common operation in graph search is the ability to iteratively repeat a search pattern. For example, a ‘friend of a friend’ search may become a ‘friend of a friend of a friend’ search. In the GripQL language cycles, iterations and conditional operations are encoded using ‘mark’ and ‘jump’ based interface. This operation is similar to using a ‘goto’ statement in traditional programming languages. While more primitive than the repeat mechanisms seen in Gremlin, this pattern allows for much simpler query compilation and implementation.

    +

    However, due to security concerns regarding potential denial of service attacks that could be created with the use of ‘mark’ and ‘jump’, these operations are restricted in most accounts. This is enforced by the server rejecting any queries from unauthorized users that utilize these commands without execution. In future upgrades, a proposed security feature will also allow the server to track the total number of iterations a traveler has made in a cycle and provide a hard cutoff. For example, a user could submit code with a maximum of 5 iterations.

    Operation Commands

    -

    mark(name)

    -

    Mark a segment in the stream processor, with a name, that can receive jumps

    +

    .mark(name)

    +

    Mark a segment in the stream processor, with a name, that can receive jumps. This command is used to label sections of the query operation list that can accept travelers from the jump command.

    +

    Parameters:

    +
      +
    • name (str): The name given to the marked segment.
      • +

    jump(dest, condition, emit)

    -

    If a condition is true, send traveler to mark. If emit is true, also send a -copy down the processing chain. If condition is None, always do the jump.

    -

    set(field, value)

    -

    Set values within the travelers memory. These values be used to store cycle counts

    -

    increment(field, value)

    -

    Increment field, ie data[field] = data[field] + value. Can be used to increment counter every cycle

    -

    Example queries

    -
    q = G.query().V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count")
-q = q.has(gripql.lt("$start.count", 2))
-q = q.jump("a", None, True)
-
    +

    If a condition is true, send traveler to mark. If emit is True, also send a copy down the processing chain. If condition is None, always do the jump. This command is used to move travelers from one marked segment to another based on a specified condition.

    +

    Parameters:

    +
      +
    • dest (str): The name of the destination mark segment. Travelers are moved to this point when their position matches the condition parameter.
      • +
    • condition (expr or None): An expression that determines if the traveler should jump. If it evaluates to True, the traveler jumps to the specified destination. If None, the traveler always jumps to the specified destination.
      • +
    • emit (bool): Determines whether a copy of the traveler is emitted down the processing chain after jumping. If False, only the original traveler is processed.
      • +
    +

    .set(field, value)

    +

    Set values within the traveler’s memory. These values can be used to store cycle counts. This command sets a field in the traveler’s memory to a specified value.

    +

    Parameters:

    +
      +
    • field (str): The name of the field to set.
      • +
    • value (expr): The value to set for the specified field. This can be any valid GripQL expression that resolves to a scalar value.
      • +
    +

    .increment(field, value)

    +

    Increment a field by a specified value. This command increments a field in the traveler’s memory by a specified amount.

    +

    Parameters:

    +
      +
    • field (str): The name of the field to increment.
      • +
    • value (expr): The amount to increment the specified field by. This can be any valid GripQL expression that resolves to an integer value.
      • +
    +

    Example Queries

    +

    The following examples demonstrate how to use these commands in a query:

    +
    q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count")
+q = q.has(gripql.lt("$start.count", 2))
+q = q.jump("a", None, True)
+

    This query starts from a vertex with the ID “Character:1”. It sets a field named “count” to 0 and annotates this vertex as “start”. Then it marks this position in the operation list for future reference. The out command moves travelers to the outgoing edges of their current positions, incrementing the “count” field each time. If the count is less than 2, the traveler jumps back to the marked location, effectively creating a loop.

    +
    q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count")
+q = q.has(gripql.lt("$start.count", 2))
+q = q.jump("a", None, False)
+

    This query is similar to the previous one, but in this case, the traveler only jumps back without emitting a copy down the processing chain. The result is that only one vertex will be included in the output, even though there are multiple iterations due to the jump command.

    +

    In both examples, the use of mark and jump commands create an iterative pattern within the query operation list, effectively creating a ‘friend of a friend’ search that can repeat as many times as desired. These patterns are crucial for complex graph traversals in GripQL.

    +
    diff --git a/docs/docs/queries/jobs/index.html b/docs/docs/queries/jobs/index.html new file mode 100644 index 000000000..ef2674ad1 --- /dev/null +++ b/docs/docs/queries/jobs/index.html @@ -0,0 +1,392 @@ + + + + + + + + + + + · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +

    .submit()

    +

    Post the traversal as an asynchronous job and get a job ID.

    +

    Example: Submit a query to be processed in the background

    +
    job_id = G.V('vertexID').hasLabel('Vertex').submit()
+print(job_id)  # print job ID
+
    +

    .searchJobs()

    +

    Find jobs that match this query and get their status and results if available.

    +

    Example: Search for jobs with the specified query and print their statuses and results

    +
    for result in G.V('vertexID').hasLabel('Vertex').searchJobs():
+    print(result['status'])  # print job status
+    if 'results' in result:
+        print(result['results'])  # print job results
+
    + +
    + +
    + + diff --git a/docs/docs/queries/jobs_api/index.html b/docs/docs/queries/jobs_api/index.html index 6d0d17f65..af22adf6d 100644 --- a/docs/docs/queries/jobs_api/index.html +++ b/docs/docs/queries/jobs_api/index.html @@ -1,393 +1,525 @@ - + - - - - - - - - - Jobs API · GRIP - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -

    GRIP

     -
    - -
    -

    OHSU Comp Bio

     -
    -
    -
    - - -
    - -
    - -
    - -
    -

    Jobs API

    -

    Not all queries return instantaneously, additionally some queries elements are used -repeatedly. The query Jobs API provides a mechanism to submit graph traversals -that will be evaluated asynchronously and can be retrieved at a later time.

    -

    Submitting a job

    -
    job = G.query().V().hasLabel("Planet").out().submit()
-

    Getting job status

    -
    jinfo = G.getJob(job["id"])
-

    Example job info:

    -
    {
-  "id": "job-326392951",
-  "graph": "test_graph_qd7rs7",
-  "state": "COMPLETE",
-  "count": "12",
-  "query": [{"v": []}, {"hasLabel": ["Planet"]}, {"as": "a"}, {"out": []}],
-  "timestamp": "2021-03-30T23:12:01-07:00"
-}
-

    Reading job results

    -
    for row in G.readJob(job["id"]):
+    
+        
+        
+        
+
+        
+
+        Jobs API · GRIP
+
+        
+        
+        
+        
+        
+        
+
+        
+        
+
+        
+        
+    
+    
+        
    
+            
    
+                
    
+                    
    GRIP
    
+                
    
+                
+                
    
+                    
    OHSU Comp Bio
    
+                
    
+            
    
+        
    
+
+        
    
+            
    
+                
+            
    
+
+            
    
+                
    Jobs API
    
+                
    
+                    Not all queries return instantaneously, additionally some
+                    queries elements are used repeatedly. The query Jobs API
+                    provides a mechanism to submit graph traversals that will be
+                    evaluated asynchronously and can be retrieved at a later
+                    time.
+                
    
+                
    Submitting a job
    
+                
    job = G.V().hasLabel("Planet").out().submit()
+
    
+                
    Getting job status
    
+                
    jinfo = G.getJob(job["id"])
+
    
+                
    Example job info:
    
+                
    
+                    
    {
+  "id": "job-326392951",
+  "graph": "test_graph_qd7rs7",
+  "state": "COMPLETE",
+  "count": "12",
+  "query": [{"v": []}, {"hasLabel": ["Planet"]}, {"as": "a"}, {"out": []}],
+  "timestamp": "2021-03-30T23:12:01-07:00"
+}
+
    
+                
    
+                
    Reading job results
    
+                
    for row in G.readJob(job["id"]):
    print(row)
-
    Search for jobs
    
-
    Find jobs that match the prefix of the current request (example should find job from G.query().V().hasLabel(“Planet”).out())
    
-
    jobs = G.query().V().hasLabel("Planet").out().out().count().searchJobs()
-
    If there are multiple jobs that match the prefix of the search, all of them will be returned. It will be a client side
-job to decide which of the jobs to use as a starting point. This can either be the job with the longest matching prefix, or
-the most recent job. Note, that if the underlying database has changed since the job was run, adding additional steps to the
-traversal may produce inaccurate results.
    
-
    Once job has been selected from the returned list you can use these existing results and continue the traversal.
    
-
    for res in G.resume(job["id"]).out().count():
+
    
+                
    Search for jobs
    
+                
    
+                    Find jobs that match the prefix of the current request
+                    (example should find job from
+                    G.V().hasLabel(“Planet”).out())
+                
    
+                
    jobs = G.V().hasLabel("Planet").out().out().count().searchJobs()
+
    
+                
    
+                    If there are multiple jobs that match the prefix of the
+                    search, all of them will be returned. It will be a client
+                    side job to decide which of the jobs to use as a starting
+                    point. This can either be the job with the longest matching
+                    prefix, or the most recent job. Note, that if the underlying
+                    database has changed since the job was run, adding
+                    additional steps to the traversal may produce inaccurate
+                    results.
+                
    
+                
    
+                    Once job has been selected from the returned
+                    list you can use these existing results and continue the
+                    traversal.
+                
    
+                
    for res in G.resume(job["id"]).out().count():
     print(res)
 
    
-  
    
-
-
    
-
+
    +
    + diff --git a/docs/docs/queries/jsonpath/index.html b/docs/docs/queries/jsonpath/index.html index 444e03890..8f55e0562 100644 --- a/docs/docs/queries/jsonpath/index.html +++ b/docs/docs/queries/jsonpath/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -359,93 +374,85 @@

    Referencing Vertex/Edge PropertiesSeveral operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals.

    The following query:

    -
    O.query().V(["ENSG00000012048"]).as_("gene").out("variant")
+
    O.V(["ENSG00000012048"]).as_("gene").out("variant")
 
    Starts at vertex ENSG00000012048 and marks as gene:
    
-
    {
-  "gid": "ENSG00000012048",
-  "label": "gene",
-  "data": {
-    "symbol": {
-      "ensembl": "ENSG00000012048",
-      "hgnc": 1100,
-      "entrez": 672,
-      "hugo": "BRCA1"
-    }
-    "transcipts": ["ENST00000471181.7", "ENST00000357654.8", "ENST00000493795.5"]
-  }
-}
-
    as “gene” and traverses the graph to:
    
-
    {
-  "gid": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG",
-  "label": "variant",
-  "data": {
-    "type": "deletion"
-    "publications": [
-      {
-        "pmid": 29480828,
-        "doi": "10.1097/MD.0000000000009380"
-      },
-      {
-        "pmid": 23666017,
-        "doi": "10.1097/IGC.0b013e31829527bd"
-      }
-    ]
-  }
-}
-
    Below is a table of field and the values they would reference in subsequent traversal operations.
    
+
    {
+  "_id": "ENSG00000012048",
+  "_label": "gene",
+  "symbol": {
+    "ensembl": "ENSG00000012048",
+    "hgnc": 1100,
+    "entrez": 672,
+    "hugo": "BRCA1"
+  },
+  "transcipts": ["ENST00000471181.7", "ENST00000357654.8", "ENST00000493795.5"]
+}
+
    as “gene” and traverses the graph to:
    
+
    {
+  "_id": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG",
+  "_label": "variant",
+  "type": "deletion",
+  "publications": [
+    {
+      "pmid": 29480828,
+      "doi": "10.1097/MD.0000000000009380"
+    },
+    {
+      "pmid": 23666017,
+      "doi": "10.1097/IGC.0b013e31829527bd"
+    }
+  ]
+}
+
    Below is a table of field and the values they would reference in subsequent traversal operations.
    
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  
+      
+          
+          
+      
+  
+  
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+      
+          
+          
+      
+  
    jsonpathresult
    _gid“NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG”
    _label“variant”
    _data.type“deletion”
    type“deletion”
    publications[0].pmid29480828
    publications[:].pmid[29480828, 23666017]
    publications.pmid[29480828, 23666017]
    $gene.symbol.hugo“BRCA1”
    $gene.transcripts[0]“ENST00000471181.7”
    jsonpathresult
    _id“NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG”
    _label“variant”
    type“deletion”
    publications[0].pmid29480828
    publications[:].pmid[29480828, 23666017]
    publications.pmid[29480828, 23666017]
    $gene.symbol.hugo“BRCA1”
    $gene.transcripts[0]“ENST00000471181.7”
    
 
    
 
    Usage Example:
    
-
    O.query().V(["ENSG00000012048"]).as_("gene").out("variant").render({"variant_id": "_gid", "variant_type": "type", "gene_id": "$gene._gid"})
+
    O.V(["ENSG00000012048"]).as_("gene").out("variant").render({"variant_id": "_id", "variant_type": "type", "gene_id": "$gene._id"})
 
    returns
    
-
    {
-  "variant_id": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG",
-  "variant_type": "deletion",
-  "gene_id": "ENSG00000012048"
+
    {
+  "variant_id": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG",
+  "variant_type": "deletion",
+  "gene_id": "ENSG00000012048"
 }

    diff --git a/docs/docs/queries/operations/index.html b/docs/docs/queries/operations/index.html index 500d7c549..d8f08c754 100644 --- a/docs/docs/queries/operations/index.html +++ b/docs/docs/queries/operations/index.html @@ -1,493 +1,576 @@ - + - - - - - - - - - Operations · GRIP - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -

    GRIP

     -
    - -
    -

    OHSU Comp Bio

     -
    -
    -
    - - -
    - -
    - -
    - -
    -

    Start a Traversal

    -

    .V([ids])

    -

    Start query from Vertex

    -
    G.query().V()
-

    Returns all vertices in graph

    -
    G.query().V(["vertex1]")
-

    Returns:

    -
    {"gid" : "vertex1", "label":"TestVertex", "data":{}}
-

    .E([ids])

    -

    Start query from Edge

    -
    G.query().E()
-

    Returns all edges in graph

    -
    G.query().E(["edge1"])
-

    Returns:

    -
    {"gid" : "edge1", "label":"TestEdge", From: "vertex1", To: "vertex2", data":{}}
-

    Traverse the graph

    -

    .in_(), inV()

    -

    Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.

    -

    .out(), .outV()

    -

    Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges.

    -

    .both(), .bothV()

    -

    Following all edges (both in and out). Optional argument is the edge label (or list of labels) that should be followed.

    -

    .inE()

    -

    Following incoming edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    -

    .outE()

    -

    Following outgoing edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    -

    .bothE()

    -

    Following all edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    -

    Filtering

    -

    .has()

    -

    Filter elements using conditional statements

    -
    G.query().V().has(gripql.eq("_label", "Gene")).has(gripql.eq("symbol", "TP53"))
-

    Conditions

    -

    Conditions are arguments to .has() that define selection conditions

    -

    gripql.eq(variable, value)

    -

    Returns rows where variable == value

    -
    .has(gripql.eq("symbol", "TP53"))
-

    gripql.neq(variable, value)

    -

    Returns rows where variable != value

    -
    .has(gripql.neq("symbol", "TP53"))
-

    gripql.gt(variable, value)

    -

    Returns rows where variable > value

    -
    .has(gripql.gt("age", 45))
-

    gripql.lt(variable, value)

    -

    Returns rows where variable < value

    -
    .has(gripql.lt("age", 45))
-

    gripql.gte(variable, value)

    -

    Returns rows where variable >= value

    -
    .has(gripql.gte("age", 45))
-

    gripql.lte(variable, value)

    -

    Returns rows where variable <= value

    -
    .has(gripql.lte("age", 45))
-

    gripql.inside(variable, [lower_bound, upper_bound])

    -

    Returns rows where variable > lower_bound && variable < upper_bound

    -
    .has(gripql.inside("age", [30, 45]))
-

    gripql.outside(variable, [lower_bound, upper_bound])

    -

    Returns rows where variable < lower_bound || variable > upper_bound

    -
    .has(gripql.outside("age", [30, 45]))
-

    gripql.between(variable, [lower_bound, upper_bound])

    -

    Returns rows where variable >= lower_bound && variable < upper_bound

    -
    .has(gripql.between("age", [30, 45]))
-

    gripql.within(variable, value)

    -

    Returns rows where variable is within provided values

    -
    .has(gripql.within("symbol", ["TP53", "BRCA1"]))
-

    gripql.without(variable, value)

    -

    Returns rows where variable is not within provided values

    -
    .has(gripql.within("symbol", ["TP53", "BRCA1"]))
-

    gripql.contains(variable, value)

    -

    Returns rows where variable contains value

    -
    .has(gripql.in_("groups", "group1"))
-

    Returns:

    -
    {"data" : {"groups" : ["group1", "group2"]}}
-

    gripql.and_([conditions])

    -
    .has(gripql.and_( [gripql.lte("age", 45), gripql.gte("age", 35)] ))
-

    gripql.or_([conditions])

    -
    .has(gripql.or_( [...] ))
-

    gripql.not_(condition)

    -
    .has(gripql.not_( [...] ))
-

    Output

    -

    .as_(name)

    -

    Store current row for future reference

    -
    G.query().V().as_("a").out().as_("b")
-

    .select([names])

    -

    Output previously marked elements

    -
    G.query().V().mark("a").out().mark("b").select(["a", "b"])
-

    .limit(count)

    -

    Limit number of total output rows

    -
    G.query().V().limit(5)
-

    .skip(count)

    -

    Start return after offset

    -
    G.query().V().skip(5).limit(5)
-

    .range(start, stop)

    -

    As results are iterated return objects starting with lower index As traversers propagate through the traversal, it is possible to only allow a certain number of them to pass through with range()-step (filter). When the low-end of the range is not met, objects are continued to be iterated. When within the low (inclusive) and high (exclusive) range, traversers are emitted. When above the high range, the traversal breaks out of iteration. Finally, the use of -1 on the high range will emit remaining traversers after the low range begins.

    -
    G.query().V().range(5, 15)
-

    .fields([fields])

    -

    Select which vertex/edge fields to return or exlucde. Operation with no arguments exlcudes all properties. -“gid”, “label”, “from” and “to” are included by default.

    -
    O.query().V("vertex1").fields("symbol")     # include only symbol property
-O.query().V("vertex1").fields("-symbol")    # exclude symbol property
-O.query().V("vertex1").fields()             # exclude all properties
-

    .render(template)

    -

    Render current selection into arbitrary data structure

    -
    G.query().V("vertex1").render()
-

    .aggregate([aggregations])

    -

    Aggregate fields in the returned edges/vertices.

    -

    Aggregation Types

    -

    .gripql.term(name, field, size)

    -

    Return top n terms and their counts for a field.

    -
    G.query().V().hasLabel("Person").aggregate(gripql.term("top-names", "name", 10))
-

    Counts name occurences across Person vertices and returns the 10 most frequent name values.

    -

    .gripql.histogram(name, field, interval)

    -

    Return binned counts for a field.

    -
    G.query().V().hasLabel("Person").aggregate(gripql.histogram("age-hist", "age", 5))
-

    Creates a histogram of age values with bins of width 5 across Person vertices.

    -

    .gripql.percentile(name, field, percents=[])

    -

    Return percentiles for a field.

    -
    G.query().V().hasLabel("Person").aggregate(gripql.percentile("age-percentiles", "age", [25,50,75]))
-

    Calculates the 25th, 50th, and 75th percentiles for age values across Person vertices.

    -

    .gripql.gripql.field(“fields”, “$._data”))

    -

    Returns all of the fields found in the data structure. Use $._data to get a listing -of all fields found at the root level of records.

    -

    gripql.type(name, field)

    -

    Returns the data type of requested field. For the python client, if field is not provided, it is copied from name. -Current returned types include NUMERIC, STRING and UNKNOWN. If a field is always null, or has multiple types, it will -be returned as UNKNOWN.

    -

    .count()

    -

    Return the total count of returned edges/vertices.

    -

    .distinct([fields])

    -

    Only return distinct elements. An array of one or more fields may be passed in to define what elements are used to identify uniqueness. If none are -provided, the gid is used.

    - -
    - -
    - + + + + + + + + Aggregation · GRIP + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + +
    +
    + +
    + +
    +

    Aggregation

    +

    .aggregate([aggregations])

    +

    + Groups and summarizes data from the graph. It allows you to + perform calculations on vertex or edge properties. The + following aggregation types are available: +

    +

    Aggregation Types

    +

    + .gripql.term(name, field, size) +

    +

    Return top n terms and their counts for a field.

    + 
    G.V().hasLabel("Person").aggregate(gripql.term("top-names", "name", 10))
+
    +

    + Counts name occurences across + Person vertices and returns the 10 most + frequent name values. +

    +

    + .gripql.histogram(name, field, interval) +

    +

    Return binned counts for a field.

    + 
    G.V().hasLabel("Person").aggregate(gripql.histogram("age-hist", "age", 5))
+
    +

    + Creates a histogram of age values with bins of + width 5 across Person vertices. +

    +

    + .gripql.percentile(name, field, percents=[]) +

    +

    Return percentiles for a field.

    + 
    G.V().hasLabel("Person").aggregate(gripql.percentile("age-percentiles", "age", [25,50,75]))
+
    +

    + Calculates the 25th, 50th, and 75th percentiles for + age values across Person vertices. +

    +

    + .gripql.field(“fields”, “$”) +

    +

    + Returns all of the fields found in the data structure. Use + $ to get a listing of all fields found at the + root level of the data property of vertices or + edges. +

    +
    +

    gripql.type(name, field)

    +

    + Returns the data type of requested field. For the python + client, if field is not provided, it is copied + from name. +

    +

    + Current returned types include NUMERIC, + STRING and UNKNOWN. If a field is + always null, or has multiple types, it will be returned as + UNKNOWN. +

    +
    +

    .count()

    +

    Returns the total number of elements in the traversal.

    +

    Example:

    +
    + 
    G.query().V().hasLabel("Person").count()
+
    +
    +

    + This query returns the total number of vertices with the + label “Person”. +

    +
    +

    .distinct([fields])

    +

    + Filters the traversal to return only unique elements. If + fields are provided, uniqueness is determined + by the combination of values in those fields; otherwise, the + _id is used. +

    +

    Example:

    +
    + 
    G.query().V().hasLabel("Person").distinct(["name", "age"])
+
    +
    +

    + This query returns only unique “Person” + vertices, where uniqueness is determined by the combination + of “name” and “age” values. +

    +
    +

    .sort([fields])

    +

    Sort the output using the field values

    +
    +
    + diff --git a/docs/docs/queries/output/index.html b/docs/docs/queries/output/index.html new file mode 100644 index 000000000..f51192f0a --- /dev/null +++ b/docs/docs/queries/output/index.html @@ -0,0 +1,413 @@ + + + + + + + + + + + Output Control · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +
    +

    Output control

    +

    .limit(count)

    +

    Limit number of total output rows

    +
    G.V().limit(5)
+
    +

    .skip(count)

    +

    Start return after offset

    +

    Example:

    +
    G.V().skip(10).limit(5)
+

    This query skips the first 10 vertices and then returns the next 5.

    +

    .range(start, stop)

    +

    Selects a subset of the results based on their index. start is inclusive, and stop is exclusive. +Example:

    +
    G.V().range(5, 10)
+
    +

    .fields([fields])

    +

    Specifies which fields of a vertex or edge to include or exclude in the output. By default, _id, _label, _from, and _to are included.

    +

    If fields is empty, all properties are excluded. +If fields contains field names, only those properties are included. +If fields contains field names prefixed with -, those properties are excluded, and all others are included.

    +

    Examples:

    +

    Include only the ‘symbol’ property:

    +
    G.V("vertex1").fields(["symbol"])
+

    Exclude the ‘symbol’ property:

    +
    G.V("vertex1").fields(["-symbol"])
+

    Exclude all properties:

    +
    G.V("vertex1").fields([])
+
    +

    .render(template)

    +

    Transforms the current selection into an arbitrary data structure defined by the template. The template is a string that can include placeholders for vertex/edge properties.

    +

    Example:

    +
    G.V("vertex1").render( {"node_info" : {"id": "$._id", "label": "$._label"}, "data" : {"whatToExpect": "$.climate"}} )
+

    Assuming vertex1 has _id, _label, and symbol properties, this would return a JSON object with those fields.

    +
    {"node_info" : {"id" :"Planet:2", "label":"Planet"}, "data":{"whatToExpect":"arid"} }
+
    +
    + +
    + + diff --git a/docs/docs/queries/record_transforms/index.html b/docs/docs/queries/record_transforms/index.html new file mode 100644 index 000000000..b9afccdca --- /dev/null +++ b/docs/docs/queries/record_transforms/index.html @@ -0,0 +1,470 @@ + + + + + + + + + + + Record Transforms · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +

    Record Manipulation

    +

    .unwind(fields)

    +

    Expands an array-valued field into multiple rows, one for each element in the array. +Example:

    +

    Graph

    +
    {"vertex" : {"_id":"1", "_label":"Thing", "stuff" : ["1", "2", "3"]}}
+

    Query

    +
    G.V("1").unwind("stuff")
+

    Result

    +
    {"_id":"1", "_label":"Thing", "stuff" : "1"}
+{"_id":"1", "_label":"Thing", "stuff" : "2"}
+{"_id":"1", "_label":"Thing", "stuff" : "3"}
+

    .group({"dest":"field"})

    +

    Collect all travelers that are on the same element while aggregating specific fields

    +

    For the example:

    +
    G.V().hasLabel("Planet").as_("planet").out("residents").as_("character").select("planet").group( {"people" : "$character.name"} )
+

    All of the travelers that start on the same planet go out to residents, collect them using the as_ and then returning to the origin

    +

    using the select statement. The group statement aggrigates the name fields from the character nodes that were visited and collects them

    +

    into a list named people that is added to the current planet node.

    +

    Output:

    +
    {
+  "vertex": {
+    "_id": "Planet:2",
+    "_label": "Planet",
+    "climate": "temperate",
+    "diameter": 12500,
+    "gravity": null,
+    "name": "Alderaan",
+    "orbital_period": 364,
+    "people": [
+      "Leia Organa",
+      "Raymus Antilles"
+    ],
+    "population": 2000000000,
+    "rotation_period": 24,
+    "surface_water": 40,
+    "system": {
+      "created": "2014-12-10T11:35:48.479000Z",
+      "edited": "2014-12-20T20:58:18.420000Z"
+    },
+    "terrain": [
+      "grasslands",
+      "mountains"
+    ],
+    "url": "https://swapi.co/api/planets/2/"
+  }
+}
+{
+  "vertex": {
+    "_id": "Planet:1",
+    "_label": "Planet",
+    "climate": "arid",
+    "diameter": 10465,
+    "gravity": null,
+    "name": "Tatooine",
+    "orbital_period": 304,
+    "people": [
+      "Luke Skywalker",
+      "C-3PO",
+      "Darth Vader",
+      "Owen Lars",
+      "Beru Whitesun lars",
+      "R5-D4",
+      "Biggs Darklighter"
+    ],
+    "population": 200000,
+    "rotation_period": 23,
+    "surface_water": 1,
+    "system": {
+      "created": "2014-12-09T13:50:49.641000Z",
+      "edited": "2014-12-21T20:48:04.175778Z"
+    },
+    "terrain": [
+      "desert"
+    ],
+    "url": "https://swapi.co/api/planets/1/"
+  }
+}
+

    .pivot(id, key, value)

    +

    Aggregate fields across multiple records into a single record using a pivot operations. A pivot is +an operation where a two column matrix, with one columns for keys and another column for values, is +transformed so that the keys are used to name the columns and the values are put in those columns.

    +

    So the stream of vertices:

    +
    {"_id":"observation_a1", "_label":"Observation", "subject":"Alice", "key":"age", "value":36}
+{"_id":"observation_a2", "_label":"Observation", "subject":"Alice", "key":"sex", "value":"Female"}
+{"_id":"observation_a3", "_label":"Observation", "subject":"Alice", "key":"blood_pressure", "value":"111/78"}
+{"_id":"observation_b1", "_label":"Observation", "subject":"Bob", "key":"age", "value":42}
+{"_id":"observation_b2", "_label":"Observation", "subject":"Bob", "key":"sex", "value":"Male"}
+{"_id":"observation_b3", "_label":"Observation", "subject":"Bob", "key":"blood_pressure", "value":"120/80"}
+

    with .pivot("subject", "key", "value") will produce:

    +
    {"_id":"Alice", "age":36, "sex":"Female", "blood_pressure":"111/78"}
+{"_id":"Bob", "age":42, "sex":"Male", "blood_pressure":"120/80"}
+
    +
    + +
    + + diff --git a/docs/docs/queries/graphql/index.html b/docs/docs/queries/traversal_start/index.html similarity index 58% rename from docs/docs/queries/graphql/index.html rename to docs/docs/queries/traversal_start/index.html index ef14b88d9..053affe34 100644 --- a/docs/docs/queries/graphql/index.html +++ b/docs/docs/queries/traversal_start/index.html @@ -8,7 +8,7 @@ - GraphQL · GRIP + Start a Traversal · GRIP @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    -

    GraphQL

    -

    GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.

    -

    GraphQL access is only supported when using the MongoDB driver

    -

    Load built-in example graph

    -

    Loading the example data and the example schema:

    -
    grip load example-graph
-

    See the example graph

    -
    grip dump example-graph --vertex --edge
-

    See the example graph schema

    -
    grip schema example-graph
-

    Example queries

    -

    Get Types:

    -
    curl -X POST -H "Content-Type:application/graphql" -d '{__schema{types{name}}}' http://localhost:8201/graphql/example-graph
-

    Get Info about Human object

    -
    curl -X POST -H "Content-Type:application/graphql" -d '{__type(name:"Human"){fields{name}}}' http://localhost:8201/graphql/example-graph
-

    Get List of all Human ids

    -
    curl -X POST -H "Content-Type:application/graphql" -d 'query {Human{id}}' http://localhost:8201/graphql/example-graph
-

    Get Human 1000 and list their friends

    -
    curl -X POST -H "Content-Type:application/graphql" -d 'query {Human(id:"1000"){name,friend_to_Human{name}}}' http://localhost:8201/graphql/example-graph
-
    +

    Start a Traversal

    +

    All traversal based queries must start with a V() command, starting the travalers on the vertices of the graph.

    +

    .V([ids])

    +

    Start query from Vertex

    +
    G.V()
+

    Returns all vertices in graph

    +
    G.V(["vertex1"])
+

    Returns:

    +
    {"_id" : "vertex1", "_label":"TestVertex"}
+
    diff --git a/docs/docs/queries/traverse_graph/index.html b/docs/docs/queries/traverse_graph/index.html new file mode 100644 index 000000000..a35420be4 --- /dev/null +++ b/docs/docs/queries/traverse_graph/index.html @@ -0,0 +1,412 @@ + + + + + + + + + + + Traverse the Graph · GRIP + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +

    GRIP

     +
    + +
    +

    OHSU Comp Bio

     +
    +
    +
    + + +
    + +
    + +
    + +
    +

    Traverse the graph

    +

    To move travelers between different elements of the graph, the traversal commands in_ and out move along the edges, respecting the directionality. The out commands follow _from to _to, while the in_ command follows _to to _from.

    +

    .in_(), inV()

    +

    Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.

    +
    G.V().in_(label=['edgeLabel1', 'edgeLabel2'])
+
    +

    .out(), .outV()

    +

    Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges.

    +
    G.V().out(label='edgeLabel')
+
    +

    .both(), .bothV()

    +

    Following all edges (both in and out). Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all edges.

    +
    G.V().outE().both(label='edgeLabel')
+
    +

    .inE()

    +

    Following incoming edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    +
    G.V().inE(label='edgeLabel')
+
    +

    .outE()

    +

    Following outgoing edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    +
    G.V().outE(label='edgeLabel')
+
    +

    .bothE()

    +

    Following all edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use .in_ or .out

    +
    G.V().bothE(label='edgeLabel')
+
    +

    AS and SELECT

    +

    The as_ and select commands allow a traveler to mark a step in the traversal and return to it as a later step.

    +

    .as_(name)

    +

    Store current row for future reference

    +
    G.V().as_("a").out().as_("b")
+

    .select(name)

    +

    Move traveler to previously marked position

    +
    G.V().mark("a").out().mark("b").select("a")
+
    +
    + +
    + + diff --git a/docs/docs/security/basic/index.html b/docs/docs/security/basic/index.html index daccde3c0..bdcaf5ea4 100644 --- a/docs/docs/security/basic/index.html +++ b/docs/docs/security/basic/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -359,34 +374,34 @@

    Basic Auth

    By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file:

    -
    Server:
-  BasicAuth:
-    - User: testuser
-      Password: abc123
-

    Make sure to properly protect the configuration file so that it's not readable +

    Server:
+  BasicAuth:
+    - User: testuser
+      Password: abc123
+

    Make sure to properly protect the configuration file so that it’s not readable by everyone:

    -
    $ chmod 600 grip.config.yml
-

    To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables:

    -
    $ export GRIP_USER=testuser
-$ export GRIP_PASSWORD=abc123
-$ grip list
-

    Using the Python Client

    +
    $ chmod 600 grip.config.yml
+

    To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables:

    +
    $ export GRIP_USER=testuser
+$ export GRIP_PASSWORD=abc123
+$ grip list
+

    Using the Python Client

    Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass authorization headers in its requests:

    -
    import gripql
-
-# Basic Auth Header - {'Authorization': 'Basic dGVzdDpwYXNzd29yZA=='}
-G = gripql.Connection("https://bmeg.io", user="test", password="password").graph("bmeg")
-

    Although GRIP only supports basic password authentication, some servers may be proctected via a nginx or apache +

    import gripql
+
+# Basic Auth Header - {'Authorization': 'Basic dGVzdDpwYXNzd29yZA=='}
+G = gripql.Connection("https://bmeg.io", user="test", password="password").graph("bmeg")
+

    Although GRIP only supports basic password authentication, some servers may be proctected via a nginx or apache server. The python client can be configured to handle these cases as well:

    -
    import gripql 
-
-# Bearer Token - {'Authorization': 'Bearer iamnotarealtoken'}
-G = gripql.Connection("https://bmeg.io", token="iamnotarealtoken").graph("bmeg")
-
-# OAuth2 / Custom - {"OauthEmail": "fake.user@gmail.com", "OauthAccessToken": "iamnotarealtoken", "OauthExpires": 1551985931}
-G = gripql.Connection("https://bmeg.io",  credential_file="~/.grip_token.json").graph("bmeg")
-
    +
    import gripql 
+
+# Bearer Token - {'Authorization': 'Bearer iamnotarealtoken'}
+G = gripql.Connection("https://bmeg.io", token="iamnotarealtoken").graph("bmeg")
+
+# OAuth2 / Custom - {"OauthEmail": "fake.user@gmail.com", "OauthAccessToken": "iamnotarealtoken", "OauthExpires": 1551985931}
+G = gripql.Connection("https://bmeg.io",  credential_file="~/.grip_token.json").graph("bmeg")
+
    diff --git a/docs/docs/security/index.html b/docs/docs/security/index.html index e1f9cc58d..0ef0a322f 100644 --- a/docs/docs/security/index.html +++ b/docs/docs/security/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/tutorials/amazon/index.html b/docs/docs/tutorials/amazon/index.html index 9ba984ea8..ba7a8598c 100644 --- a/docs/docs/tutorials/amazon/index.html +++ b/docs/docs/tutorials/amazon/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -357,36 +372,40 @@

    Explore Amazon Product Co-Purchasing Network Metadata

    Download the data

    -
    curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz
+
    curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz
 
    Convert the data into vertices and edges
    
-
    python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data
-
    Create a graph called ‘amazon’
    
-
    grip create amazon
+
    python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data
+
    Turn on grip and create a graph called ‘amazon’
    
+
    grip server & ; sleep 1 ; grip create amazon
 
    Load the vertices/edges into the graph
    
-
    grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex
+
    grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex
 
    Query the graph
    
 
    command line client
    
-
    grip query amazon 'O.query().V().out()'
-
    python client
    
-
    pip install "git+https://github.com/bmeg/grip.git#egg=gripql&subdirectory=gripql/python/"
-
    import gripql
-
-conn = gripql.Connection("http://localhost:8201")
-
-g = conn.graph("amazon")
-
-# Count the Vertices
-print g.query().V().count().execute()
-# Count the Edges
-print g.query().E().count().execute()
-
-# Try simple travesral
-print g.query().V("B00000I06U").outE().execute()
-
-# Find every Book that is similar to a DVD
-for result in g.query().V().has(gripql.eq("group", "Book")).as_("a").out("similar").has(gripql.eq("group", "DVD")).as_("b").select(["a", "b"]):
-    print result
-
    
+
    grip query amazon 'V().hasLabel("Video").out()'
+
    The full command syntax and command list can be found at grip/gripql/javascript/gripql.js
    
+
    python client
    
+
    Initialize a virtual environment and install gripql python package
    
+
    python -m venv venv ; source venv/bin/activate
+pip install -e gripql/python
+
    Example code
    
+
    import gripql
+
+conn = gripql.Connection("http://localhost:8201")
+
+g = conn.graph("amazon")
+
+# Count the Vertices
+print("Total vertices: ", g.V().count().execute())
+# Count the Edges
+print("Total edges: ", g.V().outE().count().execute())
+
+# Try simple travesral
+print("Edges connected to 'B00000I06U' vertex: %s" %g.V("B00000I06U").outE().execute())
+
+# Find every Book that is similar to a DVD
+for result in g.V().has(gripql.eq("group", "Book")).as_("a").out("similar").has(gripql.eq("group", "DVD")).as_("b").select("a"):
+    print(result)
+
    diff --git a/docs/docs/tutorials/index.html b/docs/docs/tutorials/index.html index ce65d18ec..3a578dbbe 100644 --- a/docs/docs/tutorials/index.html +++ b/docs/docs/tutorials/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • diff --git a/docs/docs/tutorials/pathway-commons/index.html b/docs/docs/tutorials/pathway-commons/index.html index fb4bb15e0..f436b789c 100644 --- a/docs/docs/tutorials/pathway-commons/index.html +++ b/docs/docs/tutorials/pathway-commons/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +

    • Get Pathway Commons release

    -
    curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz
+
    curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz
 
    Convert to Property Graph
    
-
    grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m "http://pathwaycommons.org/pc2/#=pc:" -m "http://www.biopax.org/release/biopax-level3.owl#=biopax:"
+
    grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m "http://pathwaycommons.org/pc2/#=pc:" -m "http://www.biopax.org/release/biopax-level3.owl#=biopax:"
    diff --git a/docs/docs/tutorials/tcga-rna/index.html b/docs/docs/tutorials/tcga-rna/index.html index 836dd5022..a05bc089c 100644 --- a/docs/docs/tutorials/tcga-rna/index.html +++ b/docs/docs/tutorials/tcga-rna/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • @@ -357,37 +372,37 @@

    Explore TCGA RNA Expression Data

    Create the graph

    -
    grip create tcga-rna
+
    grip create tcga-rna
 
    Get the data
    
-
    curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz
+
    curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz
 tar xvzf gbm_tcga_pub2013.tar.gz
 
    Load clinical data
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor'
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor'
 
    Load RNASeq data
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --row-label RNASeq --row-prefix "RNA:" --exclude RNA:Hugo_Symbol
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --row-label RNASeq --row-prefix "RNA:" --exclude RNA:Hugo_Symbol
 
    Connect RNASeq data to Clinical data
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --no-vertex --edge 'RNA:{_gid}' rna
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --no-vertex --edge 'RNA:{_id}' rna
 
    Connect Clinical data to subtypes
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e "{EXPRESSION_SUBTYPE}" subtype --dst-vertex "{EXPRESSION_SUBTYPE}" Subtype
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e "{EXPRESSION_SUBTYPE}" subtype --dst-vertex "{EXPRESSION_SUBTYPE}" Subtype
 
    Load Hugo Symbol to EntrezID translation table from RNA matrix annotations
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt --column-include Entrez_Gene_Id --row-label Gene
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt --column-include Entrez_Gene_Id --row-label Gene
 
    Load Mutation Information
    
-
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_mutations_extended.txt --skiprows 1 --index-col -1  --regex Matched_Norm_Sample_Barcode '\-\d\d$' '' --edge '{Matched_Norm_Sample_Barcode}' variantIn --edge '{Hugo_Symbol}' effectsGene --column-exclude ma_func.impact ma_fi.score MA_FI.score MA_Func.Impact MA:link.MSA MA:FImpact MA:protein.change MA:link.var MA:FIS MA:link.PDB --row-label Variant
+
    ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_mutations_extended.txt --skiprows 1 --index-col -1  --regex Matched_Norm_Sample_Barcode '\-\d\d$' '' --edge '{Matched_Norm_Sample_Barcode}' variantIn --edge '{Hugo_Symbol}' effectsGene --column-exclude ma_func.impact ma_fi.score MA_FI.score MA_Func.Impact MA:link.MSA MA:FImpact MA:protein.change MA:link.var MA:FIS MA:link.PDB --row-label Variant
 
    Load Proneural samples into a matrix
    
-
    import pandas
-import gripql
-
-conn = gripql.Connection("http://localhost:8201")
-g = conn.graph("tcga-rna")
-genes = {}
-for k, v in g.query().V().hasLabel("Gene").render(["_gid", "Hugo_Symbol"]):
-    genes[k] = v
-data = {}
-for row in g.query().V("Proneural").in_().out("rna").render(["_gid", "_data"]):
-    data[row[0]] = row[1]
-samples = pandas.DataFrame(data).rename(genes).transpose().fillna(0.0)
-
    Matrix Load project
    
-
    usage: load_matrix.py [-h] [--sep SEP] [--server SERVER]
+
    import pandas
+import gripql
+
+conn = gripql.Connection("http://localhost:8201")
+g = conn.graph("tcga-rna")
+genes = {}
+for k, v in g.V().hasLabel("Gene").render(["_id", "Hugo_Symbol"]):
+    genes[k] = v
+data = {}
+for row in g.V("Proneural").in_().out("rna").render(["_id", "_data"]):
+    data[row[0]] = row[1]
+samples = pandas.DataFrame(data).rename(genes).transpose().fillna(0.0)
+
    Matrix Load project
    
+
    usage: load_matrix.py [-h] [--sep SEP] [--server SERVER]
                       [--row-label ROW_LABEL] [--row-prefix ROW_PREFIX] [-t]
                       [--index-col INDEX_COL] [--connect]
                       [--col-label COL_LABEL] [--col-prefix COL_PREFIX]
@@ -409,21 +424,21 @@ 
    Explore TCGA RNA Expression Data
    
   --row-label ROW_LABEL
                         Vertex Label used when loading rows
   --row-prefix ROW_PREFIX
-                        Prefix added to row vertex gid
+                        Prefix added to row vertex id
   -t, --transpose       Transpose matrix
   --index-col INDEX_COL
-                        Column number to use as index (and gid for vertex
+                        Column number to use as index (and id for vertex
                         load)
-  --connect             Switch to 'fully connected mode' and load matrix cell
+  --connect             Switch to 'fully connected mode' and load matrix cell
                         values on edges between row and column names
   --col-label COL_LABEL
-                        Column vertex label in 'connect' mode
+                        Column vertex label in 'connect' mode
   --col-prefix COL_PREFIX
-                        Prefix added to col vertex gid in 'connect' mode
+                        Prefix added to col vertex id in 'connect' mode
   --edge-label EDGE_LABEL
-                        Edge label for edges in 'connect' mode
+                        Edge label for edges in 'connect' mode
   --edge-prop EDGE_PROP
-                        Property name for storing value when in 'connect' mode
+                        Property name for storing value when in 'connect' mode
   --columns [COLUMNS [COLUMNS ...]]
                         Rename columns in TSV
   --column-include COLUMN_INCLUDE
@@ -438,7 +453,6 @@ 
    Explore TCGA RNA Expression Data
    
   -x EXCLUDE, --exclude EXCLUDE
                         Exclude row id
   -d                    Run in debug mode. Print actions and make no changes
-
    diff --git a/docs/download/index.html b/docs/download/index.html index c76a6a4c1..1317618ba 100644 --- a/docs/download/index.html +++ b/docs/download/index.html @@ -32,7 +32,7 @@
    -

    GRIP

     +

    GRIP
    +
  • + +
    • +
    • @@ -90,6 +99,15 @@
    • +
  • + +
    • +
    • -

    Download 0.7.0

    +

    Download 0.8.0

    Release History

    See the Releases page for release history.

    Docker

    -
    docker pull bmeg/grip
-docker run bmeg/grip grip server
-
    -
    $ git clone https://github.com/bmeg/grip.git
-$ cd grip
-$ make
-
    +
    docker pull bmeg/grip
+docker run bmeg/grip grip server
+
    +
    $ git clone https://github.com/bmeg/grip.git
+$ cd grip
+$ make
+
    diff --git a/docs/index.html b/docs/index.html index fcf913fcc..5b3859fa3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,8 +1,7 @@ - - + @@ -34,7 +33,7 @@
    -

    GRIP

     +

    GRIP
    -
    -

    GRaph Integration Platform (GRIP)

    - Download - Documentation -
    +
    +
    +

    GRaph Integration Platform (GRIP)

    + Download + Documentation +
    +
    - -
    - -
    - +
    +
    -
    +
    +
    + The GRaph Integration Platform (GRIP) is a graph query engine + designed to span across multiple database backends. It supports + Mongo, SQL and has a plug in architecture to allow new resource to + be added. +
    -
    -
    - The GRaph Integration Platform (GRIP) is a graph query engine designed to - span across multiple database backends. It supports Mongo, SQL, ElasticSearch - and has a plug in architecture to allow new resource to be added. -
    +

    A quick introduction

    -

    A quick introduction

    +
    +
    +

    Start an GRIP server

    +
    -
    -
    -

    Start an GRIP server

    +
    + 
    $ grip server --config grip.yml
    +
    -
    - 
    $ grip server --config grip.yml
    -
    -
    +
    +
    +

    List all graphs

    +
    -
    -
    -

    List all graphs

    +
    + 
    $ grip list
    +
    -
    - 
    $ grip list
    -
    -
    +
    +
    +

    Create a graph

    +
    -
    -
    -

    Create a graph

    +
    + 
    $ grip create example
    +
    -
    - 
    $ grip create example
    -
    -
    +
    +
    +

    Drop a graph

    +
    -
    -
    -

    Drop a graph

    +
    + 
    $ grip drop example
    +
    -
    - 
    $ grip drop example
    -
    -
    +
    +
    +

    Load data into a graph

    +
    -
    -
    -

    Load data into a graph

    +
    + 
    $ grip load example --edge edges.txt --vertex vertices.txt
    +
    -
    - 
    $ grip load example --edge edges.txt --vertex vertices.txt
    -
    -
    +
    +
    +

    Query a graph

    +
    -
    -
    -

    Query a graph

    +
    + 
    $ grip query example 'V().hasLabel("users")'
    +
    -
    - 
    $ grip query example 'V().hasLabel("users")'
    -
    -
    +
    +
    +

    Get vertex/edge counts for a graph

    +
    -
    -
    -

    Get vertex/edge counts for a graph

    +
    + 
    $ grip info example
    +
    -
    - 
    $ grip info example
    -
    -
    +
    +
    +

    Get the schema for a graph

    +
    -
    -
    -

    Get the schema for a graph

    +
    + 
    $ grip schema get example
    +
    -
    - 
    $ grip schema get example
    -
    -
    +
    +
    +

    Dump vertices/edges from a graph

    +
    -
    -
    -

    Dump vertices/edges from a graph

    +
    + 
    $ grip dump example --vertex
    +
    +
    -
    - 
    $ grip dump example --vertex
    +
    +
    +
    +

    Drop in for a chat.

    +

    + Join the + Gitter channel. +

    +
    + +
    +

    Get the code.

    +

    + Head over to + GitHub and dig + in. +

    +
    + +
    +

    Give feedback.

    +

    + Let us know + what you think. +

    +
    -
    - -
    - -
    - -
    - -
    -

    Drop in for a chat.

    -

    Join the Gitter channel.

    -
    - -
    -

    Get the code.

    -

    Head over to GitHub and dig in.

    -
    - -
    -

    Give feedback.

    -

    - Let us know what you think.

    -
    -
    -
    - -
    - +
    diff --git a/docs/index.xml b/docs/index.xml index 2a86c8e3a..253d4ea06 100644 --- a/docs/index.xml +++ b/docs/index.xml @@ -4,389 +4,274 @@ GRIP https://bmeg.github.io/grip/ Recent content on GRIP - Hugo -- gohugo.io + Hugo en-us - - - - + + + + https://bmeg.github.io/grip/docs/queries/jobs/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/jobs/ + <h2 id="submit">.submit()</h2> <p>Post the traversal as an asynchronous job and get a job ID.</p> <p>Example: Submit a query to be processed in the background</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>job_id <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#39;vertexID&#39;</span>)<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#39;Vertex&#39;</span>)<span style="color:#f92672">.</span>submit() </span></span><span style="display:flex;"><span>print(job_id) <span style="color:#75715e"># print job ID</span> </span></span></code></pre></div><hr> <h2 id="searchjobs">.searchJobs()</h2> <p>Find jobs that match this query and get their status and results if available.</p> <p>Example: Search for jobs with the specified query and print their statuses and results</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#66d9ef">for</span> result <span style="color:#f92672">in</span> G<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#39;vertexID&#39;</span>)<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#39;Vertex&#39;</span>)<span style="color:#f92672">.</span>searchJobs(): </span></span><span style="display:flex;"><span> print(result[<span style="color:#e6db74">&#39;status&#39;</span>]) <span style="color:#75715e"># print job status</span> </span></span><span style="display:flex;"><span> <span style="color:#66d9ef">if</span> <span style="color:#e6db74">&#39;results&#39;</span> <span style="color:#f92672">in</span> result: </span></span><span style="display:flex;"><span> print(result[<span style="color:#e6db74">&#39;results&#39;</span>]) <span style="color:#75715e"># print job results</span> </span></span></code></pre></div><hr> + https://bmeg.github.io/grip/docs/tutorials/pathway-commons/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/pathway-commons/ - Get Pathway Commons release -curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz Convert to Property Graph -grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &quot;http://pathwaycommons.org/pc2/#=pc:&quot; -m &quot;http://www.biopax.org/release/biopax-level3.owl#=biopax:&quot; + <p>Get Pathway Commons release</p> <pre tabindex="0"><code>curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz </code></pre><p>Convert to Property Graph</p> <pre tabindex="0"><code>grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &#34;http://pathwaycommons.org/pc2/#=pc:&#34; -m &#34;http://www.biopax.org/release/biopax-level3.owl#=biopax:&#34; </code></pre> + + + Aggregation + https://bmeg.github.io/grip/docs/queries/aggregation/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/aggregation/ + <h1 id="aggregation">Aggregation</h1> <p>These methods provide a powerful way to analyze and summarize data in your GripQL graph database. They allow you to perform various types of aggregations, including term frequency, histograms, percentiles, and more. By combining these with other traversal functions like <code>has</code>, <code>hasLabel</code>, etc., you can create complex queries that extract specific insights from your data.</p> <h2 id="aggregateaggregations"><code>.aggregate([aggregations])</code></h2> <p>Groups and summarizes data from the graph. It allows you to perform calculations on vertex or edge properties. The following aggregation types are available:</p> - Amazon Purchase Network https://bmeg.github.io/grip/docs/tutorials/amazon/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/amazon/ - Explore Amazon Product Co-Purchasing Network Metadata Download the data -curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz Convert the data into vertices and edges -python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data Create a graph called &lsquo;amazon&rsquo; -grip create amazon Load the vertices/edges into the graph -grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex Query the graph -command line client -grip query amazon 'O.query().V().out()' python client -pip install &quot;git+https://github.com/bmeg/grip.git#egg=gripql&amp;subdirectory=gripql/python/&quot; import gripql conn = gripql.Connection(&#34;http://localhost:8201&#34;) g = conn.graph(&#34;amazon&#34;) # Count the Vertices print g. + <h1 id="explore-amazon-product-co-purchasing-network-metadata">Explore Amazon Product Co-Purchasing Network Metadata</h1> <p>Download the data</p> <pre tabindex="0"><code>curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz </code></pre><p>Convert the data into vertices and edges</p> <pre tabindex="0"><code>python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data </code></pre><p>Turn on grip and create a graph called &lsquo;amazon&rsquo;</p> <pre tabindex="0"><code>grip server &amp; ; sleep 1 ; grip create amazon </code></pre><p>Load the vertices/edges into the graph</p> <pre tabindex="0"><code>grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex </code></pre><p>Query the graph</p> <p><em>command line client</em></p> <pre tabindex="0"><code>grip query amazon &#39;V().hasLabel(&#34;Video&#34;).out()&#39; </code></pre><p>The full command syntax and command list can be found at grip/gripql/javascript/gripql.js</p> - Basic Auth https://bmeg.github.io/grip/docs/security/basic/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/security/basic/ - Basic Auth By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file: -Server: BasicAuth: - User: testuser Password: abc123 Make sure to properly protect the configuration file so that it's not readable by everyone: -$ chmod 600 grip.config.yml To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables: + <h1 id="basic-auth">Basic Auth</h1> <p>By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Server</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">BasicAuth</span>: </span></span><span style="display:flex;"><span> - <span style="color:#f92672">User</span>: <span style="color:#ae81ff">testuser</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">Password</span>: <span style="color:#ae81ff">abc123</span> </span></span></code></pre></div><p>Make sure to properly protect the configuration file so that it&rsquo;s not readable by everyone:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>$ chmod <span style="color:#ae81ff">600</span> grip.config.yml </span></span></code></pre></div><p>To use the password, set the <code>GRIP_USER</code> and <code>GRIP_PASSWORD</code> environment variables:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>$ export GRIP_USER<span style="color:#f92672">=</span>testuser </span></span><span style="display:flex;"><span>$ export GRIP_PASSWORD<span style="color:#f92672">=</span>abc123 </span></span><span style="display:flex;"><span>$ grip list </span></span></code></pre></div><h2 id="using-the-python-client">Using the Python Client</h2> <p>Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass authorization headers in its requests:</p> + + + Client Library + https://bmeg.github.io/grip/docs/clients/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/clients/ + <h1 id="getting-started">Getting Started</h1> <p>GRIP has an API for making graph queries using structured data. Queries are defined using a series of step <a href="https://bmeg.github.io/grip/docs/queries/operations">operations</a>.</p> <h2 id="install-the-python-client">Install the Python Client</h2> <p>Available on <a href="https://pypi.org/project/gripql/">PyPI</a>.</p> <pre tabindex="0"><code>pip install gripql </code></pre><p>Or install the latest development version:</p> <pre tabindex="0"><code>pip install &#34;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&#34; </code></pre><h2 id="using-the-python-client">Using the Python Client</h2> <p>Let&rsquo;s go through the features currently supported in the python client.</p> <p>First, import the client and create a connection to an GRIP server:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql </span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>) </span></span></code></pre></div><p>Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass authorization headers in its requests.</p> + + + create + https://bmeg.github.io/grip/docs/commands/create/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/commands/create/ + <h1 id="create"><code>create</code></h1> <h2 id="usage">Usage</h2> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>gripql-cli create &lt;graph&gt; --host &lt;url&gt; </span></span></code></pre></div><ul> <li><code>&lt;graph&gt;</code>: The name of the graph to be created (required).</li> <li><code>--host &lt;url&gt;</code>: The URL of the GripQL server (default is &ldquo;localhost:8202&rdquo;).</li> </ul> <h2 id="example">Example</h2> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>gripql-cli create my_new_graph --host myserver.com:8202 </span></span></code></pre></div> - Database Configuration https://bmeg.github.io/grip/docs/databases/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/databases/ - + <h1 id="embedded-key-value-stores">Embedded Key Value Stores</h1> <p>GRIP supports storing vertices and edges in a variety of key-value stores including:</p> <ul> <li><a href="https://github.com/cockroachdb/pebble">Pebble</a></li> <li><a href="https://github.com/dgraph-io/badger">Badger</a></li> <li><a href="https://github.com/boltdb/bolt">BoltDB</a></li> <li><a href="https://github.com/syndtr/goleveldb">LevelDB</a></li> </ul> <p>Config:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Default</span>: <span style="color:#ae81ff">kv</span> </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#f92672">Driver</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">kv</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">Badger</span>: <span style="color:#ae81ff">grip.db</span> </span></span></code></pre></div><hr> <h1 id="mongodb">MongoDB</h1> <p>GRIP supports storing vertices and edges in <a href="https://www.mongodb.com/">MongoDB</a>.</p> <p>Config:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Default</span>: <span style="color:#ae81ff">mongo</span> </span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span><span style="color:#f92672">Drivers</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">mongo</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">MongoDB</span>: </span></span><span style="display:flex;"><span> <span style="color:#f92672">URL</span>: <span style="color:#e6db74">&#34;mongodb://localhost:27000&#34;</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">DBName</span>: <span style="color:#e6db74">&#34;gripdb&#34;</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">Username</span>: <span style="color:#e6db74">&#34;&#34;</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">Password</span>: <span style="color:#e6db74">&#34;&#34;</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">UseCorePipeline</span>: <span style="color:#66d9ef">False</span> </span></span><span style="display:flex;"><span> <span style="color:#f92672">BatchSize</span>: <span style="color:#ae81ff">0</span> </span></span></code></pre></div><p><code>UseCorePipeline</code> - Default is to use Mongo pipeline API to do graph traversals. By enabling <code>UseCorePipeline</code>, GRIP will do the traversal logic itself, only using Mongo for graph storage.</p> + + + delete + https://bmeg.github.io/grip/docs/commands/delete/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/commands/delete/ + <h1 id="delete-command"><code>delete</code> Command</h1> <h2 id="usage">Usage</h2> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>gripql-cli delete &lt;graph&gt; --host &lt;url&gt; --file &lt;path&gt; --edges &lt;edge_ids&gt; --vertices &lt;vertex_ids&gt; </span></span></code></pre></div><h3 id="options">Options</h3> <ul> <li><code>&lt;graph&gt;</code>: Name of the graph (required)</li> <li><code>--host &lt;url&gt;</code>: GripQL server URL (default: &ldquo;localhost:8202&rdquo;)</li> <li><code>--file &lt;path&gt;</code>: Path to a JSON file containing data to delete</li> <li><code>--edges &lt;edge_ids&gt;</code>: Comma-separated list of edge IDs to delete (ignored if JSON file is provided)</li> <li><code>--vertices &lt;vertex_ids&gt;</code>: Comma-separated list of vertex IDs to delete (ignored if JSON file is provided)</li> </ul> <h2 id="example">Example</h2> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>gripql-cli delete my_graph --host myserver.com:8202 --edges edge1,edge2 --vertices vertex3,vertex4 </span></span></code></pre></div><h2 id="json-file-format">JSON File Format</h2> <p>JSON file format for data to be deleted:</p> - Developers https://bmeg.github.io/grip/docs/developers/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/developers/ - Download https://bmeg.github.io/grip/download/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/download/ - Download 0.7.0 Linux MacOS Windows is not supported sorry! Release History See the Releases page for release history. -Docker docker pull bmeg/grip docker run bmeg/grip grip server $ git clone https://github.com/bmeg/grip.git $ cd grip $ make + <h3>Download 0.8.0</h3> <ul> <li><a href="https://github.com/bmeg/grip/releases/download/0.8.0/grip-linux-amd64-0.8.0.tar.gz">Linux</a></li> <li><a href="https://github.com/bmeg/grip/releases/download/0.8.0/grip-darwin-amd64-0.8.0.tar.gz">MacOS (Intel)</a></li> <li><a href="https://github.com/bmeg/grip/releases/download/0.8.0/grip-darwin-arm64-0.8.0.tar.gz">MacOS (Apple Silicon)</a></li> </ul> <h3 id="release-history">Release History</h3> <p>See the <a href="https://github.com/bmeg/grip/releases">Releases</a> page for release history.</p> <h2 id="docker">Docker</h2> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-shell" data-lang="shell"><span style="display:flex;"><span>docker pull bmeg/grip </span></span><span style="display:flex;"><span>docker run bmeg/grip grip server </span></span></code></pre></div><!-- raw HTML omitted --> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-shell" data-lang="shell"><span style="display:flex;"><span>$ git clone https://github.com/bmeg/grip.git </span></span><span style="display:flex;"><span>$ cd grip </span></span><span style="display:flex;"><span>$ make </span></span></code></pre></div> - drop https://bmeg.github.io/grip/docs/commands/drop/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/drop/ - grip drop &lt;graph&gt; Deletes a graph. + <pre tabindex="0"><code>grip drop &lt;graph&gt; </code></pre><p>Deletes a graph.</p> - - - Elasticsearch - https://bmeg.github.io/grip/docs/databases/elastic/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/elastic/ - Elasticsearch GRIP supports storing vertices and edges in Elasticsearch. -Config: -Default: elastic Drivers: elastic: Elasticsearch: URL: &#34;http://localhost:9200&#34; DBName: &#34;gripdb&#34; Username: &#34;&#34; Password: &#34;&#34; - - - - Embedded KV Store - https://bmeg.github.io/grip/docs/databases/kvstore/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/kvstore/ - Embedded Key Value Stores GRIP supports storing vertices and edges in a variety of key-value stores including: - Badger BoltDB LevelDB Config: -Default: kv Driver: kv: Badger: grip.db - - er https://bmeg.github.io/grip/docs/commands/er/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/er/ - grip er The External Resource system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The grip er sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph. -List collections provided by external resource -grip er list Get info about a collection + <pre tabindex="0"><code>grip er </code></pre><p>The <em>External Resource</em> system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The <code>grip er</code> sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph.</p> <p>List collections provided by external resource</p> <pre tabindex="0"><code>grip er list </code></pre><p>Get info about a collection</p> <pre tabindex="0"><code>grip er info </code></pre><p>List ids from a collection</p> - External Resource Proxies https://bmeg.github.io/grip/docs/gripper/proxy/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/proxy/ - GRIPPER GRIPPER proxy With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource. -The required functions include: -rpc GetCollections(Empty) returns (stream Collection); GetCollections returns a list of all of the Collections accessible via this server. -rpc GetCollectionInfo(Collection) returns (CollectionInfo); GetCollectionInfo provides information, such as the list of indexed fields, in a collection. + <h1 id="gripper">GRIPPER</h1> <h2 id="gripper-proxy">GRIPPER proxy</h2> <p>With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource.</p> <p>The required functions include:</p> <pre tabindex="0"><code>rpc GetCollections(Empty) returns (stream Collection); </code></pre><p><code>GetCollections</code> returns a list of all of the Collections accessible via this server.</p> <pre tabindex="0"><code>rpc GetCollectionInfo(Collection) returns (CollectionInfo); </code></pre><p><code>GetCollectionInfo</code> provides information, such as the list of indexed fields, in a collection.</p> - - Getting Started - https://bmeg.github.io/grip/docs/queries/getting_started/ + Filtering + https://bmeg.github.io/grip/docs/queries/filtering/ Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/queries/getting_started/ - Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations. -Install the Python Client Available on PyPI. -pip install gripql Or install the latest development version: -pip install &quot;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&quot; Using the Python Client Let's go through the features currently supported in the python client. -First, import the client and create a connection to an GRIP server: -import gripql G = gripql. + https://bmeg.github.io/grip/docs/queries/filtering/ + <h1 id="filtering-in-gripql">Filtering in GripQL</h1> <p>GripQL provides powerful filtering capabilities using the .has() method and various condition functions. Here&rsquo;s a comprehensive guide:.has()The .has() method is used to filter elements (vertices or edges) based on specified conditions.</p> <p>Conditions are functions provided by the gripql module that define the filtering criteria.</p> <h2 id="comparison-operators">Comparison Operators</h2> <h3 id="gripqleqvariable-value"><code>gripql.eq(variable, value)</code></h3> <p>Equal to (==)</p> <pre tabindex="0"><code>G.V().has(gripql.eq(&#34;symbol&#34;, &#34;TP53&#34;)) # Returns vertices where the &#39;symbol&#39; property is equal to &#39;TP53&#39;. </code></pre><h3 id="gripqlneqvariable-value"><code>gripql.neq(variable, value)</code></h3> <p>Not equal to (!=)</p> - Graph Model https://bmeg.github.io/grip/docs/gripper/graphmodel/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/graphmodel/ - GRIPPER GRIP Plugable External Resources -Graph Model The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex type will be mapped, and the edges describe how edges will be created. The gid of each vertex represents the prefix domain of all vertices that can be found in that source. -The sources referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource. + <h1 id="gripper">GRIPPER</h1> <p>GRIP Plugable External Resources</p> <h2 id="graph-model">Graph Model</h2> <p>The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The <code>vertices</code> represent how each vertex type will be mapped, and the <code>edges</code> describe how edges will be created. The <code>_id</code> of each vertex represents the prefix domain of all vertices that can be found in that source.</p> <p>The <code>sources</code> referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource. The <code>vertices</code> section describes how different collections found in these sources will be turned into Vertex found in the graph. Finally, the <code>edges</code> section describes the different kinds of rules that can be used build the edges in the graph.</p> - Graph Schemas https://bmeg.github.io/grip/docs/graphql/graph_schemas/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/graph_schemas/ - Graph Schemas Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it's API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. + <h1 id="graph-schemas">Graph Schemas</h1> <p>Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it&rsquo;s API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph. The schemas are automatically added to the database following the naming pattern. <code>{graph-name}__schema__</code></p> - GraphQL https://bmeg.github.io/grip/docs/graphql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/ - GraphQL https://bmeg.github.io/grip/docs/graphql/graphql/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/graphql/graphql/ - GraphQL GraphQL support is considered Alpha. The code is not stable and the API will likely change. GraphQL access is only supported when using the MongoDB driver -GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph. -Load built-in example graph Loading the example data and the example schema: -grip load example-graph See the example graph -grip dump example-graph --vertex --edge Sample components of the graph to produce a schema and store to a file + <h1 id="graphql">GraphQL</h1> <p>Grip graphql tools are defined as go standard library plugins and are located at <a href="https://github.com/bmeg/grip-graphql">https://github.com/bmeg/grip-graphql</a>. A schema based approach was used for defining read plugins.</p> <h2 id="json-schema">Json Schema</h2> <p>grip also supports using jsonschema with hypermedia extensions. Given an existing graph called TEST</p> <pre tabindex="0"><code>./grip schema post TEST --jsonSchema schema.json </code></pre><p>This schema will attach to the TEST graph, and subsequent calls to the bulkAddRaw method with raw Json as defined by the attached the jsonschema will load directly into grip.</p> - GRIP Commands https://bmeg.github.io/grip/docs/commands/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/ - GRIP Plugable External Resources https://bmeg.github.io/grip/docs/gripper/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/ - - - GRIPPER - https://bmeg.github.io/grip/docs/databases/gripper/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/gripper/ - GRIPPER GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs. -Example: -Drivers: swapi-driver: Gripper: ConfigFile: ./swapi.yaml Graph: swapi ConfigFile - Path to GRIPPER graph map -Graph - Name of the graph for the mapped external resources. - - Intro https://bmeg.github.io/grip/docs/gripper/gripper/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/gripper/gripper/ - GRIPPER GRIP Plugin External Resources GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external resources and allow GRIP to access them are part of a unified graph. To integrate new resources into the graph, you first deploy griper proxies that plug into the external resources. They are unique and configured to access specific resources. These provide a view into external resources as a series of document collections. For example, an SQL gripper would plug into an SQL server and provide the tables as a set of collections with each every row a document. + <h1 id="gripper">GRIPPER</h1> <h2 id="grip-plugin-external-resources">GRIP Plugin External Resources</h2> <p>GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external resources and allow GRIP to access them are part of a unified graph. To integrate new resources into the graph, you first deploy griper proxies that plug into the external resources. They are unique and configured to access specific resources. These provide a view into external resources as a series of document collections. For example, an SQL gripper would plug into an SQL server and provide the tables as a set of collections with each every row a document. A gripper is written as a gRPC server.</p> + + + Iteration + https://bmeg.github.io/grip/docs/queries/iterations/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/iterations/ + <h1 id="iteration-commands">Iteration Commands</h1> <p>A common operation in graph search is the ability to iteratively repeat a search pattern. For example, a &lsquo;friend of a friend&rsquo; search may become a &lsquo;friend of a friend of a friend&rsquo; search. In the GripQL language cycles, iterations and conditional operations are encoded using &lsquo;mark&rsquo; and &lsquo;jump&rsquo; based interface. This operation is similar to using a &lsquo;goto&rsquo; statement in traditional programming languages. While more primitive than the repeat mechanisms seen in Gremlin, this pattern allows for much simpler query compilation and implementation.</p> - Jobs API - https://bmeg.github.io/grip/docs/queries/jobs_api/ + https://bmeg.github.io/grip/docs/jobs_api/ Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/queries/jobs_api/ - Jobs API Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time. -Submitting a job job = G.query().V().hasLabel(&quot;Planet&quot;).out().submit() Getting job status jinfo = G.getJob(job[&quot;id&quot;]) Example job info: -{ &#34;id&#34;: &#34;job-326392951&#34;, &#34;graph&#34;: &#34;test_graph_qd7rs7&#34;, &#34;state&#34;: &#34;COMPLETE&#34;, &#34;count&#34;: &#34;12&#34;, &#34;query&#34;: [{&#34;v&#34;: []}, {&#34;hasLabel&#34;: [&#34;Planet&#34;]}, {&#34;as&#34;: &#34;a&#34;}, {&#34;out&#34;: []}], &#34;timestamp&#34;: &#34;2021-03-30T23:12:01-07:00&#34; } Reading job results for row in G. + https://bmeg.github.io/grip/docs/jobs_api/ + <h1 id="jobs-api">Jobs API</h1> <p>Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time.</p> <h3 id="submitting-a-job">Submitting a job</h3> <pre tabindex="0"><code>job = G.V().hasLabel(&#34;Planet&#34;).out().submit() </code></pre><h3 id="getting-job-status">Getting job status</h3> <pre tabindex="0"><code>jinfo = G.getJob(job[&#34;id&#34;]) </code></pre><p>Example job info:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{ </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;id&#34;</span>: <span style="color:#e6db74">&#34;job-326392951&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;graph&#34;</span>: <span style="color:#e6db74">&#34;test_graph_qd7rs7&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;state&#34;</span>: <span style="color:#e6db74">&#34;COMPLETE&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;count&#34;</span>: <span style="color:#e6db74">&#34;12&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;query&#34;</span>: [{<span style="color:#f92672">&#34;v&#34;</span>: []}, {<span style="color:#f92672">&#34;hasLabel&#34;</span>: [<span style="color:#e6db74">&#34;Planet&#34;</span>]}, {<span style="color:#f92672">&#34;as&#34;</span>: <span style="color:#e6db74">&#34;a&#34;</span>}, {<span style="color:#f92672">&#34;out&#34;</span>: []}], </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;timestamp&#34;</span>: <span style="color:#e6db74">&#34;2021-03-30T23:12:01-07:00&#34;</span> </span></span><span style="display:flex;"><span>} </span></span></code></pre></div><h3 id="reading-job-results">Reading job results</h3> <pre tabindex="0"><code>for row in G.readJob(job[&#34;id&#34;]): print(row) </code></pre><h3 id="search-for-jobs">Search for jobs</h3> <p>Find jobs that match the prefix of the current request (example should find job from G.V().hasLabel(&ldquo;Planet&rdquo;).out())</p> - list https://bmeg.github.io/grip/docs/commands/list/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/list/ - grip list graphs grip list graphs - - - - MongoDB - https://bmeg.github.io/grip/docs/databases/mongo/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/mongo/ - MongoDB GRIP supports storing vertices and edges in MongoDB. -Config: -Default: mongo Drivers: mongo: MongoDB: URL: &#34;mongodb://localhost:27000&#34; DBName: &#34;gripdb&#34; Username: &#34;&#34; Password: &#34;&#34; UseCorePipeline: False BatchSize: 0 UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage. -BatchSize - For core engine operations, GRIP dispatches element lookups in batches to minimize query overhead. + <p>The <code>list tables</code> command is used to display all available tables in the grip server. Each table is represented by its source, name, fields, and link map. Here&rsquo;s a breakdown of how to use this command:</p> <ul> <li><strong>Usage:</strong> <code>gripql list tables</code></li> <li><strong>Short Description:</strong> List all available tables in the grip server.</li> <li><strong>Long Description:</strong> This command connects to the grip server and retrieves information about all available tables. It then prints each table&rsquo;s source, name, fields, and link map to the console.</li> <li><strong>Arguments:</strong> None</li> <li><strong>Flags:</strong> <ul> <li><code>--host</code>: The URL of the grip server (default: &ldquo;localhost:8202&rdquo;)</li> </ul> </li> </ul> <h2 id="gripql-list-graphs-command-documentation"><code>gripql list graphs</code> Command Documentation</h2> <p>The <code>list graphs</code> command is used to display all available graphs in the grip server. Here&rsquo;s a breakdown of how to use this command:</p> - mongoload https://bmeg.github.io/grip/docs/commands/mongoload/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/mongoload/ - grip mongoload + <pre tabindex="0"><code>grip mongoload </code></pre> - - Operations - https://bmeg.github.io/grip/docs/queries/operations/ + Output Control + https://bmeg.github.io/grip/docs/queries/output/ Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/queries/operations/ - Start a Traversal .V([ids]) Start query from Vertex -G.query().V() Returns all vertices in graph -G.query().V([&#34;vertex1]&#34;) Returns: -{&#34;gid&#34; : &#34;vertex1&#34;, &#34;label&#34;:&#34;TestVertex&#34;, &#34;data&#34;:{}} .E([ids]) Start query from Edge -G.query().E() Returns all edges in graph -G.query().E([&#34;edge1&#34;]) Returns: -{&#34;gid&#34; : &#34;edge1&#34;, &#34;label&#34;:&#34;TestEdge&#34;, From: &#34;vertex1&#34;, To: &#34;vertex2&#34;, data&#34;:{}} Traverse the graph .in_(), inV() Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges. + https://bmeg.github.io/grip/docs/queries/output/ + <hr> <h1 id="output-control">Output control</h1> <h2 id="limitcount"><code>.limit(count)</code></h2> <p>Limit number of total output rows</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>) </span></span></code></pre></div><hr> <h2 id="skipcount"><code>.skip(count)</code></h2> <p>Start return after offset</p> <p>Example:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>skip(<span style="color:#ae81ff">10</span>)<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>) </span></span></code></pre></div><h2 id="this-query-skips-the-first-10-vertices-and-then-returns-the-next-5">This query skips the first 10 vertices and then returns the next 5.</h2> <h2 id="rangestart-stop"><code>.range(start, stop)</code></h2> <p>Selects a subset of the results based on their index. <code>start</code> is inclusive, and <code>stop</code> is exclusive. Example:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>range(<span style="color:#ae81ff">5</span>, <span style="color:#ae81ff">10</span>) </span></span></code></pre></div><hr> <h2 id="fieldsfields"><code>.fields([fields])</code></h2> <p>Specifies which fields of a vertex or edge to include or exclude in the output. By default, <code>_id</code>, <code>_label</code>, <code>_from</code>, and <code>_to</code> are included.</p> - Overview https://bmeg.github.io/grip/docs/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/ - Overview GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB. -Properties of an GRIP graph: - Both vertices and edges in a graph can have any number of properties associated with them. There are many types of vertices and edges in a graph. Two vertices may have many types of edges connecting them, thus reflecting a myriad of relationship types. + <h1 id="overview">Overview</h1> <p>GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.</p> <p>Properties of an GRIP graph:</p> <ul> <li>Both vertices and edges in a graph can have any number of properties associated with them.</li> <li>There are many types of vertices and edges in a graph. Two vertices may have many types of edges connecting them, thus reflecting a myriad of relationship types.</li> <li>Edges in the graph are directed, meaning they have a source and destination.</li> </ul> <p>GRIP also provides a query API for the traversing, analyzing and manipulating your graphs. Its syntax is inspired by <a href="http://tinkerpop.apache.org/">Apache TinkerPop</a>. Learn more <a href="https://bmeg.github.io/grip/docs/queries/getting_started">here</a> about GRIP and its application for querying the Bio Medical Evidence Graph (<a href="https://bmeg.io">BMEG</a>).</p> - - - PostgreSQL - https://bmeg.github.io/grip/docs/databases/psql/ - Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/psql/ - PostgreSQL GRIP supports storing vertices and edges in PostgreSQL. -Config: -Default: psql Drivers: psql: PSQL: Host: localhost Port: 15432 User: &#34;&#34; Password: &#34;&#34; DBName: &#34;grip&#34; SSLMode: disable - - query https://bmeg.github.io/grip/docs/commands/query/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/query/ - grip query &lt;graph&gt; &lt;query&gt; Run a query on a graph. + <pre tabindex="0"><code>grip query &lt;graph&gt; &lt;query&gt; </code></pre><p>Run a query on a graph.</p> <p>Examples</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>grip query pc12 <span style="color:#e6db74">&#39;V().hasLabel(&#34;Pathway&#34;).count()&#39;</span> </span></span></code></pre></div> - Query a Graph https://bmeg.github.io/grip/docs/queries/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/ - + + Record Transforms + https://bmeg.github.io/grip/docs/queries/record_transforms/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/record_transforms/ + <h1 id="record-manipulation">Record Manipulation</h1> <h2 id="unwindfields"><code>.unwind(fields)</code></h2> <p>Expands an array-valued field into multiple rows, one for each element in the array. Example:</p> <p>Graph</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>{<span style="color:#e6db74">&#34;vertex&#34;</span> : {<span style="color:#e6db74">&#34;_id&#34;</span>:<span style="color:#e6db74">&#34;1&#34;</span>, <span style="color:#e6db74">&#34;_label&#34;</span>:<span style="color:#e6db74">&#34;Thing&#34;</span>, <span style="color:#e6db74">&#34;stuff&#34;</span> : [<span style="color:#e6db74">&#34;1&#34;</span>, <span style="color:#e6db74">&#34;2&#34;</span>, <span style="color:#e6db74">&#34;3&#34;</span>]}} </span></span></code></pre></div><p>Query</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;1&#34;</span>)<span style="color:#f92672">.</span>unwind(<span style="color:#e6db74">&#34;stuff&#34;</span>) </span></span></code></pre></div><p>Result</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{<span style="color:#f92672">&#34;_id&#34;</span>:<span style="color:#e6db74">&#34;1&#34;</span>, <span style="color:#f92672">&#34;_label&#34;</span>:<span style="color:#e6db74">&#34;Thing&#34;</span>, <span style="color:#f92672">&#34;stuff&#34;</span> : <span style="color:#e6db74">&#34;1&#34;</span>} </span></span><span style="display:flex;"><span>{<span style="color:#f92672">&#34;_id&#34;</span>:<span style="color:#e6db74">&#34;1&#34;</span>, <span style="color:#f92672">&#34;_label&#34;</span>:<span style="color:#e6db74">&#34;Thing&#34;</span>, <span style="color:#f92672">&#34;stuff&#34;</span> : <span style="color:#e6db74">&#34;2&#34;</span>} </span></span><span style="display:flex;"><span>{<span style="color:#f92672">&#34;_id&#34;</span>:<span style="color:#e6db74">&#34;1&#34;</span>, <span style="color:#f92672">&#34;_label&#34;</span>:<span style="color:#e6db74">&#34;Thing&#34;</span>, <span style="color:#f92672">&#34;stuff&#34;</span> : <span style="color:#e6db74">&#34;3&#34;</span>} </span></span></code></pre></div><h2 id="groupdestfield"><code>.group({&quot;dest&quot;:&quot;field&quot;})</code></h2> <p>Collect all travelers that are on the same element while aggregating specific fields</p> <p>For the example:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#34;Planet&#34;</span>)<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;planet&#34;</span>)<span style="color:#f92672">.</span>out(<span style="color:#e6db74">&#34;residents&#34;</span>)<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;character&#34;</span>)<span style="color:#f92672">.</span>select(<span style="color:#e6db74">&#34;planet&#34;</span>)<span style="color:#f92672">.</span>group( {<span style="color:#e6db74">&#34;people&#34;</span> : <span style="color:#e6db74">&#34;$character.name&#34;</span>} ) </span></span></code></pre></div><p>All of the travelers that start on the same planet go out to residents, collect them using the <code>as_</code> and then returning to the origin</p> + Referencing Fields https://bmeg.github.io/grip/docs/queries/jsonpath/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/queries/jsonpath/ - Referencing Vertex/Edge Properties Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals. -The following query: -O.query().V([&quot;ENSG00000012048&quot;]).as_(&quot;gene&quot;).out(&quot;variant&quot;) Starts at vertex ENSG00000012048 and marks as gene: -{ &quot;gid&quot;: &quot;ENSG00000012048&quot;, &quot;label&quot;: &quot;gene&quot;, &quot;data&quot;: { &quot;symbol&quot;: { &quot;ensembl&quot;: &quot;ENSG00000012048&quot;, &quot;hgnc&quot;: 1100, &quot;entrez&quot;: 672, &quot;hugo&quot;: &quot;BRCA1&quot; } &quot;transcipts&quot;: [&quot;ENST00000471181.7&quot;, &quot;ENST00000357654.8&quot;, &quot;ENST00000493795.5&quot;] } } as &ldquo;gene&rdquo; and traverses the graph to: + <h1 id="referencing-vertexedge-properties">Referencing Vertex/Edge Properties</h1> <p>Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in <a href="http://goessner.net/articles/">http://goessner.net/articles/</a> to reference fields during traversals.</p> <p>The following query:</p> <pre tabindex="0"><code>O.V([&#34;ENSG00000012048&#34;]).as_(&#34;gene&#34;).out(&#34;variant&#34;) </code></pre><p>Starts at vertex <code>ENSG00000012048</code> and marks as <code>gene</code>:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{ </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;_id&#34;</span>: <span style="color:#e6db74">&#34;ENSG00000012048&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;_label&#34;</span>: <span style="color:#e6db74">&#34;gene&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;symbol&#34;</span>: { </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;ensembl&#34;</span>: <span style="color:#e6db74">&#34;ENSG00000012048&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;hgnc&#34;</span>: <span style="color:#ae81ff">1100</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;entrez&#34;</span>: <span style="color:#ae81ff">672</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;hugo&#34;</span>: <span style="color:#e6db74">&#34;BRCA1&#34;</span> </span></span><span style="display:flex;"><span> }, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;transcipts&#34;</span>: [<span style="color:#e6db74">&#34;ENST00000471181.7&#34;</span>, <span style="color:#e6db74">&#34;ENST00000357654.8&#34;</span>, <span style="color:#e6db74">&#34;ENST00000493795.5&#34;</span>] </span></span><span style="display:flex;"><span>} </span></span></code></pre></div><p>as &ldquo;gene&rdquo; and traverses the graph to:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{ </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;_id&#34;</span>: <span style="color:#e6db74">&#34;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;_label&#34;</span>: <span style="color:#e6db74">&#34;variant&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;type&#34;</span>: <span style="color:#e6db74">&#34;deletion&#34;</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;publications&#34;</span>: [ </span></span><span style="display:flex;"><span> { </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;pmid&#34;</span>: <span style="color:#ae81ff">29480828</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;doi&#34;</span>: <span style="color:#e6db74">&#34;10.1097/MD.0000000000009380&#34;</span> </span></span><span style="display:flex;"><span> }, </span></span><span style="display:flex;"><span> { </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;pmid&#34;</span>: <span style="color:#ae81ff">23666017</span>, </span></span><span style="display:flex;"><span> <span style="color:#f92672">&#34;doi&#34;</span>: <span style="color:#e6db74">&#34;10.1097/IGC.0b013e31829527bd&#34;</span> </span></span><span style="display:flex;"><span> } </span></span><span style="display:flex;"><span> ] </span></span><span style="display:flex;"><span>} </span></span></code></pre></div><p>Below is a table of field and the values they would reference in subsequent traversal operations.</p> - Security https://bmeg.github.io/grip/docs/security/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/security/ - server https://bmeg.github.io/grip/docs/commands/server/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/commands/server/ - grip server The server command starts up a graph server and waits for incoming requests. -Default Configuration If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver. -Networking By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201. + <h1 id="server"><code>server</code></h1> <p>The server command starts up a graph server and waits for incoming requests.</p> <h2 id="default-configuration">Default Configuration</h2> <p>If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver.</p> <h2 id="networking">Networking</h2> <p>By default the GRIP server operates on 2 ports, <code>8201</code> is the HTTP based interface. Port <code>8202</code> is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on <code>8201</code>. The <code>grip</code> command will often use port <code>8202</code> in order to complete operations. For example if you call <code>grip list graphs</code> it will contact port <code>8202</code>, rather then using the HTTP port. This means that if you are working with a server that is behind a firewall, and only the HTTP port is available, then the grip command line program will not be able to issue commands, even if the server is visible to client libraries.</p> - - SQL - https://bmeg.github.io/grip/docs/databases/sql/ + Start a Traversal + https://bmeg.github.io/grip/docs/queries/traversal_start/ Mon, 01 Jan 0001 00:00:00 +0000 - - https://bmeg.github.io/grip/docs/databases/sql/ - Connect to an existing SQL database Note: This driver is being superseded by the GRIPPER engine -GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB. -Since GRIP uses Go's database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database. + https://bmeg.github.io/grip/docs/queries/traversal_start/ + <h1 id="start-a-traversal">Start a Traversal</h1> <p>All traversal based queries must start with a <code>V()</code> command, starting the travalers on the vertices of the graph.</p> <h2 id="vids"><code>.V([ids])</code></h2> <p>Start query from Vertex</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V() </span></span></code></pre></div><p>Returns all vertices in graph</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V([<span style="color:#e6db74">&#34;vertex1&#34;</span>]) </span></span></code></pre></div><p>Returns:</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{<span style="color:#f92672">&#34;_id&#34;</span> : <span style="color:#e6db74">&#34;vertex1&#34;</span>, <span style="color:#f92672">&#34;_label&#34;</span>:<span style="color:#e6db74">&#34;TestVertex&#34;</span>} </span></span></code></pre></div> - TCGA RNA Expression https://bmeg.github.io/grip/docs/tutorials/tcga-rna/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/tcga-rna/ - Explore TCGA RNA Expression Data Create the graph -grip create tcga-rna Get the data -curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz Load clinical data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor' Load RNASeq data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &quot;RNA:&quot; --exclude RNA:Hugo_Symbol Connect RNASeq data to Clinical data -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge 'RNA:{_gid}' rna Connect Clinical data to subtypes -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &quot;{EXPRESSION_SUBTYPE}&quot; subtype --dst-vertex &quot;{EXPRESSION_SUBTYPE}&quot; Subtype Load Hugo Symbol to EntrezID translation table from RNA matrix annotations + <h3 id="explore-tcga-rna-expression-data">Explore TCGA RNA Expression Data</h3> <p>Create the graph</p> <pre tabindex="0"><code>grip create tcga-rna </code></pre><p>Get the data</p> <pre tabindex="0"><code>curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz </code></pre><p>Load clinical data</p> <pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &#39;Donor&#39; </code></pre><p>Load RNASeq data</p> <pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &#34;RNA:&#34; --exclude RNA:Hugo_Symbol </code></pre><p>Connect RNASeq data to Clinical data</p> <pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge &#39;RNA:{_id}&#39; rna </code></pre><p>Connect Clinical data to subtypes</p> <pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &#34;{EXPRESSION_SUBTYPE}&#34; subtype --dst-vertex &#34;{EXPRESSION_SUBTYPE}&#34; Subtype </code></pre><p>Load Hugo Symbol to EntrezID translation table from RNA matrix annotations</p> + + + Traverse the Graph + https://bmeg.github.io/grip/docs/queries/traverse_graph/ + Mon, 01 Jan 0001 00:00:00 +0000 + https://bmeg.github.io/grip/docs/queries/traverse_graph/ + <h1 id="traverse-the-graph">Traverse the graph</h1> <p>To move travelers between different elements of the graph, the traversal commands <code>in_</code> and <code>out</code> move along the edges, respecting the directionality. The <code>out</code> commands follow <code>_from</code> to <code>_to</code>, while the <code>in_</code> command follows <code>_to</code> to <code>_from</code>.</p> <h2 id="in_-inv"><code>.in_(), inV()</code></h2> <p>Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.</p> <div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>in_(label<span style="color:#f92672">=</span>[<span style="color:#e6db74">&#39;edgeLabel1&#39;</span>, <span style="color:#e6db74">&#39;edgeLabel2&#39;</span>]) </span></span></code></pre></div><hr> <h2 id="out-outv"><code>.out(), .outV()</code></h2> <p>Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges.</p> - Tutorials https://bmeg.github.io/grip/docs/tutorials/ Mon, 01 Jan 0001 00:00:00 +0000 - https://bmeg.github.io/grip/docs/tutorials/ - - \ No newline at end of file + diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 156102e05..a0d08e6dc 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -1,162 +1,87 @@ - + https://bmeg.github.io/grip/docs/queries/jobs/ + https://bmeg.github.io/grip/docs/tutorials/pathway-commons/ - 0 - - - + + https://bmeg.github.io/grip/docs/queries/aggregation/ + https://bmeg.github.io/grip/docs/tutorials/amazon/ - - - + https://bmeg.github.io/grip/docs/security/basic/ - - - + https://bmeg.github.io/grip/categories/ - - - + + https://bmeg.github.io/grip/docs/clients/ + + https://bmeg.github.io/grip/docs/commands/create/ + https://bmeg.github.io/grip/docs/databases/ - - - + + https://bmeg.github.io/grip/docs/commands/delete/ + https://bmeg.github.io/grip/docs/developers/ - - - - https://bmeg.github.io/grip/docs/ - - - + https://bmeg.github.io/grip/download/ - - - + https://bmeg.github.io/grip/docs/commands/drop/ - - - - https://bmeg.github.io/grip/docs/databases/elastic/ - - - - https://bmeg.github.io/grip/docs/databases/kvstore/ - - - + https://bmeg.github.io/grip/docs/commands/er/ - - - + https://bmeg.github.io/grip/docs/gripper/proxy/ - - - - https://bmeg.github.io/grip/docs/queries/getting_started/ - - - + + https://bmeg.github.io/grip/docs/queries/filtering/ + https://bmeg.github.io/grip/docs/gripper/graphmodel/ - - - + https://bmeg.github.io/grip/docs/graphql/graph_schemas/ - - - + https://bmeg.github.io/grip/docs/graphql/ - - - + https://bmeg.github.io/grip/docs/graphql/graphql/ - - - + https://bmeg.github.io/grip/ - - - + https://bmeg.github.io/grip/docs/commands/ - - - + https://bmeg.github.io/grip/docs/gripper/ - - - - https://bmeg.github.io/grip/docs/databases/gripper/ - - - + https://bmeg.github.io/grip/docs/gripper/gripper/ - - - - https://bmeg.github.io/grip/docs/queries/jobs_api/ - - - + + https://bmeg.github.io/grip/docs/queries/iterations/ + + https://bmeg.github.io/grip/docs/jobs_api/ + https://bmeg.github.io/grip/docs/commands/list/ - - - - https://bmeg.github.io/grip/docs/databases/mongo/ - - - + https://bmeg.github.io/grip/docs/commands/mongoload/ - - - - https://bmeg.github.io/grip/docs/queries/operations/ - - - + + https://bmeg.github.io/grip/docs/queries/output/ + https://bmeg.github.io/grip/docs/ - - - - https://bmeg.github.io/grip/docs/databases/psql/ - - - + https://bmeg.github.io/grip/docs/commands/query/ - - - + https://bmeg.github.io/grip/docs/queries/ - - - + + https://bmeg.github.io/grip/docs/queries/record_transforms/ + https://bmeg.github.io/grip/docs/queries/jsonpath/ - - - + https://bmeg.github.io/grip/docs/security/ - - - + https://bmeg.github.io/grip/docs/commands/server/ - - - - https://bmeg.github.io/grip/docs/databases/sql/ - - - + + https://bmeg.github.io/grip/docs/queries/traversal_start/ + https://bmeg.github.io/grip/tags/ - - - + https://bmeg.github.io/grip/docs/tutorials/tcga-rna/ - - - + + https://bmeg.github.io/grip/docs/queries/traverse_graph/ + https://bmeg.github.io/grip/docs/tutorials/ - - \ No newline at end of file + diff --git a/docs/tags/index.xml b/docs/tags/index.xml index 4ddab99c9..870974262 100644 --- a/docs/tags/index.xml +++ b/docs/tags/index.xml @@ -4,11 +4,8 @@ Tags on GRIP https://bmeg.github.io/grip/tags/ Recent content in Tags on GRIP - Hugo -- gohugo.io + Hugo en-us - - - - + - \ No newline at end of file + diff --git a/elastic/convert.go b/elastic/convert.go deleted file mode 100644 index d44afa619..000000000 --- a/elastic/convert.go +++ /dev/null @@ -1,51 +0,0 @@ -package elastic - -import ( - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "google.golang.org/protobuf/types/known/structpb" -) - -// PackVertex take a gdbi vertex and convert it to a mongo doc -func PackVertex(v *gdbi.Vertex) map[string]interface{} { - return map[string]interface{}{ - "gid": v.ID, - "label": v.Label, - "data": v.Data, - } -} - -// PackEdge takes a AQL edge and converts it to a mongo doc -func PackEdge(e *gdbi.Edge) map[string]interface{} { - return map[string]interface{}{ - "gid": e.ID, - "from": e.From, - "to": e.To, - "label": e.Label, - "data": e.Data, - } -} - -// UnpackVertex takes a mongo doc and converts it into an gripql.Vertex -func UnpackVertex(i map[string]interface{}) *gripql.Vertex { - o := &gripql.Vertex{} - o.Gid = i["gid"].(string) - o.Label = i["label"].(string) - if p, ok := i["data"]; ok { - o.Data, _ = structpb.NewStruct(p.(map[string]interface{})) - } - return o -} - -// UnpackEdge takes a mongo doc and convertes it into an gripql.Edge -func UnpackEdge(i map[string]interface{}) *gripql.Edge { - o := &gripql.Edge{} - o.Gid = i["gid"].(string) - o.Label = i["label"].(string) - o.From = i["from"].(string) - o.To = i["to"].(string) - if d, ok := i["data"]; ok { - o.Data, _ = structpb.NewStruct(d.(map[string]interface{})) - } - return o -} diff --git a/elastic/graph.go b/elastic/graph.go deleted file mode 100644 index d08326848..000000000 --- a/elastic/graph.go +++ /dev/null @@ -1,879 +0,0 @@ -package elastic - -import ( - "context" - "encoding/json" - "fmt" - "io" - "time" - - "github.com/bmeg/grip/engine/core" - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/bmeg/grip/timestamp" - "github.com/bmeg/grip/util" - "golang.org/x/sync/errgroup" - "google.golang.org/protobuf/encoding/protojson" - elastic "gopkg.in/olivere/elastic.v5" -) - -var excludeData = elastic.NewFetchSourceContext(true).Exclude("data") - -// Graph is a graph database backended by elastic search -type Graph struct { - ts *timestamp.Timestamp - client *elastic.Client - graph string - vertexIndex string - edgeIndex string - // Used to batch queries from incoming channels - batchSize int - // Not recommended for production. Refresh the relevant primary and replica shards (not the - // whole index) immediately after the operation occurs, so that the updated - // document appears in search results immediately. - synchronous bool - pageSize int -} - -// Compiler returns a query compiler that will use elastic search as a backend -func (es *Graph) Compiler() gdbi.Compiler { - return core.NewCompiler(es, core.IndexStartOptimize) //TODO: probably a better optimizer for vertex label search -} - -// GetTimestamp returns the change timestamp of the current graph -func (es *Graph) GetTimestamp() string { - return es.ts.Get(es.graph) -} - -// AddEdge adds an edge to the graph, if the id is not "" and in already exists -// in the graph, it is replaced -func (es *Graph) AddEdge(edges []*gdbi.Edge) error { - ctx := context.Background() - - bulkRequest := es.client.Bulk() - if es.synchronous { - bulkRequest = bulkRequest.Refresh("true") - } - for _, e := range edges { - if e.ID == "" { - return fmt.Errorf("edge gid cannot be an empty string") - } - pe := PackEdge(e) - script := elastic.NewScript(`ctx._source.gid = params.gid; - ctx._source.label = params.label; - ctx._source.from = params.from; - ctx._source.to = params.to; - ctx._source.data = params.data;`).Params(pe) - req := elastic.NewBulkUpdateRequest(). - Index(es.edgeIndex). - Type("edge"). - Id(e.ID). - Script(script). - Upsert(pe) - bulkRequest = bulkRequest.Add(req) - } - _, err := bulkRequest.Do(ctx) - if err != nil { - return fmt.Errorf("failed to add edge: %s", err) - } - es.ts.Touch(es.graph) - return nil -} - -// AddVertex adds an edge to the graph, if the id is not "" and in already exists -// in the graph, it is replaced -func (es *Graph) AddVertex(vertices []*gdbi.Vertex) error { - ctx := context.Background() - - bulkRequest := es.client.Bulk() - if es.synchronous { - bulkRequest = bulkRequest.Refresh("true") - } - for _, v := range vertices { - if v.ID == "" { - return fmt.Errorf("vertex gid cannot be an empty string") - } - pv := PackVertex(v) - script := elastic.NewScript(`ctx._source.gid = params.gid; - ctx._source.label = params.label; - ctx._source.data = params.data;`).Params(pv) - req := elastic.NewBulkUpdateRequest(). - Index(es.vertexIndex). - Type("vertex"). - Id(v.ID). - Script(script). - Upsert(pv) - bulkRequest = bulkRequest.Add(req) - } - _, err := bulkRequest.Do(ctx) - if err != nil { - return fmt.Errorf("failed to add vertex: %s", err) - } - es.ts.Touch(es.graph) - return nil -} - -func (es *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { - return util.StreamBatch(stream, 50, es.graph, es.AddVertex, es.AddEdge) -} - -// DelEdge deletes edge `eid` -func (es *Graph) DelEdge(eid string) error { - ctx := context.Background() - op := es.client.Delete() - if es.synchronous { - op = op.Refresh("true") - } - _, err := op.Index(es.edgeIndex).Type("edge").Id(eid).Do(ctx) - if err != nil { - return fmt.Errorf("failed to delete edge %s: %s", eid, err) - } - es.ts.Touch(es.graph) - return nil -} - -// deleteConnectedEdges deletes edges where `from` or `to` equal `vid` -func (es *Graph) deleteConnectedEdges(vid string) error { - ctx := context.Background() - - op := es.client.DeleteByQuery() - if es.synchronous { - op = op.Refresh("true") - } - op = op.Index(es.edgeIndex).Type("edge").Query( - elastic.NewBoolQuery().Should(elastic.NewTermQuery("from", vid), elastic.NewTermQuery("to", vid)), - ) - _, err := op.Do(ctx) - if err != nil { - return fmt.Errorf("failed to delete edge(s): %s", err) - } - es.ts.Touch(es.graph) - return nil -} - -// DelVertex deletes vertex `vid` and all adjacent edges -func (es *Graph) DelVertex(vid string) error { - ctx := context.Background() - op := es.client.Delete() - if es.synchronous { - op = op.Refresh("true") - } - _, err := op.Index(es.vertexIndex).Type("vertex").Id(vid).Do(ctx) - if err != nil { - return fmt.Errorf("failed to delete vertex %s: %s", vid, err) - } - es.ts.Touch(es.graph) - err = es.deleteConnectedEdges(vid) - if err != nil { - return err - } - return nil -} - -// GetEdge gets a specific edge -func (es *Graph) GetEdge(id string, load bool) *gdbi.Edge { - ctx := context.Background() - - g := es.client.Get().Index(es.edgeIndex).Id(id) - if !load { - g = g.FetchSource(true).FetchSourceContext(excludeData) - } - - res, err := g.Do(ctx) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetEdge") - return nil - } - - edge := &gripql.Edge{} - err = protojson.Unmarshal(*res.Source, edge) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetEdge: unmarshal") - return nil - } - o := gdbi.NewElementFromEdge(edge) - o.Loaded = load - return o -} - -// GetVertex gets vertex `id` -func (es *Graph) GetVertex(id string, load bool) *gdbi.Vertex { - ctx := context.Background() - - g := es.client.Get().Index(es.vertexIndex).Id(id) - if !load { - g = g.FetchSource(true).FetchSourceContext(excludeData) - } - - res, err := g.Do(ctx) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertex") - return nil - } - - vertex := &gripql.Vertex{} - err = protojson.Unmarshal(*res.Source, vertex) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertex: unmarshal") - return nil - } - - o := gdbi.NewElementFromVertex(vertex) - o.Loaded = load - return o -} - -// GetEdgeList produces a channel of all edges in the graph -func (es *Graph) GetEdgeList(ctx context.Context, load bool) <-chan *gdbi.Edge { - o := make(chan *gdbi.Edge, 100) - - // 1st goroutine sends individual hits to channel. - hits := make(chan json.RawMessage, es.pageSize) - g, ctx := errgroup.WithContext(ctx) - g.Go(func() error { - defer close(hits) - scroll := es.client.Scroll(es.edgeIndex).Sort("gid", true).Size(es.pageSize) - if !load { - scroll = scroll.FetchSource(true).FetchSourceContext(excludeData) - } - for { - results, err := scroll.Do(ctx) - if err == io.EOF { - return nil // all results retrieved - } - if err != nil { - return fmt.Errorf("scroll call failed: %v", err) - } - - // Send the hits to the hits channel - for _, hit := range results.Hits.Hits { - hits <- *hit.Source - } - } - }) - - // 2nd goroutine receives hits and deserializes them. - g.Go(func() error { - for hit := range hits { - edge := &gripql.Edge{} - err := protojson.Unmarshal(hit, edge) - if err != nil { - return err - } - i := gdbi.NewElementFromEdge(edge) - i.Loaded = load - o <- i - } - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetEdgeList") - } - }() - - return o -} - -// GetVertexList produces a channel of all vertices in the graph -func (es *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Vertex { - o := make(chan *gdbi.Vertex, es.pageSize) - - // 1st goroutine sends individual hits to channel. - hits := make(chan json.RawMessage, es.pageSize) - g, ctx := errgroup.WithContext(ctx) - g.Go(func() error { - defer close(hits) - scroll := es.client.Scroll(es.vertexIndex).Sort("gid", true).Size(es.pageSize) - if !load { - scroll = scroll.FetchSource(true).FetchSourceContext(excludeData) - } - for { - results, err := scroll.Do(ctx) - if err == io.EOF { - return nil // all results retrieved - } - if err != nil { - return fmt.Errorf("scroll call failed: %v", err) - } - - // Send the hits to the hits channel - for _, hit := range results.Hits.Hits { - hits <- *hit.Source - } - } - }) - - // 2nd goroutine receives hits and deserializes them. - g.Go(func() error { - for hit := range hits { - vertex := &gripql.Vertex{} - err := protojson.Unmarshal(hit, vertex) - if err != nil { - return fmt.Errorf("failed to unmarshal vertex: %v", err) - } - i := gdbi.NewElementFromVertex(vertex) - i.Loaded = load - o <- i - } - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexList") - } - }() - - return o -} - -// GetVertexChannel get a channel that returns all vertices in a graph -func (es *Graph) GetVertexChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool) chan gdbi.ElementLookup { - g, ctx := errgroup.WithContext(ctx) - - // Create query batches - batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond) - - // Find all vertices - o := make(chan gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - for batch := range batches { - idBatch := make([]string, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - idBatch = append(idBatch, batch[i].ID) - batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) - } - } - if len(idBatch) > 0 { - q := es.client.Search().Index(es.vertexIndex).Size(es.pageSize) - q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...))) - if !load { - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data")) - } - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - vertex := &gripql.Vertex{} - err := protojson.Unmarshal(*hit.Source, vertex) - if err != nil { - return fmt.Errorf("failed to unmarshal vertex: %s", err) - } - r := batchMap[vertex.Gid] - for _, ri := range r { - ri.Vertex = gdbi.NewElementFromVertex(vertex) - ri.Vertex.Loaded = load - o <- ri - } - } - } - for i := range signals { - o <- signals[i] - } - } - - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel") - } - }() - - return o -} - -// GetOutChannel gets channel of all vertices connected to element via outgoing edge -func (es *Graph) GetOutChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { - g, ctx := errgroup.WithContext(ctx) - - // Create query batches - batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond) - - // Find all outgoing edges - edgeBatches := make(chan []gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - defer close(edgeBatches) - for batch := range batches { - idBatch := make([]interface{}, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - batchMapReturnCount := make(map[string]int) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - idBatch = append(idBatch, batch[i].ID) - batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) - batchMapReturnCount[batch[i].ID] = 0 - } - } - b := []gdbi.ElementLookup{} - if len(idBatch) > 0 { - q := es.client.Search().Index(es.edgeIndex) - qParts := []elastic.Query{elastic.NewTermsQuery("from", idBatch...)} - if len(edgeLabels) > 0 { - labels := make([]interface{}, len(edgeLabels)) - for i, v := range edgeLabels { - labels[i] = v - } - qParts = append(qParts, elastic.NewTermsQuery("label", labels...)) - } - q = q.Query(elastic.NewBoolQuery().Must(qParts...)) - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Include("from", "to")) - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - edge := &gripql.Edge{} - err := protojson.Unmarshal(*hit.Source, edge) - if err != nil { - return fmt.Errorf("failed to unmarshal edge: %s", err) - } - r := batchMap[edge.From] - batchMapReturnCount[edge.From]++ - for _, ri := range r { - ri.Vertex = &gdbi.Vertex{ID: edge.To} - b = append(b, ri) - } - } - } - if emitNull { - for id, count := range batchMapReturnCount { - if count == 0 { - r := batchMap[id] - for _, ri := range r { - ri.Vertex = nil - b = append(b, ri) - } - } - } - } - for i := range signals { - b = append(b, signals[i]) - } - edgeBatches <- b - } - - return nil - }) - - // Collect all identified vertices - o := make(chan gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - for batch := range edgeBatches { - idBatch := make([]string, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - if batch[i].Vertex != nil { - idBatch = append(idBatch, batch[i].Vertex.ID) - batchMap[batch[i].Vertex.ID] = append(batchMap[batch[i].Vertex.ID], batch[i]) - } else if emitNull { - o <- batch[i] - } - } - } - if len(idBatch) > 0 { - q := es.client.Search().Index(es.vertexIndex) - q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...))) - if !load { - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data")) - } - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - vertex := &gripql.Vertex{} - err := protojson.Unmarshal(*hit.Source, vertex) - if err != nil { - return fmt.Errorf("failed to unmarshal vertex: %s", err) - } - r := batchMap[vertex.Gid] - for _, ri := range r { - ri.Vertex = gdbi.NewElementFromVertex(vertex) - ri.Vertex.Loaded = load - o <- ri - } - } - } - for i := range signals { - o <- signals[i] - } - } - - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetOutChannel") - } - }() - - return o -} - -// GetInChannel gets all vertices connected to lookup elements by incoming edges -func (es *Graph) GetInChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { - g, ctx := errgroup.WithContext(ctx) - - // Create query batches - batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond) - - // Find all incoming edges - edgeBatches := make(chan []gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - defer close(edgeBatches) - for batch := range batches { - idBatch := make([]interface{}, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - batchMapReturnCount := make(map[string]int) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - idBatch = append(idBatch, batch[i].ID) - batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) - batchMapReturnCount[batch[i].ID] = 0 - } - } - b := []gdbi.ElementLookup{} - if len(idBatch) > 0 { - q := es.client.Search().Index(es.edgeIndex) - qParts := []elastic.Query{elastic.NewTermsQuery("to", idBatch...)} - if len(edgeLabels) > 0 { - labels := make([]interface{}, len(edgeLabels)) - for i, v := range edgeLabels { - labels[i] = v - } - qParts = append(qParts, elastic.NewTermsQuery("label", labels...)) - } - q = q.Query(elastic.NewBoolQuery().Must(qParts...)) - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Include("from", "to")) - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - edge := &gripql.Edge{} - err := protojson.Unmarshal(*hit.Source, edge) - if err != nil { - return fmt.Errorf("failed to unmarshal edge: %s", err) - } - r := batchMap[edge.To] - batchMapReturnCount[edge.To]++ - for _, ri := range r { - ri.Vertex = &gdbi.Vertex{ID: edge.From} - b = append(b, ri) - } - } - } - if emitNull { - for id, count := range batchMapReturnCount { - if count == 0 { - r := batchMap[id] - for _, ri := range r { - ri.Vertex = nil - b = append(b, ri) - } - } - } - } - for i := range signals { - b = append(b, signals[i]) - } - edgeBatches <- b - } - - return nil - }) - - // Collect all identified vertices - o := make(chan gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - for batch := range edgeBatches { - idBatch := make([]string, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - if batch[i].Vertex != nil { - idBatch = append(idBatch, batch[i].Vertex.ID) - batchMap[batch[i].Vertex.ID] = append(batchMap[batch[i].Vertex.ID], batch[i]) - } else if emitNull { - o <- batch[i] - } - } - } - if len(idBatch) > 0 { - q := es.client.Search().Index(es.vertexIndex) - q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...))) - if !load { - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data")) - } - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - vertex := &gripql.Vertex{} - err := protojson.Unmarshal(*hit.Source, vertex) - if err != nil { - return fmt.Errorf("failed to unmarshal vertex: %s", err) - } - r := batchMap[vertex.Gid] - for _, ri := range r { - ri.Vertex = gdbi.NewElementFromVertex(vertex) - ri.Vertex.Loaded = load - o <- ri - } - } - for i := range signals { - o <- signals[i] - } - } - } - - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetInChannel") - } - }() - - return o -} - -// GetOutEdgeChannel gets all outgoing edges connected to lookup element -func (es *Graph) GetOutEdgeChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { - g, ctx := errgroup.WithContext(ctx) - - // Create query batches - batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond) - - // Find all outgoing edges - o := make(chan gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - for batch := range batches { - idBatch := make([]interface{}, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - batchMapReturnCount := make(map[string]int) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - idBatch = append(idBatch, batch[i].ID) - batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) - batchMapReturnCount[batch[i].ID] = 0 - } - } - if len(idBatch) > 0 { - q := es.client.Search().Index(es.edgeIndex) - qParts := []elastic.Query{elastic.NewTermsQuery("from", idBatch...)} - if len(edgeLabels) > 0 { - labels := make([]interface{}, len(edgeLabels)) - for i, v := range edgeLabels { - labels[i] = v - } - qParts = append(qParts, elastic.NewTermsQuery("label", labels...)) - } - q = q.Query(elastic.NewBoolQuery().Must(qParts...)) - if !load { - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data")) - } - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - edge := &gripql.Edge{} - err := protojson.Unmarshal(*hit.Source, edge) - if err != nil { - return fmt.Errorf("failed to unmarshal edge: %s", err) - } - r := batchMap[edge.From] - batchMapReturnCount[edge.From]++ - for _, ri := range r { - ri.Edge = gdbi.NewElementFromEdge(edge) - ri.Edge.Loaded = load - o <- ri - } - } - } - if emitNull { - for id, count := range batchMapReturnCount { - if count == 0 { - r := batchMap[id] - for _, ri := range r { - ri.Edge = nil - o <- ri - } - } - } - } - for i := range signals { - o <- signals[i] - } - } - - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel") - } - }() - - return o -} - -// GetInEdgeChannel gets incoming edges connected to lookup element -func (es *Graph) GetInEdgeChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { - g, ctx := errgroup.WithContext(ctx) - - // Create query batches - batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond) - - // Find all incoming edges - o := make(chan gdbi.ElementLookup, es.pageSize) - g.Go(func() error { - for batch := range batches { - idBatch := make([]interface{}, 0, len(batch)) - batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) - batchMapReturnCount := make(map[string]int) - signals := []gdbi.ElementLookup{} - for i := range batch { - if batch[i].IsSignal() { - signals = append(signals, batch[i]) - } else { - idBatch = append(idBatch, batch[i].ID) - batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) - batchMapReturnCount[batch[i].ID] = 0 - } - } - - if len(idBatch) > 0 { - q := es.client.Search().Index(es.edgeIndex) - qParts := []elastic.Query{elastic.NewTermsQuery("to", idBatch...)} - if len(edgeLabels) > 0 { - labels := make([]interface{}, len(edgeLabels)) - for i, v := range edgeLabels { - labels[i] = v - } - qParts = append(qParts, elastic.NewTermsQuery("label", labels...)) - } - q = q.Query(elastic.NewBoolQuery().Must(qParts...)) - if !load { - q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data")) - } - q = q.Sort("gid", true).Size(es.pageSize) - - for hit := range paginateQuery(ctx, q, es.pageSize) { - // Deserialize - edge := &gripql.Edge{} - err := protojson.Unmarshal(*hit.Source, edge) - if err != nil { - return fmt.Errorf("failed to unmarshal edge: %s", err) - } - r := batchMap[edge.To] - batchMapReturnCount[edge.To]++ - for _, ri := range r { - ri.Edge = gdbi.NewElementFromEdge(edge) - ri.Edge.Loaded = load - o <- ri - } - } - } - if emitNull { - for id, count := range batchMapReturnCount { - if count == 0 { - r := batchMap[id] - for _, ri := range r { - ri.Edge = nil - o <- ri - } - } - } - } - for i := range signals { - o <- signals[i] - } - } - - return nil - }) - - // Check whether any goroutines failed. - go func() { - defer close(o) - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel") - } - }() - - return o -} - -// ListVertexLabels returns a list of vertex types in the graph -func (es *Graph) ListVertexLabels() ([]string, error) { - q := es.client.Search().Index(es.vertexIndex).Type("vertex") - aggName := "vertex.labels.aggregation" - q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000)) - res, err := q.Do(context.Background()) - if err != nil { - return nil, err - } - labels := []string{} - if agg, found := res.Aggregations.Terms(aggName); found { - for _, bucket := range agg.Buckets { - labels = append(labels, bucket.Key.(string)) - } - } - return labels, nil -} - -// ListEdgeLabels returns a list of edge types in the graph -func (es *Graph) ListEdgeLabels() ([]string, error) { - q := es.client.Search().Index(es.edgeIndex).Type("edge") - aggName := "edge.labels.aggregation" - q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000)) - res, err := q.Do(context.Background()) - if err != nil { - return nil, err - } - labels := []string{} - if agg, found := res.Aggregations.Terms(aggName); found { - for _, bucket := range agg.Buckets { - labels = append(labels, bucket.Key.(string)) - } - } - return labels, nil -} diff --git a/elastic/graphdb.go b/elastic/graphdb.go deleted file mode 100644 index 077582f51..000000000 --- a/elastic/graphdb.go +++ /dev/null @@ -1,222 +0,0 @@ -package elastic - -import ( - "context" - "fmt" - "strings" - "time" - - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/bmeg/grip/timestamp" - elastic "gopkg.in/olivere/elastic.v5" -) - -// Config describes the configuration for the elasticsearch driver. -type Config struct { - URL string - DBName string - Username string - Password string - Synchronous bool - BatchSize int -} - -func (c *Config) SetDefaults() { - if c.DBName == "" { - c.DBName = "gripdb" - } - if c.BatchSize == 0 { - c.BatchSize = 1000 - } -} - -// GraphDB implements the GraphDB interface with elasticsearch as a backend -type GraphDB struct { - database string - conf Config - ts *timestamp.Timestamp - client *elastic.Client -} - -// NewGraphDB creates a new elasticsearch graph database interface -func NewGraphDB(conf Config) (gdbi.GraphDB, error) { - log.Info("Starting ElasticSearch Driver") - database := strings.ToLower(conf.DBName) - err := gripql.ValidateGraphName(database) - if err != nil { - return nil, fmt.Errorf("invalid database name: %v", err) - } - - ts := timestamp.NewTimestamp() - opts := []elastic.ClientOptionFunc{ - elastic.SetURL(conf.URL), - elastic.SetSniff(false), - elastic.SetRetrier( - elastic.NewBackoffRetrier( - elastic.NewExponentialBackoff(time.Millisecond*50, time.Minute), - ), - ), - } - - if conf.Username != "" && conf.Password != "" { - opts = append(opts, elastic.SetBasicAuth(conf.Username, conf.Password)) - } - - client, err := elastic.NewClient(opts...) - if err != nil { - return nil, fmt.Errorf("failed to create elasticsearch client: %v", err) - } - if conf.BatchSize == 0 { - conf.BatchSize = 1000 - } - db := &GraphDB{database: database, conf: conf, ts: &ts, client: client} - for _, g := range db.ListGraphs() { - g := g - db.ts.Touch(g) - go func() { - err := db.setupIndices(context.Background(), g) - if err != nil { - log.WithFields(log.Fields{"error": err, "graph": g}).Error("Setting up indices") - } - }() - } - return db, nil -} - -// Close closes connection to elastic search -func (es *GraphDB) Close() error { - es.client.Stop() - return nil -} - -// ListGraphs returns list of graphs on elastic search instance -func (es *GraphDB) ListGraphs() []string { - graphPrefix := fmt.Sprintf("%s_", es.database) - out := []string{} - idxNames, err := es.client.IndexNames() - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("ListGraphs: ElasticSearch: listing index names") - } - for _, idx := range idxNames { - if strings.HasPrefix(idx, graphPrefix) { - gName := strings.TrimPrefix(idx, graphPrefix) - gName = strings.TrimSuffix(gName, "_vertex") - gName = strings.TrimSuffix(gName, "_edge") - out = append(out, gName) - } - } - return out -} - -func (es *GraphDB) createIndex(ctx context.Context, name, body string) error { - exists, err := es.client. - IndexExists(name). - Do(ctx) - - if err != nil { - return err - } else if !exists { - if _, err := es.client.CreateIndex(name).Body(body).Do(ctx); err != nil { - return err - } - } - return nil -} - -func (es *GraphDB) setupIndices(ctx context.Context, graph string) error { - vertexIndex := fmt.Sprintf("%s_%s_vertex", es.database, graph) - vMapping := `{ - "mappings": { - "vertex":{ - "properties":{ - "gid": { - "type": "keyword" - }, - "label": { - "type": "keyword" - } - } - } - } - }` - if err := es.createIndex(ctx, vertexIndex, vMapping); err != nil { - return err - } - - edgeIndex := fmt.Sprintf("%s_%s_edge", es.database, graph) - eMapping := `{ - "mappings": { - "edge":{ - "properties":{ - "gid": { - "type": "keyword" - }, - "from": { - "type": "keyword" - }, - "to": { - "type": "keyword" - }, - "label": { - "type": "keyword" - } - } - } - } - }` - if err := es.createIndex(ctx, edgeIndex, eMapping); err != nil { - return err - } - return nil -} - -// AddGraph adds a new graph to the graphdb -func (es *GraphDB) AddGraph(graph string) error { - err := gripql.ValidateGraphName(graph) - if err != nil { - return err - } - return es.setupIndices(context.Background(), graph) -} - -// DeleteGraph deletes a graph from the graphdb -func (es *GraphDB) DeleteGraph(graph string) error { - ctx := context.Background() - - vertexIndex := fmt.Sprintf("%s_%s_vertex", es.database, graph) - if _, err := es.client.DeleteIndex(vertexIndex).Do(ctx); err != nil { - return err - } - - edgeIndex := fmt.Sprintf("%s_%s_edge", es.database, graph) - if _, err := es.client.DeleteIndex(edgeIndex).Do(ctx); err != nil { - return err - } - return nil -} - -// Graph returns interface to a specific graph in the graphdb -func (es *GraphDB) Graph(graph string) (gdbi.GraphInterface, error) { - found := false - for _, gname := range es.ListGraphs() { - if graph == gname { - found = true - } - } - if !found { - return nil, fmt.Errorf("graph '%s' was not found", graph) - } - - return &Graph{ - ts: es.ts, - client: es.client, - graph: graph, - vertexIndex: fmt.Sprintf("%s_%s_vertex", es.database, graph), - edgeIndex: fmt.Sprintf("%s_%s_edge", es.database, graph), - batchSize: es.conf.BatchSize, - synchronous: es.conf.Synchronous, - pageSize: 500, - }, nil -} diff --git a/elastic/index.go b/elastic/index.go deleted file mode 100644 index 74bb97374..000000000 --- a/elastic/index.go +++ /dev/null @@ -1,236 +0,0 @@ -package elastic - -import ( - "context" - //"fmt" - "io" - //"strconv" - //"strings" - - "github.com/bmeg/grip/gripql" - //"github.com/bmeg/grip/jsonpath" - "github.com/bmeg/grip/log" - //"github.com/bmeg/grip/protoutil" - elastic "gopkg.in/olivere/elastic.v5" -) - -// AddVertexIndex adds a new field to be indexed -func (es *Graph) AddVertexIndex(label string, field string) error { - log.WithFields(log.Fields{"label": label, "field": field}).Info("Adding vertex index") - return nil -} - -// DeleteVertexIndex removes a vertex field index -func (es *Graph) DeleteVertexIndex(label string, field string) error { - log.WithFields(log.Fields{"label": label, "field": field}).Info("Deleting vertex index") - return nil -} - -// GetVertexIndexList gets list if vertex indices -func (es *Graph) GetVertexIndexList() <-chan *gripql.IndexID { - log.Debug("Running GetVertexIndexList") - ctx := context.Background() - - o := make(chan *gripql.IndexID) - go func() { - defer close(o) - - // get all unique labels - q := es.client.Search().Index(es.vertexIndex).Type("vertex") - aggName := "labels.aggregation" - q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000).OrderByCountDesc()) - res, err := q.Do(ctx) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: label term count failed") - return - } - - labels := []string{} - if agg, found := res.Aggregations.Terms(aggName); found { - for _, bucket := range agg.Buckets { - labels = append(labels, bucket.Key.(string)) - } - } - - // list indexed fields - mapping, err := es.client.GetMapping().Index(es.vertexIndex).Type("vertex").Do(ctx) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: get field mapping failed") - return - } - - var data map[string]interface{} - if props, ok := mapping[es.vertexIndex].(map[string]interface{}); ok { - if props, ok = props["mappings"].(map[string]interface{}); ok { - if props, ok = props["vertex"].(map[string]interface{}); ok { - if props, ok = props["properties"].(map[string]interface{}); ok { - if props, ok = props["data"].(map[string]interface{}); ok { - if props, ok = props["properties"].(map[string]interface{}); ok { - data = props - } - } - } - } - } - } - - for k := range data { - for _, l := range labels { - o <- &gripql.IndexID{Graph: es.graph, Label: l, Field: k} - } - } - }() - - return o -} - -/* -// GetVertexTermAggregation returns the count of every term across vertices -func (es *Graph) GetVertexTermAggregation(ctx context.Context, label string, field string, size uint32) (*gripql.AggregationResult, error) { - log.WithFields(log.Fields{"label": label, "field": field, "size": size}).Debug("Running GetVertexTermAggregation") - namespace := jsonpath.GetNamespace(field) - if namespace != jsonpath.Current { - return nil, fmt.Errorf("invalid field path") - } - field = jsonpath.GetJSONPath(field) - field = strings.TrimPrefix(field, "$.") - - out := &gripql.AggregationResult{ - Buckets: []*gripql.AggregationResultBucket{}, - } - - q := es.client.Search().Index(es.vertexIndex).Type("vertex") - q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label))) - aggName := fmt.Sprintf("term.aggregation.%s.%s", label, field) - if size == 0 { - size = 1000000 - } - q = q.Aggregation(aggName, - elastic.NewTermsAggregation().Field(field+".keyword").Size(int(size)).OrderByCountDesc()) - res, err := q.Do(ctx) - if err != nil { - return nil, fmt.Errorf("term count failed: %s", err) - } - if agg, found := res.Aggregations.Terms(aggName); found { - for _, bucket := range agg.Buckets { - term := protoutil.WrapValue(bucket.Key.(string)) - out.SortedInsert(&gripql.AggregationResultBucket{Key: term, Value: float64(bucket.DocCount)}) - if size > 0 { - if len(out.Buckets) > int(size) { - out.Buckets = out.Buckets[:size] - } - } - } - } - - return out, nil -} -*/ - -/* -//GetVertexHistogramAggregation get binned counts of a term across vertices -func (es *Graph) GetVertexHistogramAggregation(ctx context.Context, label string, field string, interval uint32) (*gripql.AggregationResult, error) { - log.WithFields(log.Fields{"label": label, "field": field, "interval": interval}).Debug("Running GetVertexHistogramAggregation") - namespace := jsonpath.GetNamespace(field) - if namespace != jsonpath.Current { - return nil, fmt.Errorf("invalid field path") - } - field = jsonpath.GetJSONPath(field) - field = strings.TrimPrefix(field, "$.") - - out := &gripql.AggregationResult{ - Buckets: []*gripql.AggregationResultBucket{}, - } - - q := es.client.Search().Index(es.vertexIndex).Type("vertex") - q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label))) - aggName := fmt.Sprintf("histogram.aggregation.%s.%s", label, field) - q = q.Aggregation(aggName, - elastic.NewHistogramAggregation().Field(field).Interval(float64(interval)).OrderByKeyAsc()) - res, err := q.Do(ctx) - if err != nil { - return nil, fmt.Errorf("histogram aggregation failed: %s", err) - } - if agg, found := res.Aggregations.Histogram(aggName); found { - for _, bucket := range agg.Buckets { - term := protoutil.WrapValue(bucket.Key) - out.Buckets = append(out.Buckets, &gripql.AggregationResultBucket{Key: term, Value: float64(bucket.DocCount)}) - } - } - - return out, nil -} -*/ - -/* -//GetVertexPercentileAggregation get percentiles of a term across vertices -func (es *Graph) GetVertexPercentileAggregation(ctx context.Context, label string, field string, percents []float64) (*gripql.AggregationResult, error) { - log.WithFields(log.Fields{"label": label, "field": field, "percents": percents}).Debug("Running GetVertexPercentileAggregation") - namespace := jsonpath.GetNamespace(field) - if namespace != jsonpath.Current { - return nil, fmt.Errorf("invalid field path") - } - field = jsonpath.GetJSONPath(field) - field = strings.TrimPrefix(field, "$.") - - out := &gripql.AggregationResult{ - Buckets: []*gripql.AggregationResultBucket{}, - } - - q := es.client.Search().Index(es.vertexIndex).Type("vertex") - q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label))) - aggName := fmt.Sprintf("percentile.aggregation.%s.%s", label, field) - q = q.Aggregation(aggName, - elastic.NewPercentilesAggregation().Field(field).Percentiles(percents...)) - res, err := q.Do(ctx) - if err != nil { - return nil, fmt.Errorf("percentile aggregation failed: %s", err) - } - if agg, found := res.Aggregations.Percentiles(aggName); found { - for key, val := range agg.Values { - keyf, err := strconv.ParseFloat(key, 64) - if err != nil { - return nil, fmt.Errorf("percentile key conversion failed: %s", err) - } - key := protoutil.WrapValue(keyf) - out.Buckets = append(out.Buckets, &gripql.AggregationResultBucket{Key: key, Value: float64(val)}) - } - } - - return out, nil -} -*/ - -// VertexLabelScan produces a channel of all vertex ids where the vertex label matches `label` -func (es *Graph) VertexLabelScan(ctx context.Context, label string) chan string { - log.WithFields(log.Fields{"label": label}).Debug("Running VertexLabelScan") - - o := make(chan string, es.pageSize) - go func() { - defer close(o) - if label == "" { - return - } - scroll := es.client.Scroll(). - Index(es.vertexIndex). - Query(elastic.NewBoolQuery().Must(elastic.NewTermQuery("label", label))). - Sort("gid", true). - Size(es.pageSize) - for { - results, err := scroll.Do(ctx) - if err == io.EOF { - return // all results retrieved - } - if err != nil { - log.WithFields(log.Fields{"error": err}).Debug("VertexLabelScan: scroll failed") - return - } - // Send the hits to the hits channel - for _, hit := range results.Hits.Hits { - o <- hit.Id - } - } - }() - - return o -} diff --git a/elastic/schema.go b/elastic/schema.go deleted file mode 100644 index 351edcd87..000000000 --- a/elastic/schema.go +++ /dev/null @@ -1,19 +0,0 @@ -package elastic - -import ( - "context" - - "github.com/bmeg/grip/gdbi/schema" - "github.com/bmeg/grip/gripql" -) - -// BuildSchema returns the schema of a specific graph in the database -func (es *GraphDB) BuildSchema(ctx context.Context, graph string, sampleN uint32, random bool) (*gripql.Graph, error) { - - gr, err := es.Graph(graph) - if err != nil { - return nil, err - } - - return schema.SchemaScan(ctx, graph, gr, sampleN, random) -} diff --git a/elastic/util.go b/elastic/util.go deleted file mode 100644 index dcd8f3794..000000000 --- a/elastic/util.go +++ /dev/null @@ -1,37 +0,0 @@ -package elastic - -import ( - "context" - - "github.com/bmeg/grip/log" - elastic "gopkg.in/olivere/elastic.v5" -) - -func paginateQuery(ctx context.Context, q *elastic.SearchService, pageSize int) chan *elastic.SearchHit { - o := make(chan *elastic.SearchHit, pageSize) - go func() { - defer close(o) - done := false - count := 0 - for { - if done { - return - } - res, err := q.From(count).Do(ctx) - if err != nil { - log.WithFields(log.Fields{"error": err}).Error("ElasticSearch: paginateQuery") - return - } - if res.TotalHits() > 0 { - for _, hit := range res.Hits.Hits { - count++ - o <- hit - } - } - if int64(count) == res.TotalHits() { - done = true - } - } - }() - return o -} diff --git a/endpoints/cypher/handle.go b/endpoints/cypher/handle.go index 5bb756220..da7bf8d1f 100644 --- a/endpoints/cypher/handle.go +++ b/endpoints/cypher/handle.go @@ -23,7 +23,7 @@ type Handler struct { } // NewHTTPHandler initilizes a new GraphQLHandler -func NewHTTPHandler(client gripql.Client) (http.Handler, error) { +func NewHTTPHandler(client gripql.Client, config map[string]string) (http.Handler, error) { h := &Handler{ client: client, } diff --git a/endpoints/graphql/builder.go b/endpoints/graphql/builder.go deleted file mode 100644 index f32ec9436..000000000 --- a/endpoints/graphql/builder.go +++ /dev/null @@ -1,474 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/graphql-go/graphql" - "github.com/graphql-go/graphql/language/ast" -) - -const ARG_LIMIT = "first" -const ARG_OFFSET = "offset" -const ARG_ID = "id" -const ARG_IDS = "ids" -const ARG_FILTER = "filter" - -var JSONScalar = graphql.NewScalar(graphql.ScalarConfig{ - Name: "JSON", - Serialize: func(value interface{}) interface{} { - return fmt.Sprintf("Serialize %v", value) - }, - ParseValue: func(value interface{}) interface{} { - fmt.Printf("Unmarshal JSON: %v %T\n", value, value) - return value - }, - ParseLiteral: func(valueAST ast.Value) interface{} { - fmt.Printf("ParseLiteral: %#v\n", valueAST) - /* - switch valueAST := valueAST.(type) { - case *ast.StringValue: - id, _ := models.IDFromString(valueAST.Value) - return id - default: - return nil - }*/ - return nil - }, -}) - -// buildGraphQLSchema reads a GRIP graph schema (which is stored as a graph) and creates -// a GraphQL-GO based schema. The GraphQL-GO schema all wraps the request functions that use -// the gripql.Client to find the requested data -func buildGraphQLSchema(schema *gripql.Graph, client gripql.Client, graph string) (*graphql.Schema, error) { - if schema == nil { - return nil, fmt.Errorf("graphql.NewSchema error: nil gripql.Graph for graph: %s", graph) - } - // Build the set of objects for all vertex labels - objectMap, err := buildObjectMap(client, graph, schema) - if err != nil { - return nil, fmt.Errorf("graphql.NewSchema error: %v", err) - } - - // Build the set of objects that exist in the query structuer - queryObj := buildQueryObject(client, graph, objectMap) - schemaConfig := graphql.SchemaConfig{ - Query: queryObj, - } - - // Setup the GraphQL schema based on the objects there have been created - gqlSchema, err := graphql.NewSchema(schemaConfig) - if err != nil { - return nil, fmt.Errorf("graphql.NewSchema error: %v", err) - } - - return &gqlSchema, nil -} - -func buildField(x string) (*graphql.Field, error) { - var o *graphql.Field - switch x { - case "NUMERIC": - o = &graphql.Field{Type: graphql.Float} - case "STRING": - o = &graphql.Field{Type: graphql.String} - case "BOOL": - o = &graphql.Field{Type: graphql.Boolean} - default: - return nil, fmt.Errorf("%s does not map to a GQL type", x) - } - return o, nil -} - -func buildSliceField(name string, s []interface{}) (*graphql.Field, error) { - var f *graphql.Field - var err error - - if len(s) > 0 { - val := s[0] - if x, ok := val.(map[string]interface{}); ok { - f, err = buildObjectField(name, x) - } else if x, ok := val.([]interface{}); ok { - f, err = buildSliceField(name, x) - - } else if x, ok := val.(string); ok { - f, err = buildField(x) - } else { - err = fmt.Errorf("unhandled type: %T %v", val, val) - } - - } else { - err = fmt.Errorf("slice is empty") - } - - if err != nil { - return nil, fmt.Errorf("buildSliceField error: %v", err) - } - - return &graphql.Field{Type: graphql.NewList(f.Type)}, nil -} - -// buildObjectField wraps the result of buildObject in a graphql.Field so it can be -// a child of slice of another -func buildObjectField(name string, obj map[string]interface{}) (*graphql.Field, error) { - o, err := buildObject(name, obj) - if err != nil { - return nil, err - } - if len(o.Fields()) == 0 { - return nil, fmt.Errorf("no fields in object") - } - return &graphql.Field{Type: o}, nil -} - -func buildObject(name string, obj map[string]interface{}) (*graphql.Object, error) { - objFields := graphql.Fields{} - - for key, val := range obj { - var err error - - // handle map - if x, ok := val.(map[string]interface{}); ok { - // make object name parent_field - var f *graphql.Field - f, err = buildObjectField(name+"_"+key, x) - if err == nil { - objFields[key] = f - } - // handle slice - } else if x, ok := val.([]interface{}); ok { - var f *graphql.Field - f, err = buildSliceField(key, x) - if err == nil { - objFields[key] = f - } - // handle string - } else if x, ok := val.(string); ok { - if f, err := buildField(x); err == nil { - objFields[key] = f - } else { - log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildField ignoring field") - } - // handle other cases - } else { - err = fmt.Errorf("unhandled type: %T %v", val, val) - } - - if err != nil { - log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildObject") - // return nil, fmt.Errorf("object: %s: field: %s: error: %v", name, key, err) - } - } - - return graphql.NewObject( - graphql.ObjectConfig{ - Name: name, - Fields: objFields, - }, - ), nil -} - -// buildObjectMap scans the GripQL schema and turns all of the vertex types into different objects -func buildObjectMap(client gripql.Client, graph string, schema *gripql.Graph) (map[string]*graphql.Object, error) { - objects := map[string]*graphql.Object{} - - for _, obj := range schema.Vertices { - if obj.Label == "Vertex" { - props := obj.GetDataMap() - if props == nil { - continue - } - props["id"] = "STRING" - gqlObj, err := buildObject(obj.Gid, props) - if err != nil { - return nil, err - } - if len(gqlObj.Fields()) > 0 { - objects[obj.Gid] = gqlObj - } - } - } - - // Setup outgoing edge fields - // Note: edge properties are not accessible in this model - for i, obj := range schema.Edges { - if _, ok := objects[obj.From]; ok { - if _, ok := objects[obj.To]; ok { - obj := obj // This makes an inner loop copy of the variable that is used by the Resolve function - fname := obj.Label - //ensure the fname is unique - for j := range schema.Edges { - if i != j { - if schema.Edges[i].From == schema.Edges[j].From && schema.Edges[i].Label == schema.Edges[j].Label { - fname = obj.Label + "_to_" + obj.To - } - } - } - - f := &graphql.Field{ - Name: fname, - Type: graphql.NewList(objects[obj.To]), - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - srcMap, ok := p.Source.(map[string]interface{}) - if !ok { - return nil, fmt.Errorf("source conversion failed: %v", p.Source) - } - srcGid, ok := srcMap["id"].(string) - if !ok { - return nil, fmt.Errorf("source gid conversion failed: %+v", srcMap) - } - q := gripql.V(srcGid).HasLabel(obj.From).Out(obj.Label).HasLabel(obj.To) - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := []interface{}{} - for r := range result { - d := r.GetVertex().GetDataMap() - d["id"] = r.GetVertex().Gid - out = append(out, d) - } - return out, nil - }, - } - fmt.Printf("building: %#v %s\n", f, obj.From) - objects[obj.From].AddFieldConfig(fname, f) - } - } - } - - return objects, nil -} - -func buildFieldConfigArgument(obj *graphql.Object) graphql.FieldConfigArgument { - args := graphql.FieldConfigArgument{ - ARG_ID: &graphql.ArgumentConfig{Type: graphql.String}, - ARG_IDS: &graphql.ArgumentConfig{Type: graphql.NewList(graphql.String)}, - ARG_LIMIT: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 100}, - ARG_OFFSET: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 0}, - ARG_FILTER: &graphql.ArgumentConfig{Type: JSONScalar}, - } - if obj == nil { - return args - } - for k, v := range obj.Fields() { - switch v.Type { - case graphql.String, graphql.Int, graphql.Float, graphql.Boolean: - args[k] = &graphql.ArgumentConfig{Type: v.Type} - default: - continue - } - } - return args -} - -func buildAggregationField(client gripql.Client, graph string, objects map[string]*graphql.Object) *graphql.Field { - - stringBucket := graphql.NewObject(graphql.ObjectConfig{ - Name: "BucketsForString", - Fields: graphql.Fields{ - "key": &graphql.Field{Name: "key", Type: graphql.String}, - "count": &graphql.Field{Name: "count", Type: graphql.Int}, - }, - }) - - histogram := graphql.NewObject(graphql.ObjectConfig{ - Name: "Histogram", - Fields: graphql.Fields{ - "histogram": &graphql.Field{ - Type: graphql.NewList(stringBucket), - }, - }, - }) - - queryFields := graphql.Fields{} - - for k, obj := range objects { - if len(obj.Fields()) > 0 { - label := obj.Name() - - aggFields := graphql.Fields{ - "_totalCount": &graphql.Field{Name: "_totalCount", Type: graphql.Int}, - } - for k, v := range obj.Fields() { - switch v.Type { - case graphql.String: - aggFields[k] = - &graphql.Field{ - Name: k, - Type: histogram, - } - } - } - - ao := graphql.NewObject(graphql.ObjectConfig{ - Name: k + "Aggregation", - Fields: aggFields, - }) - queryFields[k+"Aggregation"] = &graphql.Field{ - Name: k + "Aggregation", - Type: ao, - Args: graphql.FieldConfigArgument{ - "filter": &graphql.ArgumentConfig{Type: JSONScalar}, - }, - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - var filter *FilterBuilder - if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok { - fmt.Printf("Filter: %#v\n", filterArg) - filter = NewFilterBuilder(filterArg) - } - q := gripql.V().HasLabel(label) - if filter != nil { - var err error - q, err = filter.ExtendGrip(q) - if err != nil { - return nil, err - } - } - - aggs := []*gripql.Aggregate{ - {Name: "_totalCount", Aggregation: &gripql.Aggregate_Count{}}, - } - - counts := map[string][]any{} - for _, i := range p.Info.FieldASTs { - if i.SelectionSet != nil { - for _, j := range i.SelectionSet.Selections { - if k, ok := j.(*ast.Field); ok { - if k.Name.Value != "_totalCount" { - aggs = append(aggs, &gripql.Aggregate{ - Name: k.Name.Value, - Aggregation: &gripql.Aggregate_Term{ - Term: &gripql.TermAggregation{ - Field: k.Name.Value, - }, - }, - }) - counts[k.Name.Value] = []any{} - } - } - } - } - } - - q = q.Aggregate(aggs) - - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := map[string]any{} - - for i := range result { - agg := i.GetAggregations() - if agg.Name == "_totalCount" { - out["_totalCount"] = int(agg.Value) - } else { - counts[agg.Name] = append(counts[agg.Name], map[string]any{ - "key": agg.Key, - "count": agg.Value, - }) - } - } - for k, v := range counts { - out[k] = map[string]any{"histogram": v} - } - return out, nil - }, - } - } - } - - aggregationObject := graphql.NewObject(graphql.ObjectConfig{ - Name: "AggregationObject", - Fields: queryFields, - }) - - return &graphql.Field{ - Name: "_aggregation", - Type: aggregationObject, - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - // top level resolve doesn't do anything - // but it needs to return an empty object so that the GraphQL - // library will go to the child fields and call their resolvers - return map[string]any{}, nil - }, - } - -} - -// buildQueryObject scans the built objects, which were derived from the list of vertex types -// found in the schema. It then build a query object that will take search parameters -// and create lists of objects of that type -func buildQueryObject(client gripql.Client, graph string, objects map[string]*graphql.Object) *graphql.Object { - - queryFields := graphql.Fields{} - // For each of the objects that have been listed in the objectMap build a query entry point - for objName, obj := range objects { - label := obj.Name() - f := &graphql.Field{ - Name: objName, - Type: graphql.NewList(obj), - Args: buildFieldConfigArgument(obj), - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - q := gripql.V().HasLabel(label) - if id, ok := p.Args[ARG_ID].(string); ok { - //fmt.Printf("Doing %s id=%s query", label, id) - q = gripql.V(id).HasLabel(label) - } - if ids, ok := p.Args[ARG_IDS].([]string); ok { - q = gripql.V(ids...).HasLabel(label) - } - var filter *FilterBuilder - if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok { - fmt.Printf("Filter: %#v\n", filterArg) - filter = NewFilterBuilder(filterArg) - } - for key, val := range p.Args { - switch key { - case ARG_ID, ARG_IDS, ARG_LIMIT, ARG_OFFSET, ARG_FILTER: - default: - q = q.Has(gripql.Eq(key, val)) - } - } - //if filter was passed, apply it - if filter != nil { - var err error - q, err = filter.ExtendGrip(q) - if err != nil { - return nil, err - } - } - limit := p.Args[ARG_LIMIT].(int) - offset := p.Args[ARG_OFFSET].(int) - q = q.Skip(uint32(offset)).Limit(uint32(limit)) - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := []interface{}{} - for r := range result { - //fmt.Printf("ID query traversal: %s\n", r) - d := r.GetVertex().GetDataMap() - d["id"] = r.GetVertex().Gid - out = append(out, d) - } - return out, nil - }, - } - - queryFields[objName] = f - } - - queryFields["_aggregation"] = buildAggregationField(client, graph, objects) - - query := graphql.NewObject( - graphql.ObjectConfig{ - Name: "Query", - Fields: queryFields, - }, - ) - fmt.Printf("Query fields: %#v\n", queryFields) - return query -} diff --git a/endpoints/graphql/filter_build.go b/endpoints/graphql/filter_build.go deleted file mode 100644 index 3d19c43d6..000000000 --- a/endpoints/graphql/filter_build.go +++ /dev/null @@ -1,78 +0,0 @@ -package main - -import ( - "github.com/bmeg/grip/log" - - "github.com/bmeg/grip/gripql" -) - -type FilterBuilder struct { - filter map[string]any -} - -func NewFilterBuilder(i map[string]any) *FilterBuilder { - return &FilterBuilder{i} -} - -func isFilterEQ(q map[string]any) (any, bool) { - for _, i := range []string{"=", "eq", "EQ"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func isFilterGT(q map[string]any) (any, bool) { - for _, i := range []string{">", "gt", "GT"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func isFilterLT(q map[string]any) (any, bool) { - for _, i := range []string{"<", "lt", "LT"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func fieldMap(s string) string { - if s == "id" { - return "_gid" - } - return s -} - -func (fb *FilterBuilder) ExtendGrip(q *gripql.Query) (*gripql.Query, error) { - if val, ok := isFilterEQ(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Eq(k, v)) - } - } - } - if val, ok := isFilterGT(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Gt(k, v)) - } - } - } - if val, ok := isFilterLT(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Lt(k, v)) - } - } - } - log.Infof("Filter Query %s", q.String()) - return q, nil -} diff --git a/endpoints/graphql/handler.go b/endpoints/graphql/handler.go deleted file mode 100644 index 33b48dc17..000000000 --- a/endpoints/graphql/handler.go +++ /dev/null @@ -1,129 +0,0 @@ -/* -GraphQL Web endpoint -*/ - -package main - -import ( - "fmt" - "net/http" - - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/graphql-go/handler" -) - -// handle the graphql queries for a single endpoint -type graphHandler struct { - graph string - gqlHandler *handler.Handler - timestamp string - client gripql.Client - //schema *gripql.Graph -} - -// Handler is a GraphQL endpoint to query the Grip database -type Handler struct { - handlers map[string]*graphHandler - client gripql.Client -} - -// NewClientHTTPHandler initilizes a new GraphQLHandler -func NewHTTPHandler(client gripql.Client) (http.Handler, error) { - h := &Handler{ - client: client, - handlers: map[string]*graphHandler{}, - } - return h, nil -} - -// Static HTML that links to Apollo GraphQL query editor -var sandBox = ` -
    - -` - -// ServeHTTP responds to HTTP graphql requests -func (gh *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { - //log.Infof("Request for %s", request.URL.Path) - //If no graph provided, return the Query Editor page - if request.URL.Path == "" || request.URL.Path == "/" { - writer.Write([]byte(sandBox)) - return - } - //pathRE := regexp.MustCompile("/(.+)$") - //graphName := pathRE.FindStringSubmatch(request.URL.Path)[1] - graphName := request.URL.Path - var handler *graphHandler - var ok bool - if handler, ok = gh.handlers[graphName]; ok { - //Call the setup function. If nothing has changed it will return without doing anything - err := handler.setup() - if err != nil { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - return - } - } else { - //Graph handler was not found, so we'll need to set it up - var err error - handler, err = newGraphHandler(graphName, gh.client) - if err != nil { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - return - } - gh.handlers[graphName] = handler - } - if handler != nil && handler.gqlHandler != nil { - handler.gqlHandler.ServeHTTP(writer, request) - } else { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - } -} - -// newGraphHandler creates a new graphql handler from schema -func newGraphHandler(graph string, client gripql.Client) (*graphHandler, error) { - o := &graphHandler{ - graph: graph, - client: client, - } - err := o.setup() - if err != nil { - return nil, err - } - return o, nil -} - -// check timestamp to see if schema needs to be updated, and if so -// rebuild graphql schema -func (gh *graphHandler) setup() error { - ts, _ := gh.client.GetTimestamp(gh.graph) - if ts == nil || ts.Timestamp != gh.timestamp { - log.WithFields(log.Fields{"graph": gh.graph}).Info("Reloading GraphQL schema") - schema, err := gh.client.GetSchema(gh.graph) - if err != nil { - log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GetSchema error") - return err - } - gqlSchema, err := buildGraphQLSchema(schema, gh.client, gh.graph) - if err != nil { - log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GraphQL schema build failed") - gh.gqlHandler = nil - gh.timestamp = "" - } else { - log.WithFields(log.Fields{"graph": gh.graph}).Info("Built GraphQL schema") - gh.gqlHandler = handler.New(&handler.Config{ - Schema: gqlSchema, - }) - gh.timestamp = ts.Timestamp - } - } - return nil -} diff --git a/endpoints/graphql/test/graphql_query_test.go b/endpoints/graphql/test/graphql_query_test.go deleted file mode 100644 index 7cc9f3800..000000000 --- a/endpoints/graphql/test/graphql_query_test.go +++ /dev/null @@ -1,110 +0,0 @@ -package test - -import ( - "fmt" - //"io/ioutil" - //"net/http" - //"bytes" - "context" - "testing" - - //"encoding/json" - - "github.com/bmeg/jsonpath" - "github.com/machinebox/graphql" -) - -var tests = [][]string{ - { - ` - query { - Character(id:"1"){ - id - name - starships_to_Starship { - name - } - } - } - `, - `{}`, - }, -} - -func TestQuerySet(t *testing.T) { - url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName) - client := graphql.NewClient(url) - - for _, pair := range tests { - req := graphql.NewRequest(pair[0]) - - ctx := context.Background() - respData := map[string]interface{}{} - if err := client.Run(ctx, req, &respData); err != nil { - t.Error(err) - } - //out, err := json.Marshal(respData) - //if err != nil { - // t.Error(err) - //} - //fmt.Printf("out: %s\n", out) - } -} - -func TestCharacterQuery(t *testing.T) { - url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName) - client := graphql.NewClient(url) - - // make a request - req := graphql.NewRequest(` - query { - Character(id:"Character:1"){ - id - name - starships_to_Starship { - name - } - } - } - `) - - ctx := context.Background() - respData := map[string]interface{}{} - if err := client.Run(ctx, req, &respData); err != nil { - t.Error(err) - } - - out, err := jsonpath.JsonPathLookup(respData, "$.Character[0].id") - if err != nil { - t.Error(err) - } - if idStr, ok := out.(string); ok { - if idStr != "Character:1" { - t.Errorf("id mismatch: %s != %s", "Character:1", idStr) - } - } else { - t.Errorf("ID not string") - } -} - -func TestIntrospectionQuery(t *testing.T) { - url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName) - client := graphql.NewClient(url) - - // make a request - req := graphql.NewRequest(`{ - __type(name:"Character") { - fields { - name - description - } - } - }`) - - ctx := context.Background() - respData := map[string]interface{}{} - if err := client.Run(ctx, req, &respData); err != nil { - t.Error(err) - } - //fmt.Printf("Response: %#v\n", respData) -} diff --git a/endpoints/graphql/test/main_test.go b/endpoints/graphql/test/main_test.go deleted file mode 100644 index 6a8d02200..000000000 --- a/endpoints/graphql/test/main_test.go +++ /dev/null @@ -1,201 +0,0 @@ -package test - -import ( - "context" - "flag" - "fmt" - "log" - "net/http" - "os" - "sort" - "testing" - "time" - - "github.com/bmeg/grip/config" - "github.com/bmeg/grip/elastic" - "github.com/bmeg/grip/endpoints/graphql" - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/grids" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/gripql/schema" - "github.com/bmeg/grip/kvgraph" - _ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself - _ "github.com/bmeg/grip/kvi/boltdb" // import so bolt will register itself - _ "github.com/bmeg/grip/kvi/leveldb" // import so level will register itself - "github.com/bmeg/grip/mongo" - "github.com/bmeg/grip/psql" - "github.com/bmeg/grip/server" - "github.com/bmeg/grip/util" - _ "github.com/lib/pq" // import so postgres will register as a sql driver - //"google.golang.org/protobuf/encoding/protojson" -) - -var configFile string -var gdb gdbi.GraphDB -var db gdbi.GraphInterface -var dbname string -var vertices = []*gripql.Vertex{} -var edges = []*gripql.Edge{} - -var GraphQLAddr = "localhost:9080" -var GraphName = "test-graph" - -func setupGraph() error { - // sort edges/vertices and insert one at a time to ensure the same write order - sort.Slice(vertices[:], func(i, j int) bool { - return vertices[i].Gid < vertices[j].Gid - }) - for _, v := range vertices { - err := db.AddVertex([]*gdbi.Vertex{gdbi.NewElementFromVertex(v)}) - if err != nil { - return err - } - } - - sort.Slice(edges[:], func(i, j int) bool { - return edges[i].Gid < edges[j].Gid - }) - for _, e := range edges { - err := db.AddEdge([]*gdbi.Edge{gdbi.NewElementFromEdge(e)}) - if err != nil { - return err - } - } - - return nil -} - -func TestMain(m *testing.M) { - flag.StringVar(&configFile, "config", configFile, "config file to use for tests") - flag.Parse() - - configFile = "../" + configFile - - vertChan, err := util.StreamVerticesFromFile("../../conformance/graphs/swapi.vertices", 2) - if err != nil { - panic(err) - } - for v := range vertChan { - vertices = append(vertices, v) - } - edgeChan, err := util.StreamEdgesFromFile("../../conformance/graphs/swapi.edges", 2) - if err != nil { - panic(err) - } - for e := range edgeChan { - edges = append(edges, e) - } - - var exit = 1 - - defer func() { - fmt.Println("tests exiting with code", exit) - os.Exit(exit) - }() - - conf := config.DefaultConfig() - if configFile != "" { - err := config.ParseConfigFile(configFile, conf) - if err != nil { - fmt.Printf("error processing config file: %v", err) - return - } - } - - config.TestifyConfig(conf) - fmt.Printf("Test config: %+v\n", conf) - dbconfig := conf.Drivers[conf.Default] - - if dbconfig.Badger != nil { - gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Badger) - defer func() { - os.RemoveAll(*dbconfig.Badger) - }() - } else if dbconfig.Bolt != nil { - gdb, err = kvgraph.NewKVGraphDB("bolt", *dbconfig.Bolt) - defer func() { - os.RemoveAll(*dbconfig.Bolt) - }() - } else if dbconfig.Level != nil { - gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Level) - defer func() { - os.RemoveAll(*dbconfig.Level) - }() - } else if dbconfig.Grids != nil { - gdb, err = grids.NewGraphDB(*dbconfig.Grids) - defer func() { - os.RemoveAll(*dbconfig.Grids) - }() - } else if dbconfig.Elasticsearch != nil { - gdb, err = elastic.NewGraphDB(*dbconfig.Elasticsearch) - } else if dbconfig.MongoDB != nil { - gdb, err = mongo.NewGraphDB(*dbconfig.MongoDB) - } else if dbconfig.PSQL != nil { - gdb, err = psql.NewGraphDB(*dbconfig.PSQL) - } else { - err = fmt.Errorf("unknown database") - } - - err = gdb.AddGraph(GraphName) - if err != nil { - fmt.Println("Error: failed to add graph:", err) - return - } - - db, err = gdb.Graph(GraphName) - if err != nil { - fmt.Println("Error: failed to connect to graph:", err) - return - } - - if dbname != "existing-sql" { - err = setupGraph() - if err != nil { - fmt.Println("Error: setting up graph:", err) - return - } - } - - srv, err := server.NewGripServer(conf, "./", map[string]gdbi.GraphDB{conf.Default: gdb}) - if err != nil { - fmt.Println("Error: failed to init server", err) - return - } - - conn := gripql.WrapClient(gripql.NewQueryDirectClient(srv), gripql.NewEditDirectClient(srv), nil, nil) - - sch, err := schema.ScanSchema(conn, GraphName, 10, []string{}) - if err != nil { - fmt.Println("Error: failed to init server", err) - return - } - - //fmt.Printf("Adding Schema: %s\n", protojson.Format(sch)) - err = conn.AddSchema(sch) - if err != nil { - fmt.Printf("Error: failed to add schema %s\n", err) - return - } - gqlHandler, err := graphql.NewClientHTTPHandler(conn) - - httpServer := http.Server{Addr: GraphQLAddr, Handler: gqlHandler} - - go func() { - if err := httpServer.ListenAndServe(); err != http.ErrServerClosed { - // Error starting or closing listener: - log.Fatalf("HTTP server ListenAndServe: %v", err) - } - }() - - defer os.RemoveAll(conf.Server.WorkDir) - time.Sleep(time.Second) - - // run tests - exit = m.Run() - - if err := httpServer.Shutdown(context.Background()); err != nil { - // Error from closing listeners, or context timeout: - log.Printf("HTTP server Shutdown: %v", err) - } - -} diff --git a/endpoints/graphqlv2/builder.go b/endpoints/graphqlv2/builder.go deleted file mode 100644 index b18b79a4b..000000000 --- a/endpoints/graphqlv2/builder.go +++ /dev/null @@ -1,563 +0,0 @@ -package main - -import ( - "fmt" - - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/graphql-go/graphql" - "github.com/graphql-go/graphql/language/ast" -) - -const ARG_LIMIT = "first" -const ARG_OFFSET = "offset" -const ARG_ID = "id" -const ARG_IDS = "ids" -const ARG_FILTER = "filter" - -var JSONScalar = graphql.NewScalar(graphql.ScalarConfig{ - Name: "JSON", - Serialize: func(value interface{}) interface{} { - return fmt.Sprintf("Serialize %v", value) - }, - ParseValue: func(value interface{}) interface{} { - fmt.Printf("Unmarshal JSON: %v %T\n", value, value) - return value - }, - ParseLiteral: func(valueAST ast.Value) interface{} { - fmt.Printf("ParseLiteral: %#v\n", valueAST) - /* - switch valueAST := valueAST.(type) { - case *ast.StringValue: - id, _ := models.IDFromString(valueAST.Value) - return id - default: - return nil - }*/ - return nil - }, -}) - -// buildGraphQLSchema reads a GRIP graph schema (which is stored as a graph) and creates -// a GraphQL-GO based schema. The GraphQL-GO schema all wraps the request functions that use -// the gripql.Client to find the requested data -func buildGraphQLSchema(schema *gripql.Graph, client gripql.Client, graph string) (*graphql.Schema, error) { - if schema == nil { - return nil, fmt.Errorf("graphql.NewSchema error: nil gripql.Graph for graph: %s", graph) - } - // Build the set of objects for all vertex labels - objectMap, err := buildObjectMap(client, graph, schema) - if err != nil { - return nil, fmt.Errorf("graphql.NewSchema error: %v", err) - } - - // Build the set of objects that exist in the query structuer - queryObj := buildQueryObject(client, graph, objectMap) - schemaConfig := graphql.SchemaConfig{ - Query: queryObj, - } - - // Setup the GraphQL schema based on the objects there have been created - gqlSchema, err := graphql.NewSchema(schemaConfig) - if err != nil { - return nil, fmt.Errorf("graphql.NewSchema error: %v", err) - } - - return &gqlSchema, nil -} - -func buildField(x string) (*graphql.Field, error) { - var o *graphql.Field - switch x { - case "NUMERIC": - o = &graphql.Field{Type: graphql.Float} - case "STRING": - o = &graphql.Field{Type: graphql.String} - case "BOOL": - o = &graphql.Field{Type: graphql.Boolean} - default: - return nil, fmt.Errorf("%s does not map to a GQL type", x) - } - return o, nil -} - -func buildSliceField(name string, s []interface{}) (*graphql.Field, error) { - var f *graphql.Field - var err error - - if len(s) > 0 { - val := s[0] - if x, ok := val.(map[string]interface{}); ok { - f, err = buildObjectField(name, x) - } else if x, ok := val.([]interface{}); ok { - f, err = buildSliceField(name, x) - - } else if x, ok := val.(string); ok { - f, err = buildField(x) - } else { - err = fmt.Errorf("unhandled type: %T %v", val, val) - } - - } else { - err = fmt.Errorf("slice is empty") - } - - if err != nil { - return nil, fmt.Errorf("buildSliceField error: %v", err) - } - - return &graphql.Field{Type: graphql.NewList(f.Type)}, nil -} - -// buildObjectField wraps the result of buildObject in a graphql.Field so it can be -// a child of slice of another -func buildObjectField(name string, obj map[string]interface{}) (*graphql.Field, error) { - o, err := buildObject(name, obj) - if err != nil { - return nil, err - } - if len(o.Fields()) == 0 { - return nil, fmt.Errorf("no fields in object") - } - return &graphql.Field{Type: o}, nil -} - -func buildObject(name string, obj map[string]interface{}) (*graphql.Object, error) { - objFields := graphql.Fields{} - - for key, val := range obj { - var err error - - // handle map - if x, ok := val.(map[string]interface{}); ok { - // make object name parent_field - var f *graphql.Field - f, err = buildObjectField(name+"_"+key, x) - if err == nil { - objFields[key] = f - } - // handle slice - } else if x, ok := val.([]interface{}); ok { - var f *graphql.Field - f, err = buildSliceField(key, x) - if err == nil { - objFields[key] = f - } - // handle string - } else if x, ok := val.(string); ok { - if f, err := buildField(x); err == nil { - objFields[key] = f - } else { - log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildField ignoring field") - } - // handle other cases - } else { - err = fmt.Errorf("unhandled type: %T %v", val, val) - } - - if err != nil { - log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildObject") - // return nil, fmt.Errorf("object: %s: field: %s: error: %v", name, key, err) - } - } - - return graphql.NewObject( - graphql.ObjectConfig{ - Name: name, - Fields: objFields, - }, - ), nil -} - -type objectMap struct { - objects map[string]*graphql.Object - edgeLabel map[string]map[string]string - edgeDstType map[string]map[string]string -} - -// buildObjectMap scans the GripQL schema and turns all of the vertex types into different objects -func buildObjectMap(client gripql.Client, graph string, schema *gripql.Graph) (*objectMap, error) { - objects := map[string]*graphql.Object{} - edgeLabel := map[string]map[string]string{} - edgeDstType := map[string]map[string]string{} - - for _, obj := range schema.Vertices { - if obj.Label == "Vertex" { - props := obj.GetDataMap() - if props == nil { - continue - } - props["id"] = "STRING" - gqlObj, err := buildObject(obj.Gid, props) - if err != nil { - return nil, err - } - if len(gqlObj.Fields()) > 0 { - objects[obj.Gid] = gqlObj - } - } - edgeLabel[obj.Gid] = map[string]string{} - edgeDstType[obj.Gid] = map[string]string{} - } - - // Setup outgoing edge fields - // Note: edge properties are not accessible in this model - for i, obj := range schema.Edges { - if _, ok := objects[obj.From]; ok { - if _, ok := objects[obj.To]; ok { - obj := obj // This makes an inner loop copy of the variable that is used by the Resolve function - fname := obj.Label - - //ensure the fname is unique - for j := range schema.Edges { - if i != j { - if schema.Edges[i].From == schema.Edges[j].From && schema.Edges[i].Label == schema.Edges[j].Label { - fname = obj.Label + "_to_" + obj.To - } - } - } - edgeLabel[obj.From][fname] = obj.Label - edgeDstType[obj.From][fname] = obj.To - - f := &graphql.Field{ - Name: fname, - Type: graphql.NewList(objects[obj.To]), - /* - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - srcMap, ok := p.Source.(map[string]interface{}) - if !ok { - return nil, fmt.Errorf("source conversion failed: %v", p.Source) - } - srcGid, ok := srcMap["id"].(string) - if !ok { - return nil, fmt.Errorf("source gid conversion failed: %+v", srcMap) - } - fmt.Printf("Field resolve: %s\n", srcGid) - q := gripql.V(srcGid).HasLabel(obj.From).Out(obj.Label).HasLabel(obj.To) - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := []interface{}{} - for r := range result { - d := r.GetVertex().GetDataMap() - d["id"] = r.GetVertex().Gid - out = append(out, d) - } - return out, nil - }, - */ - } - fmt.Printf("building: %#v %s\n", f, obj.From) - objects[obj.From].AddFieldConfig(fname, f) - } - } - } - - return &objectMap{objects: objects, edgeLabel: edgeLabel, edgeDstType: edgeDstType}, nil -} - -func buildFieldConfigArgument(obj *graphql.Object) graphql.FieldConfigArgument { - args := graphql.FieldConfigArgument{ - ARG_ID: &graphql.ArgumentConfig{Type: graphql.String}, - ARG_IDS: &graphql.ArgumentConfig{Type: graphql.NewList(graphql.String)}, - ARG_LIMIT: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 100}, - ARG_OFFSET: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 0}, - ARG_FILTER: &graphql.ArgumentConfig{Type: JSONScalar}, - } - if obj == nil { - return args - } - for k, v := range obj.Fields() { - switch v.Type { - case graphql.String, graphql.Int, graphql.Float, graphql.Boolean: - args[k] = &graphql.ArgumentConfig{Type: v.Type} - default: - continue - } - } - return args -} - -func buildAggregationField(client gripql.Client, graph string, objects *objectMap) *graphql.Field { - - stringBucket := graphql.NewObject(graphql.ObjectConfig{ - Name: "BucketsForString", - Fields: graphql.Fields{ - "key": &graphql.Field{Name: "key", Type: graphql.String}, - "count": &graphql.Field{Name: "count", Type: graphql.Int}, - }, - }) - - histogram := graphql.NewObject(graphql.ObjectConfig{ - Name: "Histogram", - Fields: graphql.Fields{ - "histogram": &graphql.Field{ - Type: graphql.NewList(stringBucket), - }, - }, - }) - - queryFields := graphql.Fields{} - - for k, obj := range objects.objects { - if len(obj.Fields()) > 0 { - label := obj.Name() - - aggFields := graphql.Fields{ - "_totalCount": &graphql.Field{Name: "_totalCount", Type: graphql.Int}, - } - for k, v := range obj.Fields() { - switch v.Type { - case graphql.String: - aggFields[k] = - &graphql.Field{ - Name: k, - Type: histogram, - } - } - } - - ao := graphql.NewObject(graphql.ObjectConfig{ - Name: k + "Aggregation", - Fields: aggFields, - }) - queryFields[k+"Aggregation"] = &graphql.Field{ - Name: k + "Aggregation", - Type: ao, - Args: graphql.FieldConfigArgument{ - "filter": &graphql.ArgumentConfig{Type: JSONScalar}, - }, - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - var filter *FilterBuilder - if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok { - fmt.Printf("Filter: %#v\n", filterArg) - filter = NewFilterBuilder(filterArg) - } - q := gripql.V().HasLabel(label) - if filter != nil { - var err error - q, err = filter.ExtendGrip(q) - if err != nil { - return nil, err - } - } - - aggs := []*gripql.Aggregate{ - {Name: "_totalCount", Aggregation: &gripql.Aggregate_Count{}}, - } - - counts := map[string][]any{} - for _, i := range p.Info.FieldASTs { - if i.SelectionSet != nil { - for _, j := range i.SelectionSet.Selections { - if k, ok := j.(*ast.Field); ok { - if k.Name.Value != "_totalCount" { - aggs = append(aggs, &gripql.Aggregate{ - Name: k.Name.Value, - Aggregation: &gripql.Aggregate_Term{ - Term: &gripql.TermAggregation{ - Field: k.Name.Value, - }, - }, - }) - counts[k.Name.Value] = []any{} - } - } - } - } - } - - q = q.Aggregate(aggs) - - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := map[string]any{} - - for i := range result { - agg := i.GetAggregations() - if agg.Name == "_totalCount" { - out["_totalCount"] = int(agg.Value) - } else { - counts[agg.Name] = append(counts[agg.Name], map[string]any{ - "key": agg.Key, - "count": agg.Value, - }) - } - } - for k, v := range counts { - out[k] = map[string]any{"histogram": v} - } - return out, nil - }, - } - } - } - - aggregationObject := graphql.NewObject(graphql.ObjectConfig{ - Name: "AggregationObject", - Fields: queryFields, - }) - - return &graphql.Field{ - Name: "_aggregation", - Type: aggregationObject, - Resolve: func(p graphql.ResolveParams) (interface{}, error) { - // top level resolve doesn't do anything - // but it needs to return an empty object so that the GraphQL - // library will go to the child fields and call their resolvers - return map[string]any{}, nil - }, - } -} - -type renderTree struct { - fields []string - parent map[string]string - fieldName map[string]string -} - -func (rt *renderTree) NewElement(cur string, fieldName string) string { - rName := fmt.Sprintf("f%d", len(rt.fields)) - rt.fields = append(rt.fields, rName) - rt.parent[rName] = cur - rt.fieldName[rName] = fieldName - return rName -} - -func (om *objectMap) traversalBuild(query *gripql.Query, vertLabel string, field *ast.Field, curElement string, rt *renderTree) *gripql.Query { - //fmt.Printf("VertLabel: %s\n", vertLabel) - moved := false - for _, s := range field.SelectionSet.Selections { - if k, ok := s.(*ast.Field); ok { - if edgeLabel, ok := om.edgeLabel[vertLabel][k.Name.Value]; ok { - if dstLabel, ok := om.edgeDstType[vertLabel][k.Name.Value]; ok { - if moved { - query = query.Select(curElement) - } - rName := rt.NewElement(curElement, k.Name.Value) - query = query.OutNull(edgeLabel).As(rName) - query = om.traversalBuild(query, dstLabel, k, rName, rt) - moved = true - } - } - } - } - return query -} - -// buildQueryObject scans the built objects, which were derived from the list of vertex types -// found in the schema. It then build a query object that will take search parameters -// and create lists of objects of that type -func buildQueryObject(client gripql.Client, graph string, objects *objectMap) *graphql.Object { - - queryFields := graphql.Fields{} - // For each of the objects that have been listed in the objectMap build a query entry point - for objName, obj := range objects.objects { - label := obj.Name() - f := &graphql.Field{ - Name: objName, - Type: graphql.NewList(obj), - Args: buildFieldConfigArgument(obj), - Resolve: func(params graphql.ResolveParams) (interface{}, error) { - - q := gripql.V().HasLabel(label) - if id, ok := params.Args[ARG_ID].(string); ok { - //fmt.Printf("Doing %s id=%s query", label, id) - q = gripql.V(id).HasLabel(label) - } - if ids, ok := params.Args[ARG_IDS].([]string); ok { - q = gripql.V(ids...).HasLabel(label) - } - var filter *FilterBuilder - if filterArg, ok := params.Args[ARG_FILTER].(map[string]any); ok { - fmt.Printf("Filter: %#v\n", filterArg) - filter = NewFilterBuilder(filterArg) - } - for key, val := range params.Args { - switch key { - case ARG_ID, ARG_IDS, ARG_LIMIT, ARG_OFFSET, ARG_FILTER: - default: - q = q.Has(gripql.Eq(key, val)) - } - } - //if filter was passed, apply it - if filter != nil { - var err error - q, err = filter.ExtendGrip(q) - if err != nil { - return nil, err - } - } - - q = q.As("f0") - limit := params.Args[ARG_LIMIT].(int) - offset := params.Args[ARG_OFFSET].(int) - q = q.Skip(uint32(offset)).Limit(uint32(limit)) - - rt := &renderTree{ - fields: []string{"f0"}, - parent: map[string]string{}, - fieldName: map[string]string{}, - } - for _, f := range params.Info.FieldASTs { - q = objects.traversalBuild(q, label, f, "f0", rt) - } - - render := map[string]any{} - for _, i := range rt.fields { - render[i+"_gid"] = "$" + i + "._gid" - render[i+"_data"] = "$" + i + "._data" - } - q = q.Render(render) - fmt.Printf("query: %s\n", q.String()) - result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements}) - if err != nil { - return nil, err - } - out := []interface{}{} - for r := range result { - values := r.GetRender().GetStructValue().AsMap() - //fmt.Printf("render: %#v\n", values) - data := map[string]map[string]any{} - for _, r := range rt.fields { - v := values[r+"_data"] - if d, ok := v.(map[string]any); ok { - d["id"] = values[r+"_gid"] - if d["id"] != "" { - data[r] = d - } - } - } - for _, r := range rt.fields { - if parent, ok := rt.parent[r]; ok { - fieldName := rt.fieldName[r] - if data[r] != nil { - data[parent][fieldName] = []any{data[r]} - } - } - } - //jtxt, _ := json.MarshalIndent(data["f0"], "", " ") - //fmt.Printf("Data: %s\n", jtxt) - out = append(out, data["f0"]) - //fmt.Printf("ID query traversal: %s\n", r) - } - return out, nil - }, - } - queryFields[objName] = f - } - - queryFields["_aggregation"] = buildAggregationField(client, graph, objects) - - query := graphql.NewObject( - graphql.ObjectConfig{ - Name: "Query", - Fields: queryFields, - }, - ) - fmt.Printf("Query fields: %#v\n", queryFields) - return query -} diff --git a/endpoints/graphqlv2/filter_build.go b/endpoints/graphqlv2/filter_build.go deleted file mode 100644 index 3d19c43d6..000000000 --- a/endpoints/graphqlv2/filter_build.go +++ /dev/null @@ -1,78 +0,0 @@ -package main - -import ( - "github.com/bmeg/grip/log" - - "github.com/bmeg/grip/gripql" -) - -type FilterBuilder struct { - filter map[string]any -} - -func NewFilterBuilder(i map[string]any) *FilterBuilder { - return &FilterBuilder{i} -} - -func isFilterEQ(q map[string]any) (any, bool) { - for _, i := range []string{"=", "eq", "EQ"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func isFilterGT(q map[string]any) (any, bool) { - for _, i := range []string{">", "gt", "GT"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func isFilterLT(q map[string]any) (any, bool) { - for _, i := range []string{"<", "lt", "LT"} { - if val, ok := q[i]; ok { - return val, ok - } - } - return nil, false -} - -func fieldMap(s string) string { - if s == "id" { - return "_gid" - } - return s -} - -func (fb *FilterBuilder) ExtendGrip(q *gripql.Query) (*gripql.Query, error) { - if val, ok := isFilterEQ(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Eq(k, v)) - } - } - } - if val, ok := isFilterGT(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Gt(k, v)) - } - } - } - if val, ok := isFilterLT(fb.filter); ok { - if vMap, ok := val.(map[string]any); ok { - for k, v := range vMap { - k = fieldMap(k) - q = q.Has(gripql.Lt(k, v)) - } - } - } - log.Infof("Filter Query %s", q.String()) - return q, nil -} diff --git a/endpoints/graphqlv2/handler.go b/endpoints/graphqlv2/handler.go deleted file mode 100644 index 33b48dc17..000000000 --- a/endpoints/graphqlv2/handler.go +++ /dev/null @@ -1,129 +0,0 @@ -/* -GraphQL Web endpoint -*/ - -package main - -import ( - "fmt" - "net/http" - - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/graphql-go/handler" -) - -// handle the graphql queries for a single endpoint -type graphHandler struct { - graph string - gqlHandler *handler.Handler - timestamp string - client gripql.Client - //schema *gripql.Graph -} - -// Handler is a GraphQL endpoint to query the Grip database -type Handler struct { - handlers map[string]*graphHandler - client gripql.Client -} - -// NewClientHTTPHandler initilizes a new GraphQLHandler -func NewHTTPHandler(client gripql.Client) (http.Handler, error) { - h := &Handler{ - client: client, - handlers: map[string]*graphHandler{}, - } - return h, nil -} - -// Static HTML that links to Apollo GraphQL query editor -var sandBox = ` -
    - -` - -// ServeHTTP responds to HTTP graphql requests -func (gh *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) { - //log.Infof("Request for %s", request.URL.Path) - //If no graph provided, return the Query Editor page - if request.URL.Path == "" || request.URL.Path == "/" { - writer.Write([]byte(sandBox)) - return - } - //pathRE := regexp.MustCompile("/(.+)$") - //graphName := pathRE.FindStringSubmatch(request.URL.Path)[1] - graphName := request.URL.Path - var handler *graphHandler - var ok bool - if handler, ok = gh.handlers[graphName]; ok { - //Call the setup function. If nothing has changed it will return without doing anything - err := handler.setup() - if err != nil { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - return - } - } else { - //Graph handler was not found, so we'll need to set it up - var err error - handler, err = newGraphHandler(graphName, gh.client) - if err != nil { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - return - } - gh.handlers[graphName] = handler - } - if handler != nil && handler.gqlHandler != nil { - handler.gqlHandler.ServeHTTP(writer, request) - } else { - http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError) - } -} - -// newGraphHandler creates a new graphql handler from schema -func newGraphHandler(graph string, client gripql.Client) (*graphHandler, error) { - o := &graphHandler{ - graph: graph, - client: client, - } - err := o.setup() - if err != nil { - return nil, err - } - return o, nil -} - -// check timestamp to see if schema needs to be updated, and if so -// rebuild graphql schema -func (gh *graphHandler) setup() error { - ts, _ := gh.client.GetTimestamp(gh.graph) - if ts == nil || ts.Timestamp != gh.timestamp { - log.WithFields(log.Fields{"graph": gh.graph}).Info("Reloading GraphQL schema") - schema, err := gh.client.GetSchema(gh.graph) - if err != nil { - log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GetSchema error") - return err - } - gqlSchema, err := buildGraphQLSchema(schema, gh.client, gh.graph) - if err != nil { - log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GraphQL schema build failed") - gh.gqlHandler = nil - gh.timestamp = "" - } else { - log.WithFields(log.Fields{"graph": gh.graph}).Info("Built GraphQL schema") - gh.gqlHandler = handler.New(&handler.Config{ - Schema: gqlSchema, - }) - gh.timestamp = ts.Timestamp - } - } - return nil -} diff --git a/engine/core/compile.go b/engine/core/compile.go index d83454fcf..4c2fc8b6c 100644 --- a/engine/core/compile.go +++ b/engine/core/compile.go @@ -3,12 +3,8 @@ package core import ( "fmt" - "github.com/bmeg/grip/engine/logic" - "github.com/bmeg/grip/engine/pipeline" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" - "github.com/bmeg/grip/util/protoutil" ) // DefaultPipeline a set of runnable query operations @@ -19,7 +15,7 @@ type DefaultPipeline struct { markTypes map[string]gdbi.DataType } -func NewPipeline(graph gdbi.GraphInterface, procs []gdbi.Processor, ps *pipeline.State) *DefaultPipeline { +func NewPipeline(graph gdbi.GraphInterface, procs []gdbi.Processor, ps *gdbi.State) *DefaultPipeline { return &DefaultPipeline{graph, procs, ps.LastType, ps.MarkTypes} } @@ -70,17 +66,26 @@ func (comp DefaultCompiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.C stmts = o(stmts) } - ps := pipeline.NewPipelineState(stmts) + storeMarks := false if opts != nil { - ps.LastType = opts.PipelineExtension - ps.MarkTypes = opts.ExtensionMarkTypes + storeMarks = opts.StoreMarks + } + + ps := gdbi.NewPipelineState(stmts, storeMarks) + if opts != nil { + if opts.Extends != nil { + ps.LastType = opts.Extends.StartType + ps.MarkTypes = opts.Extends.MarksTypes + } } procs := make([]gdbi.Processor, 0, len(stmts)) + sproc := &DefaultStmtCompiler{comp.db} + for i, gs := range stmts { ps.SetCurStatment(i) - p, err := StatementProcessor(gs, comp.db, ps) + p, err := gdbi.StatementProcessor(sproc, gs, comp.db, ps) if err != nil { return &DefaultPipeline{}, err } @@ -90,290 +95,16 @@ func (comp DefaultCompiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.C return &DefaultPipeline{comp.db, procs, ps.LastType, ps.MarkTypes}, nil } -func StatementProcessor(gs *gripql.GraphStatement, db gdbi.GraphInterface, ps *pipeline.State) (gdbi.Processor, error) { - switch stmt := gs.GetStatement().(type) { - - case *gripql.GraphStatement_V: - if ps.LastType != gdbi.NoData { - return nil, fmt.Errorf(`"V" statement is only valid at the beginning of the traversal`) - } - ids := protoutil.AsStringList(stmt.V) - ps.LastType = gdbi.VertexData - return &LookupVerts{db: db, ids: ids, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_E: - if ps.LastType != gdbi.NoData { - return nil, fmt.Errorf(`"E" statement is only valid at the beginning of the traversal`) - } - ids := protoutil.AsStringList(stmt.E) - ps.LastType = gdbi.EdgeData - return &LookupEdges{db: db, ids: ids, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_In: - labels := protoutil.AsStringList(gs.GetIn()) - if ps.LastType == gdbi.VertexData { - ps.LastType = gdbi.VertexData - return &LookupVertexAdjIn{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else if ps.LastType == gdbi.EdgeData { - ps.LastType = gdbi.VertexData - return &LookupEdgeAdjIn{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else { - return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - - case *gripql.GraphStatement_InNull: - labels := protoutil.AsStringList(gs.GetInNull()) - if ps.LastType == gdbi.VertexData { - ps.LastType = gdbi.VertexData - return &LookupVertexAdjIn{db: db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil - } else if ps.LastType == gdbi.EdgeData { - ps.LastType = gdbi.VertexData - return &LookupEdgeAdjIn{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else { - return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - - case *gripql.GraphStatement_Out: - labels := protoutil.AsStringList(gs.GetOut()) - if ps.LastType == gdbi.VertexData { - ps.LastType = gdbi.VertexData - return &LookupVertexAdjOut{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else if ps.LastType == gdbi.EdgeData { - ps.LastType = gdbi.VertexData - return &LookupEdgeAdjOut{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else { - return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - - case *gripql.GraphStatement_OutNull: - labels := protoutil.AsStringList(gs.GetOutNull()) - if ps.LastType == gdbi.VertexData { - ps.LastType = gdbi.VertexData - return &LookupVertexAdjOut{db: db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil - } else if ps.LastType == gdbi.EdgeData { - ps.LastType = gdbi.VertexData - return &LookupEdgeAdjOut{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - } else { - return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - - case *gripql.GraphStatement_Both: - labels := protoutil.AsStringList(gs.GetBoth()) - if ps.LastType == gdbi.VertexData { - ps.LastType = gdbi.VertexData - return &both{db: db, labels: labels, lastType: gdbi.VertexData, toType: gdbi.VertexData, loadData: ps.StepLoadData()}, nil - } else if ps.LastType == gdbi.EdgeData { - ps.LastType = gdbi.VertexData - return &both{db: db, labels: labels, lastType: gdbi.EdgeData, toType: gdbi.VertexData, loadData: ps.StepLoadData()}, nil - } else { - return nil, fmt.Errorf(`"both" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - - case *gripql.GraphStatement_InE: - if ps.LastType != gdbi.VertexData { - return nil, fmt.Errorf(`"inEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.InE) - ps.LastType = gdbi.EdgeData - return &InE{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_InENull: - if ps.LastType != gdbi.VertexData { - return nil, fmt.Errorf(`"inEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.InENull) - ps.LastType = gdbi.EdgeData - return &InE{db: db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil - - case *gripql.GraphStatement_OutE: - if ps.LastType != gdbi.VertexData { - return nil, fmt.Errorf(`"outEdgeNull" statement is only valid for the vertex type not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.OutE) - ps.LastType = gdbi.EdgeData - return &OutE{db: db, labels: labels, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_OutENull: - if ps.LastType != gdbi.VertexData { - return nil, fmt.Errorf(`"outEdgeNull" statement is only valid for the vertex type not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.OutENull) - ps.LastType = gdbi.EdgeData - return &OutE{db: db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil - - case *gripql.GraphStatement_BothE: - if ps.LastType != gdbi.VertexData { - return nil, fmt.Errorf(`"bothEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.BothE) - ps.LastType = gdbi.EdgeData - return &both{db: db, labels: labels, lastType: gdbi.VertexData, toType: gdbi.EdgeData, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_Has: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"Has" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - return &Has{stmt.Has}, nil - - case *gripql.GraphStatement_HasLabel: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"HasLabel" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - labels := protoutil.AsStringList(stmt.HasLabel) - if len(labels) == 0 { - return nil, fmt.Errorf(`no labels provided to "HasLabel" statement`) - } - return &HasLabel{labels}, nil - - case *gripql.GraphStatement_HasKey: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"HasKey" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - keys := protoutil.AsStringList(stmt.HasKey) - if len(keys) == 0 { - return nil, fmt.Errorf(`no keys provided to "HasKey" statement`) - } - return &HasKey{keys}, nil - - case *gripql.GraphStatement_HasId: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"HasId" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - ids := protoutil.AsStringList(stmt.HasId) - if len(ids) == 0 { - return nil, fmt.Errorf(`no ids provided to "HasId" statement`) - } - return &HasID{ids}, nil - - case *gripql.GraphStatement_Limit: - return &Limit{stmt.Limit}, nil - - case *gripql.GraphStatement_Skip: - return &Skip{stmt.Skip}, nil - - case *gripql.GraphStatement_Range: - return &Range{start: stmt.Range.Start, stop: stmt.Range.Stop}, nil - - case *gripql.GraphStatement_Count: - ps.LastType = gdbi.CountData - return &Count{}, nil - - case *gripql.GraphStatement_Distinct: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"distinct" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - fields := protoutil.AsStringList(stmt.Distinct) - if len(fields) == 0 { - fields = append(fields, "_gid") - } - return &Distinct{fields}, nil - - case *gripql.GraphStatement_As: - if ps.LastType == gdbi.NoData { - return nil, fmt.Errorf(`"mark" statement is not valid at the beginning of a traversal`) - } - if stmt.As == "" { - return nil, fmt.Errorf(`"mark" statement cannot have an empty name`) - } - if err := gripql.ValidateFieldName(stmt.As); err != nil { - return nil, fmt.Errorf(`"mark" statement invalid; %v`, err) - } - if stmt.As == jsonpath.Current { - return nil, fmt.Errorf(`"mark" statement invalid; uses reserved name %s`, jsonpath.Current) - } - ps.MarkTypes[stmt.As] = ps.LastType - return &Marker{stmt.As}, nil - - case *gripql.GraphStatement_Set: - return &ValueSet{key: stmt.Set.Key, value: stmt.Set.Value.AsInterface()}, nil - - case *gripql.GraphStatement_Increment: - return &ValueIncrement{key: stmt.Increment.Key, value: stmt.Increment.Value}, nil - - case *gripql.GraphStatement_Mark: - return &logic.JumpMark{Name: stmt.Mark}, nil - - case *gripql.GraphStatement_Jump: - j := &logic.Jump{Mark: stmt.Jump.Mark, Stmt: stmt.Jump.Expression, Emit: stmt.Jump.Emit} - return j, nil - - case *gripql.GraphStatement_Select: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"select" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - switch len(stmt.Select.Marks) { - case 0: - return nil, fmt.Errorf(`"select" statement has an empty list of mark names`) - case 1: - ps.LastType = ps.MarkTypes[stmt.Select.Marks[0]] - return &MarkSelect{stmt.Select.Marks[0]}, nil - default: - ps.LastType = gdbi.SelectionData - return &Selector{stmt.Select.Marks}, nil - } - - case *gripql.GraphStatement_Render: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"render" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - ps.LastType = gdbi.RenderData - return &Render{stmt.Render.AsInterface()}, nil - - case *gripql.GraphStatement_Path: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"path" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - ps.LastType = gdbi.PathData - return &Path{stmt.Path.AsSlice()}, nil - - case *gripql.GraphStatement_Unwind: - return &Unwind{stmt.Unwind}, nil - - case *gripql.GraphStatement_Fields: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"fields" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - fields := protoutil.AsStringList(stmt.Fields) - return &Fields{fields}, nil - - case *gripql.GraphStatement_Aggregate: - if ps.LastType != gdbi.VertexData && ps.LastType != gdbi.EdgeData { - return nil, fmt.Errorf(`"aggregate" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) - } - aggs := make(map[string]interface{}) - for _, a := range stmt.Aggregate.Aggregations { - if _, ok := aggs[a.Name]; ok { - return nil, fmt.Errorf("duplicate aggregation name '%s' found; all aggregations must have a unique name", a.Name) - } - } - ps.LastType = gdbi.AggregationData - return &aggregate{stmt.Aggregate.Aggregations}, nil - - //Custom graph statements - case *gripql.GraphStatement_LookupVertsIndex: - ps.LastType = gdbi.VertexData - return &LookupVertsIndex{db: db, labels: stmt.Labels, loadData: ps.StepLoadData()}, nil - - case *gripql.GraphStatement_EngineCustom: - proc := stmt.Custom.(gdbi.CustomProcGen) - ps.LastType = proc.GetType() - return proc.GetProcessor(db, ps) - - default: - return nil, fmt.Errorf("grip compile: unknown statement type: %s", gs.GetStatement()) - } -} - // Validate checks pipeline for chains of statements that won't work func Validate(stmts []*gripql.GraphStatement, opts *gdbi.CompileOptions) error { for i, gs := range stmts { // Validate that the first statement is V() or E() if i == 0 { switch gs.GetStatement().(type) { - case *gripql.GraphStatement_V, *gripql.GraphStatement_E: + case *gripql.GraphStatement_V: default: - if opts == nil || opts.PipelineExtension == gdbi.NoData { - return fmt.Errorf("first statement is not V() or E(): %s", gs) + if opts == nil || opts.Extends.StartType == gdbi.NoData { + return fmt.Errorf("first statement is not V(): %s", gs) } } } diff --git a/engine/core/optimize.go b/engine/core/optimize.go index 260eb1c5c..406330244 100644 --- a/engine/core/optimize.go +++ b/engine/core/optimize.go @@ -2,141 +2,94 @@ package core import ( "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/util/protoutil" ) -//IndexStartOptimize looks at processor pipeline for queries like -// V().Has(Eq("$.label", "Person")) and V().Has(Eq("$.gid", "1")), -// streamline into a single index lookup -func IndexStartOptimize(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { - optimized := []*gripql.GraphStatement{} +// OptimizationRule defines a structure for matching and replacing query pipeline patterns. +type OptimizationRule struct { + Match func(pipe []*gripql.GraphStatement) bool + Replace func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement +} - //var lookupV *gripql.GraphStatement_V - hasIDIdx := []int{} - hasLabelIdx := []int{} - isDone := false - for i, step := range pipe { - if isDone { - break - } - if i == 0 { - if v, ok := step.GetStatement().(*gripql.GraphStatement_V); ok { - if v.V != nil && len(v.V.Values) > 0 { - break - } - } else { - break - } - continue - } - switch s := step.GetStatement().(type) { - case *gripql.GraphStatement_HasId: - hasIDIdx = append(hasIDIdx, i) - case *gripql.GraphStatement_HasLabel: - hasLabelIdx = append(hasLabelIdx, i) - case *gripql.GraphStatement_Has: - if and := s.Has.GetAnd(); and != nil { - stmts := and.GetExpressions() - newPipe := []*gripql.GraphStatement{} - newPipe = append(newPipe, pipe[:i]...) - for _, stmt := range stmts { - newPipe = append(newPipe, &gripql.GraphStatement{Statement: &gripql.GraphStatement_Has{Has: stmt}}) - } - newPipe = append(newPipe, pipe[i+1:]...) - return IndexStartOptimize(newPipe) - } - if cond := s.Has.GetCondition(); cond != nil { - path := jsonpath.GetJSONPath(cond.Key) - switch path { - case "$.gid": - hasIDIdx = append(hasIDIdx, i) - case "$.label": - hasLabelIdx = append(hasLabelIdx, i) - default: - // do nothing - } - } - default: - isDone = true - } +func OptimizeHasLabelMatch(pipe []*gripql.GraphStatement) bool { + if len(pipe) < 2 { + return false } - - idOpt := false - if len(hasIDIdx) > 0 { - ids := []string{} - idx := hasIDIdx[0] - if has, ok := pipe[idx].GetStatement().(*gripql.GraphStatement_Has); ok { - ids = append(ids, extractHasVals(has)...) - } - if has, ok := pipe[idx].GetStatement().(*gripql.GraphStatement_HasId); ok { - ids = append(ids, protoutil.AsStringList(has.HasId)...) - } - if len(ids) > 0 { - idOpt = true - hIdx := &gripql.GraphStatement_V{V: protoutil.NewListFromStrings(ids)} - optimized = append(optimized, &gripql.GraphStatement{Statement: hIdx}) - } + if _, ok := pipe[0].GetStatement().(*gripql.GraphStatement_V); !ok { + return false } - - labelOpt := false - if len(hasLabelIdx) > 0 && !idOpt { - labels := []string{} - idx := hasLabelIdx[0] - if has, ok := pipe[idx].GetStatement().(*gripql.GraphStatement_Has); ok { - labels = append(labels, extractHasVals(has)...) - } - if has, ok := pipe[idx].GetStatement().(*gripql.GraphStatement_HasLabel); ok { - labels = append(labels, protoutil.AsStringList(has.HasLabel)...) - } - if len(labels) > 0 { - labelOpt = true - hIdx := &gripql.GraphStatement_LookupVertsIndex{Labels: labels} - optimized = append(optimized, &gripql.GraphStatement{Statement: hIdx}) - } + if hasLabel, ok := pipe[1].GetStatement().(*gripql.GraphStatement_HasLabel); ok { + return len(hasLabel.HasLabel.GetValues()) > 0 } + return false +} - for i, step := range pipe { - if idOpt || labelOpt { - if i == 0 { - continue +// startOptimizations is a list of rules to optimize the query pipeline. +var startOptimizations = []OptimizationRule{ + { + // Matches V().HasId(...) + Match: func(pipe []*gripql.GraphStatement) bool { + if len(pipe) < 2 { + return false } - } else { - optimized = append(optimized, step) - } - if idOpt { - if i != hasIDIdx[0] { - optimized = append(optimized, step) + if _, ok := pipe[0].GetStatement().(*gripql.GraphStatement_V); !ok { + return false } - } - if labelOpt { - if i != hasLabelIdx[0] { - optimized = append(optimized, step) + if hasId, ok := pipe[1].GetStatement().(*gripql.GraphStatement_HasId); ok { + return len(hasId.HasId.Values) > 0 + } + return false + }, + Replace: func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + ids := protoutil.AsStringList(pipe[1].GetHasId()) + optimized := []*gripql.GraphStatement{ + {Statement: &gripql.GraphStatement_V{V: protoutil.NewListFromStrings(ids)}}, + } + return append(optimized, pipe[2:]...) + }, + }, + { + // Matches V().HasLabel(...) + Match: OptimizeHasLabelMatch, + Replace: func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + labels := protoutil.AsStringList(pipe[1].GetHasLabel()) + optimized := []*gripql.GraphStatement{ + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: labels}}, + } + return append(optimized, pipe[2:]...) + }, + }, +} + +// expandHasAnd preprocesses the pipeline to split Has statements with And expressions. +func expandHasAnd(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + expanded := []*gripql.GraphStatement{} + for _, step := range pipe { + if has, ok := step.GetStatement().(*gripql.GraphStatement_Has); ok { + if and := has.Has.GetAnd(); and != nil { + for _, expr := range and.Expressions { + expanded = append(expanded, &gripql.GraphStatement{Statement: &gripql.GraphStatement_Has{Has: expr}}) + } + } else { + expanded = append(expanded, step) } + } else { + expanded = append(expanded, step) } } - - return optimized + return expanded } -func extractHasVals(h *gripql.GraphStatement_Has) []string { - vals := []string{} - if cond := h.Has.GetCondition(); cond != nil { - // path := jsonpath.GetJSONPath(cond.Key) - val := cond.Value.AsInterface() - switch cond.Condition { - case gripql.Condition_EQ: - if l, ok := val.(string); ok { - vals = []string{l} - } - case gripql.Condition_WITHIN: - v := val.([]interface{}) - for _, x := range v { - vals = append(vals, x.(string)) - } - default: - // do nothing +// IndexStartOptimize applies optimization rules to the query pipeline. +func IndexStartOptimize(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + // Preprocess to handle Has with And expressions + pipe = expandHasAnd(pipe) + // Apply the first matching optimization rule + for _, rule := range startOptimizations { + if rule.Match(pipe) { + return rule.Replace(pipe) } } - return vals + // Return the original pipeline if no optimizations apply + return pipe } diff --git a/engine/core/optimizer_test.go b/engine/core/optimizer_test.go index 496abc978..44bbe8a31 100644 --- a/engine/core/optimizer_test.go +++ b/engine/core/optimizer_test.go @@ -75,7 +75,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_WITHIN, - Key: "_gid", + Key: "_id", Value: value123, }, }}, @@ -97,7 +97,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_NEQ, - Key: "_gid", + Key: "_id", Value: value1, }, }}, @@ -111,7 +111,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_NEQ, - Key: "_gid", + Key: "_id", Value: value1, }, }}, @@ -157,7 +157,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_WITHIN, - Key: "_gid", + Key: "_id", Value: value123, }, }}, @@ -180,7 +180,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_WITHIN, - Key: "_gid", + Key: "_id", Value: value45, }, }}, @@ -195,7 +195,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_WITHIN, - Key: "_gid", + Key: "_id", Value: value45, }, }}, @@ -211,7 +211,7 @@ func TestIndexStartOptimize(t *testing.T) { } expected = []*gripql.GraphStatement{ - {Statement: &gripql.GraphStatement_LookupVertsIndex{Labels: []string{"foo", "bar"}}}, + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: []string{"foo", "bar"}}}, {Statement: &gripql.GraphStatement_Out{}}, } @@ -266,7 +266,7 @@ func TestIndexStartOptimize(t *testing.T) { } expected = []*gripql.GraphStatement{ - {Statement: &gripql.GraphStatement_LookupVertsIndex{Labels: []string{"foo", "bar"}}}, + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: []string{"foo", "bar"}}}, {Statement: &gripql.GraphStatement_Out{}}, } @@ -294,7 +294,7 @@ func TestIndexStartOptimize(t *testing.T) { barValue, _ := structpb.NewValue("bar") expected = []*gripql.GraphStatement{ - {Statement: &gripql.GraphStatement_LookupVertsIndex{Labels: []string{"foo", "bar"}}}, + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: []string{"foo", "bar"}}}, {Statement: &gripql.GraphStatement_Has{ Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ @@ -339,7 +339,7 @@ func TestIndexStartOptimize(t *testing.T) { bazValue, _ := structpb.NewValue("baz") expected = []*gripql.GraphStatement{ - {Statement: &gripql.GraphStatement_LookupVertsIndex{Labels: []string{"foo", "bar"}}}, + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: []string{"foo", "bar"}}}, {Statement: &gripql.GraphStatement_Has{ Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ @@ -374,7 +374,7 @@ func TestIndexStartOptimize(t *testing.T) { t.Error("indexStartOptimize returned an unexpected result") } - // use gid over label to optimize queries + // use _id over label to optimize queries expected = []*gripql.GraphStatement{ {Statement: &gripql.GraphStatement_V{V: protoutil.NewListFromStrings([]string{"1", "2", "3"})}}, {Statement: &gripql.GraphStatement_Has{ @@ -422,7 +422,7 @@ func TestIndexStartOptimize(t *testing.T) { Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ Condition: gripql.Condition_WITHIN, - Key: "_gid", + Key: "_id", Value: value123, }, }}, @@ -440,7 +440,7 @@ func TestIndexStartOptimize(t *testing.T) { // handle 'and' statements expected = []*gripql.GraphStatement{ - {Statement: &gripql.GraphStatement_LookupVertsIndex{Labels: []string{"foo", "bar"}}}, + {Statement: &gripql.GraphStatement_LookupVertsLabelIndex{Labels: []string{"foo", "bar"}}}, {Statement: &gripql.GraphStatement_Has{ Has: &gripql.HasExpression{Expression: &gripql.HasExpression_Condition{ Condition: &gripql.HasCondition{ diff --git a/engine/core/processors.go b/engine/core/processors.go index b37947d25..9a9cc0513 100644 --- a/engine/core/processors.go +++ b/engine/core/processors.go @@ -4,19 +4,13 @@ import ( "bytes" "context" "fmt" - "math" - "reflect" - "sort" "github.com/bmeg/grip/engine/logic" "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" - "github.com/bmeg/grip/log" + + //"github.com/bmeg/grip/log" "github.com/bmeg/grip/util/copy" - "github.com/influxdata/tdigest" "github.com/spf13/cast" - "golang.org/x/sync/errgroup" ) //////////////////////////////////////////////////////////////////////////////// @@ -67,14 +61,14 @@ func (l *LookupVerts) Process(ctx context.Context, man gdbi.Manager, in gdbi.InP //////////////////////////////////////////////////////////////////////////////// // LookupVertsIndex look up vertices by indexed based feature -type LookupVertsIndex struct { +type LookupVertsLabelIndex struct { db gdbi.GraphInterface labels []string loadData bool } // Process LookupVertsIndex -func (l *LookupVertsIndex) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { +func (l *LookupVertsLabelIndex) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { queryChan := make(chan gdbi.ElementLookup, 100) go func() { defer close(queryChan) @@ -94,12 +88,7 @@ func (l *LookupVertsIndex) Process(ctx context.Context, man gdbi.Manager, in gdb defer close(out) for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { i := v.Ref - out <- i.AddCurrent(&gdbi.DataElement{ - ID: v.Vertex.ID, - Label: v.Vertex.Label, - Data: v.Vertex.Data, - Loaded: v.Vertex.Loaded, - }) + out <- i.AddCurrent(v.Vertex.Copy()) } }() return ctx @@ -156,242 +145,6 @@ func (l *LookupEdges) Process(ctx context.Context, man gdbi.Manager, in gdbi.InP //////////////////////////////////////////////////////////////////////////////// -// LookupVertexAdjOut finds out vertex -type LookupVertexAdjOut struct { - db gdbi.GraphInterface - labels []string - loadData bool - emitNull bool -} - -// Process runs out vertex -func (l *LookupVertexAdjOut) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() || t.IsNull() { - queryChan <- gdbi.ElementLookup{ - Ref: t, - } - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrentID(), - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for ov := range l.db.GetOutChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddCurrent(ov.Vertex) - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// LookupEdgeAdjOut finds out edge -type LookupEdgeAdjOut struct { - db gdbi.GraphInterface - labels []string - loadData bool -} - -// Process runs LookupEdgeAdjOut -func (l *LookupEdgeAdjOut) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() { - queryChan <- gdbi.ElementLookup{Ref: t} - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrent().To, - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { - i := v.Ref - if i.IsSignal() { - out <- i - } else { - out <- i.AddCurrent(v.Vertex) - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// LookupVertexAdjIn finds incoming vertex -type LookupVertexAdjIn struct { - db gdbi.GraphInterface - labels []string - loadData bool - emitNull bool -} - -// Process runs LookupVertexAdjIn -func (l *LookupVertexAdjIn) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() { - queryChan <- gdbi.ElementLookup{Ref: t} - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrentID(), - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for v := range l.db.GetInChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { - i := v.Ref - if i.IsSignal() { - out <- i - } else { - out <- i.AddCurrent(v.Vertex) - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// LookupEdgeAdjIn finds incoming edge -type LookupEdgeAdjIn struct { - db gdbi.GraphInterface - labels []string - loadData bool -} - -// Process runs LookupEdgeAdjIn -func (l *LookupEdgeAdjIn) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() { - queryChan <- gdbi.ElementLookup{Ref: t} - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrent().From, - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { - i := v.Ref - if i.IsSignal() { - out <- i - } else { - out <- i.AddCurrent(v.Vertex) - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// InE finds the incoming edges -type InE struct { - db gdbi.GraphInterface - labels []string - loadData bool - emitNull bool -} - -// Process runs InE -func (l *InE) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() { - queryChan <- gdbi.ElementLookup{Ref: t} - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrentID(), - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for v := range l.db.GetInEdgeChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { - i := v.Ref - if i.IsSignal() { - out <- i - } else { - out <- i.AddCurrent(v.Edge) - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// OutE finds the outgoing edges -type OutE struct { - db gdbi.GraphInterface - labels []string - loadData bool - emitNull bool -} - -// Process runs OutE -func (l *OutE) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(queryChan) - for t := range in { - if t.IsSignal() { - queryChan <- gdbi.ElementLookup{Ref: t} - } else { - queryChan <- gdbi.ElementLookup{ - ID: t.GetCurrentID(), - Ref: t, - } - } - } - }() - go func() { - defer close(out) - for v := range l.db.GetOutEdgeChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { - i := v.Ref - out <- i.AddCurrent(v.Edge) - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - // Fields selects fields from current element type Fields struct { keys []string @@ -406,7 +159,7 @@ func (f *Fields) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out <- t continue } - o := jsonpath.SelectTravelerFields(t, f.keys...) + o := gdbi.SelectTravelerFields(t, f.keys...) out <- o } }() @@ -417,7 +170,7 @@ func (f *Fields) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, // Render takes current state and renders into requested structure type Render struct { - Template interface{} + Template any } // Process runs the render processor @@ -429,7 +182,7 @@ func (r *Render) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out <- t continue } - v := jsonpath.RenderTraveler(t, r.Template) + v := gdbi.RenderTraveler(t, r.Template) out <- &gdbi.BaseTraveler{Render: v} } }() @@ -440,7 +193,7 @@ func (r *Render) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, // Path tells system to return path data type Path struct { - Template interface{} //this isn't really used yet. + Template any //this isn't really used yet. } // Process runs the render processor @@ -474,77 +227,44 @@ func (r *Unwind) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out <- t continue } - v := jsonpath.TravelerPathLookup(t, r.Field) - if a, ok := v.([]interface{}); ok { + v := gdbi.TravelerPathLookup(t, r.Field) + //log.Debugln("UNWIND V RES: ", v) + if a, ok := v.([]any); ok { cur := t.GetCurrent() if len(a) > 0 { for _, i := range a { - o := gdbi.DataElement{ID: cur.ID, Label: cur.Label, From: cur.From, To: cur.To, Data: copy.DeepCopy(cur.Data).(map[string]interface{}), Loaded: true} + o := gdbi.DataElement{ + ID: cur.Get().ID, + Label: cur.Get().Label, + From: cur.Get().From, + To: cur.Get().To, + Data: copy.DeepCopy(cur.Get().Data).(map[string]any), Loaded: true, + } n := t.AddCurrent(&o) - jsonpath.TravelerSetValue(n, r.Field, i) + gdbi.TravelerSetValue(n, r.Field, i) out <- n } } else { - o := gdbi.DataElement{ID: cur.ID, Label: cur.Label, From: cur.From, To: cur.To, Data: copy.DeepCopy(cur.Data).(map[string]interface{}), Loaded: true} + o := gdbi.DataElement{ID: cur.Get().ID, Label: cur.Get().Label, From: cur.Get().From, To: cur.Get().To, Data: copy.DeepCopy(cur.Get().Data).(map[string]interface{}), Loaded: true} n := t.AddCurrent(&o) - jsonpath.TravelerSetValue(n, r.Field, nil) + gdbi.TravelerSetValue(n, r.Field, nil) out <- n } } else { cur := t.GetCurrent() - o := gdbi.DataElement{ID: cur.ID, Label: cur.Label, From: cur.From, To: cur.To, Data: copy.DeepCopy(cur.Data).(map[string]interface{}), Loaded: true} - n := t.AddCurrent(&o) - jsonpath.TravelerSetValue(n, r.Field, nil) - out <- n - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// Has filters based on data -type Has struct { - stmt *gripql.HasExpression -} - -// Process runs Has -func (w *Has) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - go func() { - defer close(out) - for t := range in { - if t.IsSignal() { - out <- t - continue - } - if logic.MatchesHasExpression(t, w.stmt) { - out <- t - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -// HasLabel filters elements based on their label. -type HasLabel struct { - labels []string -} - -// Process runs Count -func (h *HasLabel) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - labels := dedupStringSlice(h.labels) - go func() { - defer close(out) - for t := range in { - if t.IsSignal() { - out <- t - continue - } - if contains(labels, t.GetCurrent().Label) { - out <- t + // if outnull returns null cur can be empty + if cur.Get() != nil { + o := gdbi.DataElement{ + ID: cur.Get().ID, + Label: cur.Get().Label, + From: cur.Get().From, + To: cur.Get().To, + Data: copy.DeepCopy(cur.Get().Data).(map[string]any), Loaded: true, + } + n := t.AddCurrent(&o) + gdbi.TravelerSetValue(n, r.Field, nil) + out <- n + } } } }() @@ -553,55 +273,25 @@ func (h *HasLabel) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe //////////////////////////////////////////////////////////////////////////////// -// HasKey filters elements based on whether it has one or more properties. -type HasKey struct { - keys []string +// ToType +type ToType struct { + Field string + TypeName string } -// Process runs Count -func (h *HasKey) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { +func (tt *ToType) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { go func() { - keys := dedupStringSlice(h.keys) defer close(out) for t := range in { if t.IsSignal() { out <- t continue } - found := true - for _, key := range keys { - if !jsonpath.TravelerPathExists(t, key) { - found = false - } - } - if found { - out <- t - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// -// HasID filters elements based on their id. -type HasID struct { - ids []string -} + totype := logic.ConvertToType(gdbi.TravelerPathLookup(t, tt.Field), tt.TypeName) + gdbi.TravelerSetValue(t, tt.Field, totype) + out <- t -// Process runs Count -func (h *HasID) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - go func() { - defer close(out) - ids := dedupStringSlice(h.ids) - for t := range in { - if t.IsSignal() { - out <- t - continue - } - if contains(ids, t.GetCurrentID()) { - out <- t - } } }() return ctx @@ -729,6 +419,7 @@ func (g *Distinct) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe go func() { defer close(out) kv := man.GetTempKV() + defer kv.Close() for t := range in { if t.IsSignal() { out <- t @@ -737,8 +428,8 @@ func (g *Distinct) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe s := make([][]byte, len(g.vals)) found := true for i, v := range g.vals { - if jsonpath.TravelerPathExists(t, v) { - s[i] = []byte(fmt.Sprintf("%#v", jsonpath.TravelerPathLookup(t, v))) + if gdbi.TravelerPathExists(t, v) { + s[i] = []byte(fmt.Sprintf("%#v", gdbi.TravelerPathLookup(t, v))) } else { found = false } @@ -799,7 +490,7 @@ func (s *Selector) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe if val == nil { val = &gdbi.DataElement{} } - res[mark] = val + res[mark] = val.Get() } out <- &gdbi.BaseTraveler{Selections: res} } @@ -811,7 +502,7 @@ func (s *Selector) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe type ValueSet struct { key string - value interface{} + value any } func (s *ValueSet) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { @@ -822,7 +513,7 @@ func (s *ValueSet) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe out <- t continue } - jsonpath.TravelerSetValue(t, s.key, s.value) + gdbi.TravelerSetValue(t, s.key, s.value) out <- t } }() @@ -842,10 +533,10 @@ func (s *ValueIncrement) Process(ctx context.Context, man gdbi.Manager, in gdbi. out <- t continue } - v := jsonpath.TravelerPathLookup(t, s.key) + v := gdbi.TravelerPathLookup(t, s.key) i := cast.ToInt(v) + int(s.value) o := t.Copy() - jsonpath.TravelerSetValue(o, s.key, i) + gdbi.TravelerSetValue(o, s.key, i) out <- o } }() @@ -874,277 +565,3 @@ func (s *MarkSelect) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPi }() return ctx } - -//////////////////////////////////////////////////////////////////////////////// - -type both struct { - db gdbi.GraphInterface - labels []string - lastType gdbi.DataType - toType gdbi.DataType - loadData bool -} - -func (b both) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - go func() { - defer close(out) - var procs []gdbi.Processor - switch b.lastType { - case gdbi.VertexData: - switch b.toType { - case gdbi.EdgeData: - procs = []gdbi.Processor{ - &InE{db: b.db, loadData: b.loadData, labels: b.labels}, - &OutE{db: b.db, loadData: b.loadData, labels: b.labels}, - } - default: - procs = []gdbi.Processor{ - &LookupVertexAdjIn{db: b.db, labels: b.labels, loadData: b.loadData}, - &LookupVertexAdjOut{db: b.db, labels: b.labels, loadData: b.loadData}, - } - } - case gdbi.EdgeData: - procs = []gdbi.Processor{ - &LookupEdgeAdjIn{db: b.db, labels: b.labels, loadData: b.loadData}, - &LookupEdgeAdjOut{db: b.db, labels: b.labels, loadData: b.loadData}, - } - } - chanIn := make([]chan gdbi.Traveler, len(procs)) - chanOut := make([]chan gdbi.Traveler, len(procs)) - for i := range procs { - chanIn[i] = make(chan gdbi.Traveler, 1000) - chanOut[i] = make(chan gdbi.Traveler, 1000) - } - for i, p := range procs { - p.Process(ctx, man, chanIn[i], chanOut[i]) - } - for t := range in { - if t.IsSignal() { - out <- t - continue - } - for _, ch := range chanIn { - ch <- t - } - } - for _, ch := range chanIn { - close(ch) - } - for i := range procs { - for c := range chanOut[i] { - out <- c - } - } - }() - return ctx -} - -//////////////////////////////////////////////////////////////////////////////// - -type aggregate struct { - aggregations []*gripql.Aggregate -} - -func (agg *aggregate) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - aChans := make(map[string](chan gdbi.Traveler)) - g, ctx := errgroup.WithContext(ctx) - - // # of travelers to buffer for agg - bufferSize := 1000 - for _, a := range agg.aggregations { - aChans[a.Name] = make(chan gdbi.Traveler, bufferSize) - } - - g.Go(func() error { - for t := range in { - if t.IsSignal() { - out <- t - continue - } - for _, a := range agg.aggregations { - aChans[a.Name] <- t - } - } - for _, a := range agg.aggregations { - if aChans[a.Name] != nil { - close(aChans[a.Name]) - //aChans[a.Name] = nil - } - } - return nil - }) - - for _, a := range agg.aggregations { - a := a - switch a.Aggregation.(type) { - case *gripql.Aggregate_Term: - g.Go(func() error { - // max # of terms to collect before failing - // since the term can be a string this still isn't particularly safe - // the terms could be arbitrarily large strings and storing this many could eat up - // lots of memory. - maxTerms := 100000 - - tagg := a.GetTerm() - size := tagg.Size - - // Collect error to return. Because we are reading a channel, it must be fully emptied - // If we return error before fully emptying channel, upstream processes will lock - var outErr error - fieldTermCounts := map[interface{}]int{} - for t := range aChans[a.Name] { - if len(fieldTermCounts) > maxTerms { - outErr = fmt.Errorf("term aggreagtion: collected more unique terms (%v) than allowed (%v)", len(fieldTermCounts), maxTerms) - } else { - val := jsonpath.TravelerPathLookup(t, tagg.Field) - if val != nil { - k := reflect.TypeOf(val).Kind() - if k != reflect.Array && k != reflect.Slice && k != reflect.Map { - fieldTermCounts[val]++ - - } - } - } - } - - count := 0 - for term, tcount := range fieldTermCounts { - if size <= 0 || count < int(size) { - //sTerm, _ := structpb.NewValue(term) - //fmt.Printf("Term: %s %s %d\n", a.Name, sTerm, tcount) - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} - } - } - return outErr - }) - - case *gripql.Aggregate_Histogram: - - g.Go(func() error { - // max # of values to collect before failing - maxValues := 10000000 - - hagg := a.GetHistogram() - i := float64(hagg.Interval) - - c := 0 - fieldValues := []float64{} - - // Collect error to return. Because we are reading a channel, it must be fully emptied - // If we return error before fully emptying channel, upstream processes will lock - var outErr error - for t := range aChans[a.Name] { - val := jsonpath.TravelerPathLookup(t, hagg.Field) - if val != nil { - fval, err := cast.ToFloat64E(val) - if err != nil { - outErr = fmt.Errorf("histogram aggregation: can't convert %v to float64", val) - } - fieldValues = append(fieldValues, fval) - if c > maxValues { - outErr = fmt.Errorf("histogram aggreagtion: collected more values (%v) than allowed (%v)", c, maxValues) - } - c++ - } - } - sort.Float64s(fieldValues) - min := fieldValues[0] - max := fieldValues[len(fieldValues)-1] - - for bucket := math.Floor(min/i) * i; bucket <= max; bucket += i { - var count float64 - for _, v := range fieldValues { - if v >= bucket && v < (bucket+i) { - count++ - } - } - //sBucket, _ := structpb.NewValue(bucket) - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: bucket, Value: float64(count)}} - } - return outErr - }) - - case *gripql.Aggregate_Percentile: - - g.Go(func() error { - pagg := a.GetPercentile() - percents := pagg.Percents - - var outErr error - td := tdigest.New() - for t := range aChans[a.Name] { - val := jsonpath.TravelerPathLookup(t, pagg.Field) - fval, err := cast.ToFloat64E(val) - if err != nil { - outErr = fmt.Errorf("percentile aggregation: can't convert %v to float64", val) - } - td.Add(fval, 1) - } - - for _, p := range percents { - q := td.Quantile(p / 100) - //sp, _ := structpb.NewValue(p) - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: p, Value: q}} - } - - return outErr - }) - - case *gripql.Aggregate_Field: - g.Go(func() error { - fa := a.GetField() - fieldCounts := map[interface{}]int{} - for t := range aChans[a.Name] { - val := jsonpath.TravelerPathLookup(t, fa.Field) - if m, ok := val.(map[string]interface{}); ok { - for k := range m { - fieldCounts[k]++ - } - } - } - for term, tcount := range fieldCounts { - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} - } - return nil - }) - - case *gripql.Aggregate_Type: - g.Go(func() error { - fa := a.GetType() - fieldTypes := map[string]int{} - for t := range aChans[a.Name] { - val := jsonpath.TravelerPathLookup(t, fa.Field) - tname := gripql.GetFieldType(val) - fieldTypes[tname]++ - } - for term, tcount := range fieldTypes { - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} - } - return nil - }) - - case *gripql.Aggregate_Count: - g.Go(func() error { - count := 0 - for range aChans[a.Name] { - count++ - } - out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: "count", Value: float64(count)}} - return nil - }) - - default: - log.Errorf("Error: unknown aggregation type: %T", a.Aggregation) - continue - } - } - - go func() { - if err := g.Wait(); err != nil { - log.WithFields(log.Fields{"error": err}).Error("one or more aggregation failed") - } - close(out) - }() - - return ctx -} diff --git a/engine/core/processors_aggregate.go b/engine/core/processors_aggregate.go new file mode 100644 index 000000000..73b2febcb --- /dev/null +++ b/engine/core/processors_aggregate.go @@ -0,0 +1,231 @@ +package core + +import ( + "context" + "fmt" + "math" + "reflect" + "sort" + + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gdbi/tpath" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/influxdata/tdigest" + "github.com/spf13/cast" + "golang.org/x/sync/errgroup" +) + +//////////////////////////////////////////////////////////////////////////////// + +type aggregate struct { + aggregations []*gripql.Aggregate +} + +func (agg *aggregate) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + aChans := make(map[string](chan gdbi.Traveler)) + g, ctx := errgroup.WithContext(ctx) + + // # of travelers to buffer for agg + bufferSize := 1000 + for _, a := range agg.aggregations { + aChans[a.Name] = make(chan gdbi.Traveler, bufferSize) + } + + g.Go(func() error { + for t := range in { + if t.IsSignal() { + out <- t + continue + } + for _, a := range agg.aggregations { + aChans[a.Name] <- t + } + } + for _, a := range agg.aggregations { + if aChans[a.Name] != nil { + close(aChans[a.Name]) + //aChans[a.Name] = nil + } + } + return nil + }) + + for _, a := range agg.aggregations { + a := a + switch a.Aggregation.(type) { + case *gripql.Aggregate_Term: + g.Go(func() error { + // max # of terms to collect before failing + // since the term can be a string this still isn't particularly safe + // the terms could be arbitrarily large strings and storing this many could eat up + // lots of memory. + maxTerms := 100000 + + tagg := a.GetTerm() + size := tagg.Size + + // Collect error to return. Because we are reading a channel, it must be fully emptied + // If we return error before fully emptying channel, upstream processes will lock + var outErr error + fieldTermCounts := map[any]int{} + for t := range aChans[a.Name] { + if len(fieldTermCounts) > maxTerms { + outErr = fmt.Errorf("term aggreagtion: collected more unique terms (%v) than allowed (%v)", len(fieldTermCounts), maxTerms) + } else { + val := gdbi.TravelerPathLookup(t, tagg.Field) + if val != nil { + k := reflect.TypeOf(val).Kind() + if k != reflect.Array && k != reflect.Slice && k != reflect.Map { + fieldTermCounts[val]++ + + } + } + } + } + + count := 0 + for term, tcount := range fieldTermCounts { + if size <= 0 || count < int(size) { + //sTerm, _ := structpb.NewValue(term) + //fmt.Printf("Term: %s %s %d\n", a.Name, sTerm, tcount) + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} + } + } + return outErr + }) + + case *gripql.Aggregate_Histogram: + + g.Go(func() error { + // max # of values to collect before failing + maxValues := 10000000 + + hagg := a.GetHistogram() + i := float64(hagg.Interval) + + c := 0 + fieldValues := []float64{} + + // Collect error to return. Because we are reading a channel, it must be fully emptied + // If we return error before fully emptying channel, upstream processes will lock + var outErr error + for t := range aChans[a.Name] { + val := gdbi.TravelerPathLookup(t, hagg.Field) + if val != nil { + fval, err := cast.ToFloat64E(val) + if err != nil { + outErr = fmt.Errorf("histogram aggregation: can't convert %v to float64", val) + } + fieldValues = append(fieldValues, fval) + if c > maxValues { + outErr = fmt.Errorf("histogram aggreagtion: collected more values (%v) than allowed (%v)", c, maxValues) + } + c++ + } + } + if len(fieldValues) > 0 { + sort.Float64s(fieldValues) + min := fieldValues[0] + max := fieldValues[len(fieldValues)-1] + + for bucket := math.Floor(min/i) * i; bucket <= max; bucket += i { + var count float64 + for _, v := range fieldValues { + if v >= bucket && v < (bucket+i) { + count++ + } + } + //sBucket, _ := structpb.NewValue(bucket) + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: bucket, Value: float64(count)}} + } + } + return outErr + }) + + case *gripql.Aggregate_Percentile: + + g.Go(func() error { + pagg := a.GetPercentile() + percents := pagg.Percents + + var outErr error + td := tdigest.New() + for t := range aChans[a.Name] { + val := gdbi.TravelerPathLookup(t, pagg.Field) + fval, err := cast.ToFloat64E(val) + if err != nil { + outErr = fmt.Errorf("percentile aggregation: can't convert %v to float64", val) + } + td.Add(fval, 1) + } + + for _, p := range percents { + q := td.Quantile(p / 100) + //sp, _ := structpb.NewValue(p) + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: p, Value: q}} + } + + return outErr + }) + + case *gripql.Aggregate_Field: + g.Go(func() error { + fa := a.GetField() + fieldCounts := map[any]int{} + for t := range aChans[a.Name] { + val := gdbi.TravelerPathLookup(t, fa.Field) + if m, ok := val.(map[string]any); ok { + for k := range m { + if !tpath.IsGraphField(k) { + fieldCounts[k]++ + } + } + } + } + for term, tcount := range fieldCounts { + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} + } + return nil + }) + + case *gripql.Aggregate_Type: + g.Go(func() error { + fa := a.GetType() + fieldTypes := map[string]int{} + for t := range aChans[a.Name] { + val := gdbi.TravelerPathLookup(t, fa.Field) + tname := gripql.GetFieldType(val) + fieldTypes[tname]++ + } + for term, tcount := range fieldTypes { + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: term, Value: float64(tcount)}} + } + return nil + }) + + case *gripql.Aggregate_Count: + g.Go(func() error { + count := 0 + for range aChans[a.Name] { + count++ + } + out <- &gdbi.BaseTraveler{Aggregation: &gdbi.Aggregate{Name: a.Name, Key: "count", Value: float64(count)}} + return nil + }) + + default: + log.Errorf("Error: unknown aggregation type: %T", a.Aggregation) + continue + } + } + + go func() { + if err := g.Wait(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("one or more aggregation failed") + } + close(out) + }() + + return ctx +} diff --git a/engine/core/processors_extra.go b/engine/core/processors_extra.go index a78a67300..e78dd5496 100644 --- a/engine/core/processors_extra.go +++ b/engine/core/processors_extra.go @@ -6,8 +6,8 @@ import ( "math" "strings" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/kvi" "github.com/bmeg/grip/kvindex" "github.com/influxdata/tdigest" @@ -61,8 +61,8 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi kv := man.GetTempKV() idx := kvindex.NewIndex(kv) - namespace := jsonpath.GetNamespace(tagg.Field) - field := jsonpath.GetJSONPath(tagg.Field) + namespace := tpath.GetNamespace(tagg.Field) + field := tpath.NormalizePath(tagg.Field) field = strings.TrimPrefix(field, "$.") idx.AddField(field) @@ -70,7 +70,7 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi for batch := range aChans[a.Name] { err := kv.Update(func(tx kvi.KVTransaction) error { for _, t := range batch { - doc := jsonpath.GetDoc(t, namespace) + doc := gdbi.TravelerGetDoc(t, namespace) err := idx.AddDocTx(tx, fmt.Sprintf("%d", tid), doc) tid++ if err != nil { @@ -107,8 +107,8 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi kv := man.GetTempKV() idx := kvindex.NewIndex(kv) - namespace := jsonpath.GetNamespace(hagg.Field) - field := jsonpath.GetJSONPath(hagg.Field) + namespace := tpath.GetNamespace(hagg.Field) + field := tpath.NormalizePath(hagg.Field) field = strings.TrimPrefix(field, "$.") idx.AddField(field) @@ -116,7 +116,7 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi for batch := range aChans[a.Name] { err := kv.Update(func(tx kvi.KVTransaction) error { for _, t := range batch { - doc := jsonpath.GetDoc(t, namespace) + doc := gdbi.TravelerGetDoc(t, namespace) err := idx.AddDocTx(tx, fmt.Sprintf("%d", tid), doc) tid++ if err != nil { @@ -152,8 +152,8 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi kv := man.GetTempKV() idx := kvindex.NewIndex(kv) - namespace := jsonpath.GetNamespace(pagg.Field) - field := jsonpath.GetJSONPath(pagg.Field) + namespace := tpath.GetNamespace(pagg.Field) + field := tpath.NormalizePath(pagg.Field) field = strings.TrimPrefix(field, "$.") idx.AddField(field) @@ -161,7 +161,7 @@ func (agg *aggregateDisk) Process(ctx context.Context, man gdbi.Manager, in gdbi for batch := range aChans[a.Name] { err := kv.Update(func(tx kvi.KVTransaction) error { for _, t := range batch { - doc := jsonpath.GetDoc(t, namespace) + doc := gdbi.TravelerGetDoc(t, namespace) err := idx.AddDocTx(tx, fmt.Sprintf("%d", tid), doc) tid++ if err != nil { diff --git a/engine/core/processors_group.go b/engine/core/processors_group.go new file mode 100644 index 000000000..440953776 --- /dev/null +++ b/engine/core/processors_group.go @@ -0,0 +1,94 @@ +package core + +import ( + "context" + "encoding/binary" + "encoding/json" + + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/kvi" +) + +// Group +type Group struct { + grouping map[string]string +} + +func (r *Group) reduce(curTraveler *gdbi.BaseTraveler, newTraveler *gdbi.BaseTraveler) { + for dest, field := range r.grouping { + v := gdbi.TravelerPathLookup(newTraveler, field) + if curTraveler.Current != nil { + if a, ok := curTraveler.Current.Data[dest]; ok { + if aSlice, ok := a.([]any); ok { + curTraveler.Current.Data[dest] = append(aSlice, v) + } else if !ok { + // overwrite existing data + curTraveler.Current.Data[dest] = []any{v} + } + } else { + curTraveler.Current.Data[dest] = []any{v} + } + } + } +} + +// Process runs the render processor +func (r *Group) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + defer close(out) + kv := man.GetTempKV() + defer kv.Close() + + //collect + kv.BulkWrite(func(bl kvi.KVBulkWrite) error { + var idx uint64 = 0 + idxKey := make([]byte, 8) + for t := range in { + if t.IsSignal() { + out <- t + continue + } else { + //fmt.Printf("Checking %#v\n", t.GetCurrent()) + idStr := t.GetCurrentID() + binary.LittleEndian.PutUint64(idxKey, idx) + key := append([]byte(idStr), idxKey...) // the key is the graph element key, plus the index + if v, err := json.Marshal(t); err == nil { + bl.Set(key, v) + } + idx++ + } + } + return nil + }) + //group + kv.View(func(it kvi.KVIterator) error { + it.Seek([]byte{0}) + lastKey := "" + var curTraveler *gdbi.BaseTraveler + for it.Seek([]byte{0}); it.Valid(); it.Next() { + k := it.Key() + curKey := string(k[0 : len(k)-8]) // remove index suffix + newTraveler := gdbi.BaseTraveler{} + value, _ := it.Value() + json.Unmarshal(value, &newTraveler) + //fmt.Printf("curKey: (%s) %s\n", curKey, newTraveler) + if lastKey != curKey { + if curTraveler != nil { + out <- curTraveler + } + curTraveler = &newTraveler + lastKey = curKey + r.reduce(curTraveler, &newTraveler) + } else { + r.reduce(curTraveler, &newTraveler) + } + } + if lastKey != "" { + out <- curTraveler + } + return nil + }) + + }() + return ctx +} diff --git a/engine/core/processors_has.go b/engine/core/processors_has.go new file mode 100644 index 000000000..ba1f25abf --- /dev/null +++ b/engine/core/processors_has.go @@ -0,0 +1,116 @@ +package core + +import ( + "context" + + "github.com/bmeg/grip/engine/logic" + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/util/setcmp" +) + +//////////////////////////////////////////////////////////////////////////////// + +// Has filters based on data +type Has struct { + stmt *gripql.HasExpression +} + +// Process runs Has +func (w *Has) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + defer close(out) + for t := range in { + if t.IsSignal() { + out <- t + continue + } + + if logic.MatchesHasExpression(t, w.stmt) { + out <- t + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// HasLabel filters elements based on their label. +type HasLabel struct { + labels []string +} + +// Process runs Count +func (h *HasLabel) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + labels := dedupStringSlice(h.labels) + go func() { + defer close(out) + for t := range in { + if t.IsSignal() { + out <- t + continue + } + if setcmp.ContainsString(labels, t.GetCurrent().Get().Label) { + out <- t + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// HasKey filters elements based on whether it has one or more properties. +type HasKey struct { + keys []string +} + +// Process runs Count +func (h *HasKey) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + keys := dedupStringSlice(h.keys) + defer close(out) + for t := range in { + if t.IsSignal() { + out <- t + continue + } + found := true + for _, key := range keys { + if !gdbi.TravelerPathExists(t, key) { + found = false + } + } + if found { + out <- t + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// HasID filters elements based on their id. +type HasID struct { + ids []string +} + +// Process runs Count +func (h *HasID) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + defer close(out) + ids := dedupStringSlice(h.ids) + for t := range in { + if t.IsSignal() { + out <- t + continue + } + if setcmp.ContainsString(ids, t.GetCurrentID()) { + out <- t + } + } + }() + return ctx +} diff --git a/engine/core/processors_move.go b/engine/core/processors_move.go new file mode 100644 index 000000000..98513e437 --- /dev/null +++ b/engine/core/processors_move.go @@ -0,0 +1,307 @@ +package core + +import ( + "context" + + "github.com/bmeg/grip/gdbi" +) + +//////////////////////////////////////////////////////////////////////////////// + +// LookupVertexAdjOut finds out vertex +type LookupVertexAdjOut struct { + db gdbi.GraphInterface + labels []string + loadData bool + emitNull bool +} + +// Process runs out vertex +func (l *LookupVertexAdjOut) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() || t.IsNull() { + queryChan <- gdbi.ElementLookup{ + Ref: t, + } + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrentID(), + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for ov := range l.db.GetOutChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { + if ov.IsSignal() { + out <- ov.Ref + } else { + i := ov.Ref + out <- i.AddCurrent(ov.Vertex) + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// LookupEdgeAdjOut finds out edge +type LookupEdgeAdjOut struct { + db gdbi.GraphInterface + labels []string + loadData bool +} + +// Process runs LookupEdgeAdjOut +func (l *LookupEdgeAdjOut) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() { + queryChan <- gdbi.ElementLookup{Ref: t} + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrent().Get().To, + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { + i := v.Ref + if i.IsSignal() { + out <- i + } else { + out <- i.AddCurrent(v.Vertex) + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// LookupVertexAdjIn finds incoming vertex +type LookupVertexAdjIn struct { + db gdbi.GraphInterface + labels []string + loadData bool + emitNull bool +} + +// Process runs LookupVertexAdjIn +func (l *LookupVertexAdjIn) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() { + queryChan <- gdbi.ElementLookup{Ref: t} + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrentID(), + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetInChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { + i := v.Ref + if i.IsSignal() { + out <- i + } else { + out <- i.AddCurrent(v.Vertex) + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// LookupEdgeAdjIn finds incoming edge +type LookupEdgeAdjIn struct { + db gdbi.GraphInterface + labels []string + loadData bool +} + +// Process runs LookupEdgeAdjIn +func (l *LookupEdgeAdjIn) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() { + queryChan <- gdbi.ElementLookup{Ref: t} + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrent().Get().From, + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { + i := v.Ref + if i.IsSignal() { + out <- i + } else { + out <- i.AddCurrent(v.Vertex) + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// InE finds the incoming edges +type InE struct { + db gdbi.GraphInterface + labels []string + loadData bool + emitNull bool +} + +// Process runs InE +func (l *InE) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() { + queryChan <- gdbi.ElementLookup{Ref: t} + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrentID(), + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetInEdgeChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { + i := v.Ref + if i.IsSignal() { + out <- i + } else { + out <- i.AddCurrent(v.Edge) + } + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +// OutE finds the outgoing edges +type OutE struct { + db gdbi.GraphInterface + labels []string + loadData bool + emitNull bool +} + +// Process runs OutE +func (l *OutE) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + if t.IsSignal() { + queryChan <- gdbi.ElementLookup{Ref: t} + } else { + queryChan <- gdbi.ElementLookup{ + ID: t.GetCurrentID(), + Ref: t, + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetOutEdgeChannel(ctx, queryChan, l.loadData, l.emitNull, l.labels) { + i := v.Ref + out <- i.AddCurrent(v.Edge) + } + }() + return ctx +} + +//////////////////////////////////////////////////////////////////////////////// + +type both struct { + db gdbi.GraphInterface + labels []string + lastType gdbi.DataType + toType gdbi.DataType + loadData bool +} + +func (b both) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + defer close(out) + var procs []gdbi.Processor + switch b.lastType { + case gdbi.VertexData: + switch b.toType { + case gdbi.EdgeData: + procs = []gdbi.Processor{ + &InE{db: b.db, loadData: b.loadData, labels: b.labels}, + &OutE{db: b.db, loadData: b.loadData, labels: b.labels}, + } + default: + procs = []gdbi.Processor{ + &LookupVertexAdjIn{db: b.db, labels: b.labels, loadData: b.loadData}, + &LookupVertexAdjOut{db: b.db, labels: b.labels, loadData: b.loadData}, + } + } + case gdbi.EdgeData: + procs = []gdbi.Processor{ + &LookupEdgeAdjIn{db: b.db, labels: b.labels, loadData: b.loadData}, + &LookupEdgeAdjOut{db: b.db, labels: b.labels, loadData: b.loadData}, + } + } + chanIn := make([]chan gdbi.Traveler, len(procs)) + chanOut := make([]chan gdbi.Traveler, len(procs)) + for i := range procs { + chanIn[i] = make(chan gdbi.Traveler, 1000) + chanOut[i] = make(chan gdbi.Traveler, 1000) + } + for i, p := range procs { + p.Process(ctx, man, chanIn[i], chanOut[i]) + } + for t := range in { + if t.IsSignal() { + out <- t + continue + } + for _, ch := range chanIn { + ch <- t + } + } + for _, ch := range chanIn { + close(ch) + } + for i := range procs { + for c := range chanOut[i] { + out <- c + } + } + }() + return ctx +} diff --git a/engine/core/processors_pivot.go b/engine/core/processors_pivot.go new file mode 100644 index 000000000..fcb16a383 --- /dev/null +++ b/engine/core/processors_pivot.go @@ -0,0 +1,79 @@ +package core + +import ( + "bytes" + "context" + "encoding/json" + + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/kvi" + "github.com/bmeg/grip/log" +) + +// Pivot take an ID, field and value triple an turns it into a merged element +type Pivot struct { + Stmt *gripql.PivotStep +} + +// Process runs the pivot processor +func (r *Pivot) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + go func() { + defer close(out) + kv := man.GetTempKV() + defer kv.Close() + kv.BulkWrite(func(bl kvi.KVBulkWrite) error { + for t := range in { + if t.IsSignal() { + out <- t + continue + } + log.Debugf("Checking %#v\n", t.GetCurrent()) + id := gdbi.TravelerPathLookup(t, r.Stmt.Id) + if idStr, ok := id.(string); ok { + field := gdbi.TravelerPathLookup(t, r.Stmt.Field) + if fieldStr, ok := field.(string); ok { + value := gdbi.TravelerPathLookup(t, r.Stmt.Value) + if v, err := json.Marshal(value); err == nil { + key := bytes.Join([][]byte{[]byte(idStr), []byte(fieldStr)}, []byte{0}) + bl.Set(key, v) + } + } + } + } + return nil + }) + kv.View(func(it kvi.KVIterator) error { + it.Seek([]byte{0}) + lastKey := "" + curDict := map[string]any{} + for it.Seek([]byte{0}); it.Valid(); it.Next() { + tmp := bytes.Split(it.Key(), []byte{0}) + curKey := string(tmp[0]) + curField := string(tmp[1]) + log.Debugln("CURKEY: ", curKey, "CURFIELD: ", curField) + if lastKey == "" { + lastKey = curKey + } + var curData any + value, _ := it.Value() + json.Unmarshal(value, &curData) + if lastKey != curKey { + curDict["_id"] = curKey + out <- &gdbi.BaseTraveler{Render: curDict} + curDict = map[string]any{} + curDict[curField] = curData + lastKey = curKey + } else { + curDict[curField] = curData + } + } + if lastKey != "" { + curDict["_id"] = lastKey + out <- &gdbi.BaseTraveler{Render: curDict} + } + return nil + }) + }() + return ctx +} diff --git a/engine/core/processors_sort.go b/engine/core/processors_sort.go new file mode 100644 index 000000000..ae6f8ab24 --- /dev/null +++ b/engine/core/processors_sort.go @@ -0,0 +1,80 @@ +package core + +import ( + "context" + "encoding/json" + + "github.com/bmeg/grip/engine/logic" + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" +) + +// Sort rows +type Sort struct { + sortFields []*gripql.SortField +} + +// FromBytes implements logic.SortConf. +func (s *Sort) FromBytes(v []byte) (gdbi.Traveler, error) { + newTraveler := gdbi.BaseTraveler{} + err := json.Unmarshal(v, &newTraveler) + if err != nil { + return &gdbi.BaseTraveler{}, err + } + return &newTraveler, nil +} + +// ToBytes implements logic.SortConf. +func (s *Sort) ToBytes(a gdbi.Traveler) []byte { + v, _ := json.Marshal(a) + return v +} + +func (s *Sort) Compare(a, b gdbi.Traveler) int { + for _, f := range s.sortFields { + aVal := gdbi.TravelerPathLookup(a, f.Field) + bVal := gdbi.TravelerPathLookup(b, f.Field) + x := logic.CompareAny(aVal, bVal) + log.Debugf("Field: %s Compare %#v v %#v = %d\n", f.Field, aVal, bVal, x) + if x != 0 { + if f.Descending { + return -x + } else { + return x + } + } + } + return 0 +} + +// Process runs LookupEdges +func (s *Sort) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + + signals := []gdbi.Traveler{} + + //sorter := logic.NewMemSorter[gdbi.Traveler](s) + + tmpDir := man.GetTmpDir() + sorter := logic.NewKVSorter(tmpDir, s) + + go func() { + defer close(out) + for t := range in { + if t.IsSignal() { + signals = append(signals, t) + } else { + sorter.Add(t) + } + } + //emit signals first (?) + for _, s := range signals { + out <- s + } + for i := range sorter.Sorted() { + out <- i + } + sorter.Close() + }() + return ctx +} diff --git a/engine/core/statement_compiler.go b/engine/core/statement_compiler.go new file mode 100644 index 000000000..7f111b7ec --- /dev/null +++ b/engine/core/statement_compiler.go @@ -0,0 +1,252 @@ +package core + +import ( + "fmt" + + "github.com/bmeg/grip/engine/logic" + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gdbi/tpath" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/util/protoutil" +) + +type DefaultStmtCompiler struct { + db gdbi.GraphInterface +} + +func (sc *DefaultStmtCompiler) V(stmt *gripql.GraphStatement_V, ps *gdbi.State) (gdbi.Processor, error) { + ids := protoutil.AsStringList(stmt.V) + return &LookupVerts{db: sc.db, ids: ids, loadData: ps.StepLoadData()}, nil +} + +func (sc *DefaultStmtCompiler) In(stmt *gripql.GraphStatement_In, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.In) + if ps.LastType == gdbi.VertexData { + return &LookupVertexAdjIn{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else if ps.LastType == gdbi.EdgeData { + return &LookupEdgeAdjIn{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else { + return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } +} + +func (sc *DefaultStmtCompiler) InNull(stmt *gripql.GraphStatement_InNull, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.InNull) + if ps.LastType == gdbi.VertexData { + return &LookupVertexAdjIn{db: sc.db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil + } else if ps.LastType == gdbi.EdgeData { + return &LookupEdgeAdjIn{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else { + return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } +} +func (sc *DefaultStmtCompiler) Out(stmt *gripql.GraphStatement_Out, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.Out) + if ps.LastType == gdbi.VertexData { + return &LookupVertexAdjOut{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else if ps.LastType == gdbi.EdgeData { + return &LookupEdgeAdjOut{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else { + return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } +} + +func (sc *DefaultStmtCompiler) OutNull(stmt *gripql.GraphStatement_OutNull, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.OutNull) + if ps.LastType == gdbi.VertexData { + return &LookupVertexAdjOut{db: sc.db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil + } else if ps.LastType == gdbi.EdgeData { + return &LookupEdgeAdjOut{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil + } else { + return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } +} + +func (sc *DefaultStmtCompiler) Both(stmt *gripql.GraphStatement_Both, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.Both) + if ps.LastType == gdbi.VertexData { + return &both{db: sc.db, labels: labels, lastType: gdbi.VertexData, toType: gdbi.VertexData, loadData: ps.StepLoadData()}, nil + } else if ps.LastType == gdbi.EdgeData { + return &both{db: sc.db, labels: labels, lastType: gdbi.EdgeData, toType: gdbi.VertexData, loadData: ps.StepLoadData()}, nil + } else { + return nil, fmt.Errorf(`"both" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } +} + +func (sc *DefaultStmtCompiler) InE(stmt *gripql.GraphStatement_InE, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.InE) + return &InE{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil +} + +func (sc *DefaultStmtCompiler) InENull(stmt *gripql.GraphStatement_InENull, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.InENull) + ps.LastType = gdbi.EdgeData + return &InE{db: sc.db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil +} + +func (sc *DefaultStmtCompiler) OutE(stmt *gripql.GraphStatement_OutE, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.OutE) + ps.LastType = gdbi.EdgeData + return &OutE{db: sc.db, labels: labels, loadData: ps.StepLoadData()}, nil +} + +func (sc *DefaultStmtCompiler) OutENull(stmt *gripql.GraphStatement_OutENull, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.OutENull) + ps.LastType = gdbi.EdgeData + return &OutE{db: sc.db, labels: labels, loadData: ps.StepLoadData(), emitNull: true}, nil +} + +func (sc *DefaultStmtCompiler) BothE(stmt *gripql.GraphStatement_BothE, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.BothE) + ps.LastType = gdbi.EdgeData + return &both{db: sc.db, labels: labels, lastType: gdbi.VertexData, toType: gdbi.EdgeData, loadData: ps.StepLoadData()}, nil +} + +func (sc *DefaultStmtCompiler) Has(stmt *gripql.GraphStatement_Has, ps *gdbi.State) (gdbi.Processor, error) { + return &Has{stmt.Has}, nil +} + +func (sc *DefaultStmtCompiler) HasLabel(stmt *gripql.GraphStatement_HasLabel, ps *gdbi.State) (gdbi.Processor, error) { + labels := protoutil.AsStringList(stmt.HasLabel) + if len(labels) == 0 { + return nil, fmt.Errorf(`no labels provided to "HasLabel" statement`) + } + return &HasLabel{labels}, nil +} + +func (sc *DefaultStmtCompiler) HasKey(stmt *gripql.GraphStatement_HasKey, ps *gdbi.State) (gdbi.Processor, error) { + keys := protoutil.AsStringList(stmt.HasKey) + if len(keys) == 0 { + return nil, fmt.Errorf(`no keys provided to "HasKey" statement`) + } + return &HasKey{keys}, nil +} + +func (sc *DefaultStmtCompiler) HasID(stmt *gripql.GraphStatement_HasId, ps *gdbi.State) (gdbi.Processor, error) { + ids := protoutil.AsStringList(stmt.HasId) + if len(ids) == 0 { + return nil, fmt.Errorf(`no ids provided to "HasId" statement`) + } + return &HasID{ids}, nil +} + +func (sc *DefaultStmtCompiler) Limit(stmt *gripql.GraphStatement_Limit, ps *gdbi.State) (gdbi.Processor, error) { + return &Limit{stmt.Limit}, nil +} + +func (sc *DefaultStmtCompiler) Skip(stmt *gripql.GraphStatement_Skip, ps *gdbi.State) (gdbi.Processor, error) { + return &Skip{stmt.Skip}, nil +} + +func (sc *DefaultStmtCompiler) Range(stmt *gripql.GraphStatement_Range, ps *gdbi.State) (gdbi.Processor, error) { + return &Range{start: stmt.Range.Start, stop: stmt.Range.Stop}, nil +} + +func (sc *DefaultStmtCompiler) Count(stmt *gripql.GraphStatement_Count, ps *gdbi.State) (gdbi.Processor, error) { + return &Count{}, nil +} + +func (sc *DefaultStmtCompiler) Distinct(stmt *gripql.GraphStatement_Distinct, ps *gdbi.State) (gdbi.Processor, error) { + fields := protoutil.AsStringList(stmt.Distinct) + if len(fields) == 0 { + fields = append(fields, "_id") + } + return &Distinct{fields}, nil +} + +func (sc *DefaultStmtCompiler) As(stmt *gripql.GraphStatement_As, ps *gdbi.State) (gdbi.Processor, error) { + if stmt.As == "" { + return nil, fmt.Errorf(`"mark" statement cannot have an empty name`) + } + if err := gripql.ValidateFieldName(stmt.As); err != nil { + return nil, fmt.Errorf(`"mark" statement invalid; %v`, err) + } + if stmt.As == tpath.CURRENT { + return nil, fmt.Errorf(`"mark" statement invalid; uses reserved name %s`, tpath.CURRENT) + } + ps.MarkTypes[stmt.As] = ps.LastType + return &Marker{stmt.As}, nil +} + +func (sc *DefaultStmtCompiler) Set(stmt *gripql.GraphStatement_Set, ps *gdbi.State) (gdbi.Processor, error) { + return &ValueSet{key: stmt.Set.Key, value: stmt.Set.Value.AsInterface()}, nil +} + +func (sc *DefaultStmtCompiler) Increment(stmt *gripql.GraphStatement_Increment, ps *gdbi.State) (gdbi.Processor, error) { + return &ValueIncrement{key: stmt.Increment.Key, value: stmt.Increment.Value}, nil +} + +func (sc *DefaultStmtCompiler) Mark(stmt *gripql.GraphStatement_Mark, ps *gdbi.State) (gdbi.Processor, error) { + return &logic.JumpMark{Name: stmt.Mark}, nil +} + +func (sc *DefaultStmtCompiler) Jump(stmt *gripql.GraphStatement_Jump, ps *gdbi.State) (gdbi.Processor, error) { + return &logic.Jump{Mark: stmt.Jump.Mark, Stmt: stmt.Jump.Expression, Emit: stmt.Jump.Emit}, nil +} + +func (sc *DefaultStmtCompiler) Select(stmt *gripql.GraphStatement_Select, ps *gdbi.State) (gdbi.Processor, error) { + ps.LastType = ps.MarkTypes[stmt.Select] + return &MarkSelect{stmt.Select}, nil +} + +func (sc *DefaultStmtCompiler) Render(stmt *gripql.GraphStatement_Render, ps *gdbi.State) (gdbi.Processor, error) { + return &Render{stmt.Render.AsInterface()}, nil +} + +func (sc *DefaultStmtCompiler) Pivot(stmt *gripql.GraphStatement_Pivot, ps *gdbi.State) (gdbi.Processor, error) { + return &Pivot{stmt.Pivot}, nil +} + +func (sc *DefaultStmtCompiler) Path(stmt *gripql.GraphStatement_Path, ps *gdbi.State) (gdbi.Processor, error) { + return &Path{stmt.Path.AsSlice()}, nil +} + +func (sc *DefaultStmtCompiler) Unwind(stmt *gripql.GraphStatement_Unwind, ps *gdbi.State) (gdbi.Processor, error) { + return &Unwind{stmt.Unwind}, nil +} + +func (sc *DefaultStmtCompiler) Group(stmt *gripql.GraphStatement_Group, ps *gdbi.State) (gdbi.Processor, error) { + return &Group{stmt.Group.Fields}, nil +} + +func (sc *DefaultStmtCompiler) ToType(stmt *gripql.GraphStatement_Totype, ps *gdbi.State) (gdbi.Processor, error) { + return &ToType{Field: stmt.Totype.Field, TypeName: stmt.Totype.TypeName}, nil +} + +func (sc *DefaultStmtCompiler) Fields(stmt *gripql.GraphStatement_Fields, ps *gdbi.State) (gdbi.Processor, error) { + fields := protoutil.AsStringList(stmt.Fields) + return &Fields{fields}, nil +} + +func (sc *DefaultStmtCompiler) Aggregate(stmt *gripql.GraphStatement_Aggregate, ps *gdbi.State) (gdbi.Processor, error) { + aggs := make(map[string]any) + for _, a := range stmt.Aggregate.Aggregations { + if _, ok := aggs[a.Name]; ok { + return nil, fmt.Errorf("duplicate aggregation name '%s' found; all aggregations must have a unique name", a.Name) + } + } + return &aggregate{stmt.Aggregate.Aggregations}, nil +} + +func (sc *DefaultStmtCompiler) Sort(gs *gripql.GraphStatement_Sort, ps *gdbi.State) (gdbi.Processor, error) { + return &Sort{gs.Sort.Fields}, nil +} + +func (sc *DefaultStmtCompiler) Custom(gs *gripql.GraphStatement, ps *gdbi.State) (gdbi.Processor, error) { + + switch stmt := gs.GetStatement().(type) { + + //Custom graph statements + case *gripql.GraphStatement_LookupVertsLabelIndex: + ps.LastType = gdbi.VertexData + return &LookupVertsLabelIndex{db: sc.db, labels: stmt.Labels, loadData: ps.StepLoadData()}, nil + case *gripql.GraphStatement_EngineCustom: + proc := stmt.Custom.(gdbi.CustomProcGen) + ps.LastType = proc.GetType() + return proc.GetProcessor(sc.db, ps) + + default: + return nil, fmt.Errorf("grip compile: unknown statement type: %s", gs.GetStatement()) + } + +} diff --git a/engine/core/util.go b/engine/core/util.go index 4ec66f79a..3352cfecc 100644 --- a/engine/core/util.go +++ b/engine/core/util.go @@ -4,19 +4,10 @@ import ( "github.com/kr/pretty" ) -func debug(i ...interface{}) { +func debug(i ...any) { pretty.Println(i...) } -func contains(a []string, v string) bool { - for _, i := range a { - if i == v { - return true - } - } - return false -} - func dedupStringSlice(s []string) []string { seen := make(map[string]struct{}, len(s)) j := 0 diff --git a/engine/logic/jump.go b/engine/logic/jump.go index 8b7c297dc..b2fd383ad 100644 --- a/engine/logic/jump.go +++ b/engine/logic/jump.go @@ -2,12 +2,11 @@ package logic import ( "context" - "fmt" "time" - "github.com/bmeg/grip/engine/queue" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" ) // MarkJump creates mark where jump instruction can send travelers @@ -31,7 +30,7 @@ func (s *JumpMark) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe case msg, ok := <-s.inputs[i]: if !ok { //jump point has closed, remove it from list - fmt.Printf("j closed %d \n", i) + log.Debugf("j closed %d \n", i) closeList = append(closeList, i) } else { //jump traveler recieved, pass on and skip reading input this cycle @@ -53,7 +52,7 @@ func (s *JumpMark) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe case msg, ok := <-in: if !ok { //main input has closed, move onto closing phase - fmt.Printf("Got input close, messages: %d\n", mCount) + log.Debugf("Got input close, messages: %d\n", mCount) inputOpen = false } else { out <- msg @@ -73,7 +72,7 @@ func (s *JumpMark) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe //are we waiting for a signal. This is canceled if new travelers are received. signalOutdated := false signalActive := false - fmt.Printf("Starting preclose\n") + log.Debugf("Starting preclose\n") for closed := false; !closed; { closeList := []int{} jumperFound := false @@ -82,7 +81,7 @@ func (s *JumpMark) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe case msg, ok := <-s.inputs[i]: if !ok { //jump point has closed, remove it from list - fmt.Printf("j closed %d \n", i) + log.Debugf("j closed %d \n", i) closeList = append(closeList, i) } else { //jump traveler recieved, pass on and skip reading input this cycle @@ -113,10 +112,10 @@ func (s *JumpMark) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe signalActive = true signalOutdated = false returnCount = 0 - fmt.Printf("Sending Signal %d\n", curID) + log.Debugf("Sending Signal %d\n", curID) out <- &gdbi.BaseTraveler{Signal: &gdbi.Signal{ID: curID, Dest: s.Name}} } else if signalActive && returnCount == len(s.inputs) { - fmt.Printf("Received %d of %d signals, closing after %d messages\n", returnCount, len(s.inputs), mCount) + log.Debugf("Received %d of %d signals, closing after %d messages\n", returnCount, len(s.inputs), mCount) closed = true } } @@ -139,11 +138,11 @@ type Jump struct { Stmt *gripql.HasExpression Emit bool jumpers chan gdbi.Traveler - queue queue.Queue + queue gdbi.Queue } func (s *Jump) Init() { - q := queue.New() + q := gdbi.NewQueue() s.jumpers = q.GetInput() s.queue = q } @@ -185,7 +184,7 @@ func (s *Jump) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, ou mCount++ } } - fmt.Printf("Closing jump, messages: %d\n", mCount) + log.Debugf("Closing jump, messages: %d\n", mCount) }() return ctx } diff --git a/engine/logic/match.go b/engine/logic/match.go index 99c21fe41..ee7c86c74 100644 --- a/engine/logic/match.go +++ b/engine/logic/match.go @@ -2,21 +2,41 @@ package logic import ( "reflect" + "strings" "github.com/spf13/cast" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" ) func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { - var val interface{} - var condVal interface{} - val = jsonpath.TravelerPathLookup(trav, cond.Key) + var val any + var condVal any + + val = gdbi.TravelerPathLookup(trav, cond.Key) condVal = cond.Value.AsInterface() + if condValStr, ok := condVal.(string); ok { + if strings.HasPrefix(condValStr, "$.") { + //log.Infof("condVal: %s\n", condValStr) + condVal = gdbi.TravelerPathLookup(trav, condValStr) + } + //TODO: Add escape for $ user string + } + //If filtering on nil or no match was found on float64 casting operators return false + if (val == nil || condVal == nil) && + cond.Condition != gripql.Condition_EQ && + cond.Condition != gripql.Condition_NEQ && + cond.Condition != gripql.Condition_WITHIN && + cond.Condition != gripql.Condition_WITHOUT && + cond.Condition != gripql.Condition_CONTAINS { + return false + } + + //log.Debugf("match: %s %s %s", condVal, val, cond.Key) + switch cond.Condition { case gripql.Condition_EQ: return reflect.DeepEqual(val, condVal) @@ -48,6 +68,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_LT: valN, err := cast.ToFloat64E(val) + //log.Debugf("CAST: ", valN, "ERROR: ", err) if err != nil { return false } @@ -71,26 +92,26 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_INSIDE: vals, err := cast.ToSliceE(condVal) if err != nil { - log.Errorf("Error: could not cast INSIDE condition value: %v", err) + log.Debugf("UserError: could not cast INSIDE condition value: %v", err) return false } if len(vals) != 2 { - log.Errorf("Error: expected slice of length 2 not %v for INSIDE condition value", len(vals)) + log.Debugf("UserError: expected slice of length 2 not %v for INSIDE condition value", len(vals)) return false } lower, err := cast.ToFloat64E(vals[0]) if err != nil { - log.Errorf("Error: could not cast lower INSIDE condition value: %v", err) + log.Debugf("UserError: could not cast lower INSIDE condition value: %v", err) return false } upper, err := cast.ToFloat64E(vals[1]) if err != nil { - log.Errorf("Error: could not cast upper INSIDE condition value: %v", err) + log.Debugf("UserError: could not cast upper INSIDE condition value: %v", err) return false } valF, err := cast.ToFloat64E(val) if err != nil { - log.Errorf("Error: could not cast INSIDE value: %v", err) + log.Debugf("UserError: could not cast INSIDE value: %v", err) return false } return valF > lower && valF < upper @@ -98,26 +119,26 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_OUTSIDE: vals, err := cast.ToSliceE(condVal) if err != nil { - log.Errorf("Error: could not cast OUTSIDE condition value: %v", err) + log.Debugf("UserError: could not cast OUTSIDE condition value: %v", err) return false } if len(vals) != 2 { - log.Errorf("Error: expected slice of length 2 not %v for OUTSIDE condition value", len(vals)) + log.Debugf("UserError: expected slice of length 2 not %v for OUTSIDE condition value", len(vals)) return false } lower, err := cast.ToFloat64E(vals[0]) if err != nil { - log.Errorf("Error: could not cast lower OUTSIDE condition value: %v", err) + log.Debugf("UserError: could not cast lower OUTSIDE condition value: %v", err) return false } upper, err := cast.ToFloat64E(vals[1]) if err != nil { - log.Errorf("Error: could not cast upper OUTSIDE condition value: %v", err) + log.Debugf("UserError: could not cast upper OUTSIDE condition value: %v", err) return false } valF, err := cast.ToFloat64E(val) if err != nil { - log.Errorf("Error: could not cast OUTSIDE value: %v", err) + log.Debugf("UserError: could not cast OUTSIDE value: %v", err) return false } return valF < lower || valF > upper @@ -125,26 +146,26 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_BETWEEN: vals, err := cast.ToSliceE(condVal) if err != nil { - log.Errorf("Error: could not cast BETWEEN condition value: %v", err) + log.Debugf("UserError: could not cast BETWEEN condition value: %v", err) return false } if len(vals) != 2 { - log.Errorf("Error: expected slice of length 2 not %v for BETWEEN condition value", len(vals)) + log.Debugf("UserError: expected slice of length 2 not %v for BETWEEN condition value", len(vals)) return false } lower, err := cast.ToFloat64E(vals[0]) if err != nil { - log.Errorf("Error: could not cast lower BETWEEN condition value: %v", err) + log.Debugf("UserError: could not cast lower BETWEEN condition value: %v", err) return false } upper, err := cast.ToFloat64E(vals[1]) if err != nil { - log.Errorf("Error: could not cast upper BETWEEN condition value: %v", err) + log.Debugf("UserError: could not cast upper BETWEEN condition value: %v", err) return false } valF, err := cast.ToFloat64E(val) if err != nil { - log.Errorf("Error: could not cast BETWEEN value: %v", err) + log.Debugf("UserError: could not cast BETWEEN value: %v", err) return false } return valF >= lower && valF < upper @@ -152,7 +173,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_WITHIN: found := false switch condVal := condVal.(type) { - case []interface{}: + case []any: for _, v := range condVal { if reflect.DeepEqual(val, v) { found = true @@ -163,7 +184,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { found = false default: - log.Errorf("Error: expected slice not %T for WITHIN condition value", condVal) + log.Debugf("UserError: expected slice not %T for WITHIN condition value", condVal) } return found @@ -171,7 +192,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_WITHOUT: found := false switch condVal := condVal.(type) { - case []interface{}: + case []any: for _, v := range condVal { if reflect.DeepEqual(val, v) { found = true @@ -182,7 +203,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { found = false default: - log.Errorf("Error: expected slice not %T for WITHOUT condition value", condVal) + log.Debugf("UserError: expected slice not %T for WITHOUT condition value", condVal) } @@ -191,7 +212,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { case gripql.Condition_CONTAINS: found := false switch val := val.(type) { - case []interface{}: + case []any: for _, v := range val { if reflect.DeepEqual(v, condVal) { found = true @@ -202,7 +223,7 @@ func MatchesCondition(trav gdbi.Traveler, cond *gripql.HasCondition) bool { found = false default: - log.Errorf("Error: unknown condition value type %T for CONTAINS condition", val) + log.Debugf("UserError: unknown condition value type %T for CONTAINS condition", val) } return found diff --git a/engine/logic/sorter.go b/engine/logic/sorter.go new file mode 100644 index 000000000..ff6aa356c --- /dev/null +++ b/engine/logic/sorter.go @@ -0,0 +1,13 @@ +package logic + +type SortConf[SortType any] interface { + FromBytes([]byte) (SortType, error) + ToBytes(a SortType) []byte // ToBytes used for marshaling with gob + Compare(a, b SortType) int +} + +type Sorter[T any] interface { + Add(T) + Sorted() chan T + Close() error +} diff --git a/engine/logic/sorter_compare.go b/engine/logic/sorter_compare.go new file mode 100644 index 000000000..052fe8d4c --- /dev/null +++ b/engine/logic/sorter_compare.go @@ -0,0 +1,329 @@ +package logic + +import ( + "fmt" + "reflect" + + "github.com/bmeg/grip/log" +) + +func IsNumeric(a reflect.Type) bool { + switch a.Kind() { + case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64, + reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64, + reflect.Float32, reflect.Float64: + return true + default: + return false + } +} + +// CompareNumbers compares two numbers (of any compatible numeric type) and returns an int +// as expected by the sort package. +func CompareNumbers(a, b any) (int, error) { + // Check the types using type switches + switch x := a.(type) { + case int: + // Compare int with other types + switch y := b.(type) { + case int: + return CompareInts(int64(x), int64(y)), nil + case int16: + return CompareInts(int64(x), int64(y)), nil + case int32: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint16: + return CompareInts(int64(x), int64(y)), nil + case uint32: + return CompareInts(int64(x), int64(y)), nil + case uint64: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case int16: + // Compare int16 with other types + switch y := b.(type) { + case int16: + return CompareInts(int64(x), int64(y)), nil + case int: + return CompareInts(int64(x), int64(y)), nil + case int32: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint16: + return CompareInts(int64(x), int64(y)), nil + case uint32: + return CompareInts(int64(x), int64(y)), nil + case uint64: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case int32: + // Compare int32 with other types + switch y := b.(type) { + case int32: + return CompareInts(int64(x), int64(y)), nil + case int: + return CompareInts(int64(x), int64(y)), nil + case int16: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint16: + return CompareInts(int64(x), int64(y)), nil + case uint32: + return CompareInts(int64(x), int64(y)), nil + case uint64: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case int64: + // Compare int64 with other types + switch y := b.(type) { + case int64: + return CompareInts(x, y), nil + case int: + return CompareInts(x, int64(y)), nil + case int16: + return CompareInts(x, int64(y)), nil + case int32: + return CompareInts(x, int64(y)), nil + case uint16: + return CompareInts(x, int64(y)), nil + case uint32: + return CompareInts(x, int64(y)), nil + case uint64: + return CompareInts(x, int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case uint16: + // Compare uint16 with other types + switch y := b.(type) { + case uint16: + return CompareInts(int64(x), int64(y)), nil + case int: + return CompareInts(int64(x), int64(y)), nil + case int16: + return CompareInts(int64(x), int64(y)), nil + case int32: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint32: + return CompareInts(int64(x), int64(y)), nil + case uint64: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case uint32: + // Compare uint32 with other types + switch y := b.(type) { + case uint32: + return CompareInts(int64(x), int64(y)), nil + case int: + return CompareInts(int64(x), int64(y)), nil + case int16: + return CompareInts(int64(x), int64(y)), nil + case int32: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint16: + return CompareInts(int64(x), int64(y)), nil + case uint64: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case uint64: + // Compare uint64 with other types + switch y := b.(type) { + case uint64: + return CompareInts(int64(x), int64(y)), nil + case int: + return CompareInts(int64(x), int64(y)), nil + case int16: + return CompareInts(int64(x), int64(y)), nil + case int32: + return CompareInts(int64(x), int64(y)), nil + case int64: + return CompareInts(int64(x), y), nil + case uint16: + return CompareInts(int64(x), int64(y)), nil + case uint32: + return CompareInts(int64(x), int64(y)), nil + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + } + case float32: + // Compare float32 with other types + switch y := b.(type) { + case float32: + return CompareFloats(float64(x), float64(y)), nil + case float64: + return CompareFloats(float64(x), y), nil + case int: + return CompareFloats(float64(x), float64(y)), nil + case int16: + return CompareFloats(float64(x), float64(y)), nil + case int32: + return CompareFloats(float64(x), float64(y)), nil + case int64: + return CompareFloats(float64(x), float64(y)), nil + case uint16: + return CompareFloats(float64(x), float64(y)), nil + case uint32: + return CompareFloats(float64(x), float64(y)), nil + case uint64: + return CompareFloats(float64(x), float64(y)), nil + } + case float64: + // Compare float64 with other types + switch y := b.(type) { + case float64: + return CompareFloats(x, y), nil + case float32: + return CompareFloats(x, float64(y)), nil + case int: + return CompareFloats(x, float64(y)), nil + case int16: + return CompareFloats(x, float64(y)), nil + case int32: + return CompareFloats(x, float64(y)), nil + case int64: + return CompareFloats(x, float64(y)), nil + case uint16: + return CompareFloats(x, float64(y)), nil + case uint32: + return CompareFloats(x, float64(y)), nil + case uint64: + return CompareFloats(x, float64(y)), nil + } + } + + // If we reach here, the types are not comparable + return 0, fmt.Errorf("incompatible types: %s and %s", reflect.TypeOf(a).String(), reflect.TypeOf(b).String()) +} + +// CompareInts is a helper function to compare two int values and return the appropriate comparison result. +func CompareInts(x, y int64) int { + if x < y { + return -1 + } else if x > y { + return 1 + } + return 0 +} + +// CompareFloats is a helper function to compare two float values and return the appropriate comparison result. +func CompareFloats(x, y float64) int { + if x < y { + return -1 + } else if x > y { + return 1 + } + return 0 +} + +// CompareAny compares two variables of any type. +func CompareAny(a, b any) int { + + if a == nil && b != nil { + return -1 + } else if a != nil && b == nil { + return 1 + } else if a == nil && b == nil { + return 0 + } + + // Get the types of the variables. + ta := reflect.TypeOf(a) + tb := reflect.TypeOf(b) + + // If the types are not the same, return a comparison based on type names. + if ta != tb { + if IsNumeric(ta) && IsNumeric(tb) { + o, _ := CompareNumbers(a, b) + return o + } + return int(ta.Kind()) - int(tb.Kind()) + } + + // Compare values based on their types. + switch ta.Kind() { + case reflect.Int: + // Compare integer values. + return CompareInts(int64(a.(int)), int64(b.(int))) + case reflect.Float64: + // Compare float values. + return CompareFloats(a.(float64), b.(float64)) + case reflect.String: + // Compare string values. + return CompareStrings(a.(string), b.(string)) + case reflect.Bool: + // Compare boolean values. + return CompareBooleans(a.(bool), b.(bool)) + case reflect.Struct: + // Optionally handle structs here. + // For now, just comparing based on memory address. + return ComparePointers(a, b) + default: + // For unsupported types, we just use pointers for comparison. + log.Warningf("Unsupported types: %s %s", ta, tb) + return ComparePointers(a, b) + } +} + +// CompareStrings compares two string values. +func CompareStrings(a, b string) int { + if a < b { + return -1 + } else if a > b { + return 1 + } + return 0 +} + +// CompareBooleans compares two boolean values. +func CompareBooleans(a, b bool) int { + if !a && b { + return -1 + } else if a && !b { + return 1 + } + return 0 +} + +// ComparePointers compares two pointers. +func ComparePointers(a, b any) int { + ptrA := reflect.ValueOf(a).Pointer() + ptrB := reflect.ValueOf(b).Pointer() + if ptrA < ptrB { + return -1 + } else if ptrA > ptrB { + return 1 + } + return 0 +} diff --git a/engine/logic/sorter_kv.go b/engine/logic/sorter_kv.go new file mode 100644 index 000000000..31546e316 --- /dev/null +++ b/engine/logic/sorter_kv.go @@ -0,0 +1,85 @@ +package logic + +import ( + "github.com/bmeg/grip/log" + "github.com/cockroachdb/pebble" +) + +const ( + maxWriterBuffer = 3 << 30 +) + +type kvCompare[T any] struct { + conf SortConf[T] +} + +type KVSorter[T any] struct { + kv *pebble.DB + batch *pebble.Batch + curSize int + compare kvCompare[T] +} + +// Close implements gdbi.Sorter. +func (ks *KVSorter[T]) Close() error { + return ks.kv.Close() +} + +// Add implements gdbi.Sorter. +func (ks *KVSorter[T]) Add(value T) { + + k := ks.compare.conf.ToBytes(value) + ks.curSize += len(k) + ks.batch.Set(k, nil, nil) + if ks.curSize > maxWriterBuffer { + ks.batch.Commit(nil) + ks.batch.Reset() + ks.curSize = 0 + } +} + +// Sorted implements gdbi.Sorter. +func (ks *KVSorter[T]) Sorted() chan T { + ks.batch.Commit(nil) + ks.batch.Close() + + out := make(chan T) + go func() { + iter, _ := ks.kv.NewIter(nil) + for iter.First(); iter.Valid(); iter.Next() { + v := iter.Key() + var o T + o, err := ks.compare.conf.FromBytes(v) + if err != nil { + log.Infof("error in Sorted: %s\n", err) + } + out <- o + } + defer close(out) + }() + return out +} + +func (ks *kvCompare[T]) compareEncoded(a, b []byte) int { + aT, err := ks.conf.FromBytes(a) + if err != nil { + log.Debugf("error compareEncoded: %s\n", err) + } + bT, err := ks.conf.FromBytes(b) + if err != nil { + log.Debugf("error compareEncoded: %s\n", err) + } + return ks.conf.Compare(aT, bT) +} + +func NewKVSorter[T any](path string, conf SortConf[T]) Sorter[T] { + comp := kvCompare[T]{conf} + c := *pebble.DefaultComparer + c.Compare = comp.compareEncoded + o := &KVSorter[T]{} + o.kv, _ = pebble.Open(path, &pebble.Options{Comparer: &c}) + o.batch = o.kv.NewBatch() + o.curSize = 0 + o.compare = comp + return o +} diff --git a/engine/logic/sorter_mem.go b/engine/logic/sorter_mem.go new file mode 100644 index 000000000..91edc0d40 --- /dev/null +++ b/engine/logic/sorter_mem.go @@ -0,0 +1,36 @@ +package logic + +import "slices" + +type MemSorter[T any] struct { + data []T + conf SortConf[T] +} + +// Add implements Sorter. +func (m *MemSorter[T]) Add(value T) { + m.data = append(m.data, value) +} + +// Close implements Sorter. +func (m *MemSorter[T]) Close() error { + return nil +} + +// Sorted implements Sorter. +func (m *MemSorter[T]) Sorted() chan T { + slices.SortFunc(m.data, m.conf.Compare) + out := make(chan T) + go func() { + defer close(out) + for _, i := range m.data { + out <- i + } + }() + return out +} + +func NewMemSorter[T any](conf SortConf[T]) Sorter[T] { + o := make([]T, 0, 10) + return &MemSorter[T]{o, conf} +} diff --git a/engine/logic/totype.go b/engine/logic/totype.go new file mode 100644 index 000000000..3d3d99d52 --- /dev/null +++ b/engine/logic/totype.go @@ -0,0 +1,80 @@ +package logic + +import ( + "strconv" +) + +func ConvertToType(input any, targetType string) any { + switch targetType { + case "string": + switch v := input.(type) { + case string: + return v + case int: + return strconv.Itoa(v) + case float64: + return strconv.FormatFloat(v, 'f', -1, 64) + case bool: + return strconv.FormatBool(v) + default: + return "" + } + case "bool": + switch v := input.(type) { + // Trying to match mongodb behavior https://www.mongodb.com/docs/manual/reference/operator/aggregation/convert/#std-label-convert-to-bool + case string: + return true + case int: + return v != 0 + case float64: + return v != 0.0 + case bool: + return v + default: + return false + } + case "float": + switch v := input.(type) { + case string: + parsedFloat, _ := strconv.ParseFloat(v, 64) + return parsedFloat + case int: + return float64(v) + case float64: + return v + case bool: + if v { + return 1.0 + } + return 0.0 + default: + return 0.0 + } + case "int": + switch v := input.(type) { + case string: + parsedInt, _ := strconv.Atoi(v) + return parsedInt + case int: + return v + case float64: + return int(v) + case bool: + if v { + return 1 + } + return 0 + default: + return 0 + } + case "list": + switch v := input.(type) { + case []any: + return v + default: + return []any{v} + } + default: + return nil + } +} diff --git a/engine/manager.go b/engine/manager.go index 9317e2f5d..c6c5f963a 100644 --- a/engine/manager.go +++ b/engine/manager.go @@ -1,7 +1,7 @@ package engine import ( - "io/ioutil" + "io" "os" "github.com/bmeg/grip/gdbi" @@ -11,17 +11,23 @@ import ( // NewManager creates a resource manager func NewManager(workDir string) gdbi.Manager { - return &manager{[]kvi.KVInterface{}, []string{}, workDir} + return &manager{[]io.Closer{}, []string{}, workDir} } type manager struct { - kvs []kvi.KVInterface + kvs []io.Closer paths []string workDir string } +// GetTmpDir implements gdbi.Manager. +func (bm *manager) GetTmpDir() string { + td, _ := os.MkdirTemp(bm.workDir, "tmp") + return td +} + func (bm *manager) GetTempKV() kvi.KVInterface { - td, _ := ioutil.TempDir(bm.workDir, "kvTmp") + td, _ := os.MkdirTemp(bm.workDir, "kvTmp") kv, _ := badgerdb.NewKVInterface(td, kvi.Options{}) bm.kvs = append(bm.kvs, kv) diff --git a/engine/pipeline/pipe_logger.go b/engine/pipeline/pipe_logger.go new file mode 100644 index 000000000..65bcd7eba --- /dev/null +++ b/engine/pipeline/pipe_logger.go @@ -0,0 +1,43 @@ +package pipeline + +import ( + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/log" +) + +type StepLogger struct { + Counts uint64 + in, out chan gdbi.Traveler +} + +type PipelineLogger struct { + steps map[string]*StepLogger +} + +func NewPipelineLogger() *PipelineLogger { + return &PipelineLogger{steps: map[string]*StepLogger{}} +} + +func (pl *PipelineLogger) AddStep(name string, in chan gdbi.Traveler) chan gdbi.Traveler { + s := &StepLogger{ + Counts: 0, + in: in, + out: make(chan gdbi.Traveler, 10), + } + go func(a *StepLogger) { + defer close(a.out) + for i := range a.in { + a.Counts++ + a.out <- i + } + }(s) + pl.steps[name] = s + return s.out +} + +func (pl *PipelineLogger) Log() { + for n, c := range pl.steps { + log.Debugf("step count: %s %d", n, c.Counts) + } + +} diff --git a/engine/pipeline/pipes.go b/engine/pipeline/pipes.go index e286c552d..53f76a994 100644 --- a/engine/pipeline/pipes.go +++ b/engine/pipeline/pipes.go @@ -6,6 +6,7 @@ package pipeline import ( "context" + "fmt" "github.com/bmeg/grip/engine" "github.com/bmeg/grip/engine/logic" @@ -15,13 +16,21 @@ import ( "google.golang.org/protobuf/types/known/structpb" ) +var debug = true + +type RunningPipeline struct { + Outputs gdbi.InPipe + Logger *PipelineLogger +} + // Start begins processing a query pipeline -func Start(ctx context.Context, pipe gdbi.Pipeline, man gdbi.Manager, bufsize int, input gdbi.InPipe, cancel func()) gdbi.InPipe { +func Start(ctx context.Context, pipe gdbi.Pipeline, man gdbi.Manager, bufsize int, input gdbi.InPipe, cancel func()) *RunningPipeline { procs := pipe.Processors() if len(procs) == 0 { + log.Debugf("User query has no steps") ch := make(chan gdbi.Traveler) close(ch) - return ch + return nil } markProcs := map[string]*logic.JumpMark{} @@ -30,24 +39,31 @@ func Start(ctx context.Context, pipe gdbi.Pipeline, man gdbi.Manager, bufsize in markProcs[p.Name] = p } } + + // if there is a jump statement, connect to back to the mark statement for i := range procs { if p, ok := procs[i].(*logic.Jump); ok { if d, ok := markProcs[p.Mark]; ok { p.Init() d.AddInput(p.GetJumpOutput()) } else { - log.Errorf("Missing Jump Mark") + log.Debugf("User query missing Jump Mark") ch := make(chan gdbi.Traveler) close(ch) - return ch + return nil } } } + l := NewPipelineLogger() + in := make(chan gdbi.Traveler, bufsize) final := make(chan gdbi.Traveler, bufsize) out := final for i := len(procs) - 1; i >= 0; i-- { + if debug { + in = l.AddStep(fmt.Sprintf("%T_%d", procs[i], i), in) + } ctx = procs[i].Process(ctx, man, in, out) out = in in = make(chan gdbi.Traveler, bufsize) @@ -55,13 +71,16 @@ func Start(ctx context.Context, pipe gdbi.Pipeline, man gdbi.Manager, bufsize in go func() { if input != nil { + inputCount := uint64(0) for i := range input { if ctx.Err() == context.Canceled { //cancel upstream cancel() } + inputCount++ out <- i } + log.Debugf("Stream input count: %d", inputCount) } else { // Write an empty traveler to input // to trigger the computation. @@ -71,7 +90,10 @@ func Start(ctx context.Context, pipe gdbi.Pipeline, man gdbi.Manager, bufsize in close(in) close(out) }() - return final + return &RunningPipeline{ + Outputs: final, + Logger: l, + } } // Run starts a pipeline and converts the output to server output structures @@ -84,7 +106,8 @@ func Run(ctx context.Context, pipe gdbi.Pipeline, workdir string) <-chan *gripql dataType := pipe.DataType() markTypes := pipe.MarkTypes() man := engine.NewManager(workdir) - for t := range Start(ctx, pipe, man, bufsize, nil, nil) { + rPipe := Start(ctx, pipe, man, bufsize, nil, nil) + for t := range rPipe.Outputs { if !t.IsSignal() { resch <- Convert(graph, dataType, markTypes, t) } @@ -104,9 +127,16 @@ func Resume(ctx context.Context, pipe gdbi.Pipeline, workdir string, input gdbi. dataType := pipe.DataType() markTypes := pipe.MarkTypes() man := engine.NewManager(workdir) - for t := range Start(ctx, pipe, man, bufsize, input, cancel) { - if !t.IsSignal() { - resch <- Convert(graph, dataType, markTypes, t) + log.Debugf("resuming: out %s", dataType) + rPipe := Start(ctx, pipe, man, bufsize, input, cancel) + if rPipe != nil { + for t := range rPipe.Outputs { + if !t.IsSignal() { + resch <- Convert(graph, dataType, markTypes, t) + } + } + if debug { + rPipe.Logger.Log() } } man.Cleanup() @@ -118,33 +148,39 @@ func Resume(ctx context.Context, pipe gdbi.Pipeline, workdir string, input gdbi. func Convert(graph gdbi.GraphInterface, dataType gdbi.DataType, markTypes map[string]gdbi.DataType, t gdbi.Traveler) *gripql.QueryResult { switch dataType { case gdbi.VertexData: - ve := t.GetCurrent() - if ve != nil { - if !ve.Loaded { - //log.Infof("Loading output vertex: %s", ve.ID) - //TODO: doing single vertex queries is slow. - // Need to rework this to do batched queries - ve = graph.GetVertex(ve.ID, true) - } - return &gripql.QueryResult{ - Result: &gripql.QueryResult_Vertex{ - Vertex: ve.ToVertex(), - }, + ver := t.GetCurrent() + if ver != nil { + ve := ver.Get() + if ve != nil { + if !ve.Loaded { + //log.Infof("Loading output vertex: %s", ve.ID) + //TODO: doing single vertex queries is slow. + // Need to rework this to do batched queries + ve = graph.GetVertex(ve.ID, true) + } + return &gripql.QueryResult{ + Result: &gripql.QueryResult_Vertex{ + Vertex: ve.ToVertex(), + }, + } } } else { return &gripql.QueryResult{Result: &gripql.QueryResult_Vertex{}} } case gdbi.EdgeData: - ee := t.GetCurrent() - if ee != nil { - if !ee.Loaded { - ee = graph.GetEdge(ee.ID, true) - } - return &gripql.QueryResult{ - Result: &gripql.QueryResult_Edge{ - Edge: ee.ToEdge(), - }, + eer := t.GetCurrent() + if eer != nil { + ee := eer.Get() + if ee != nil { + if !ee.Loaded { + ee = graph.GetEdge(ee.ID, true) + } + return &gripql.QueryResult{ + Result: &gripql.QueryResult_Edge{ + Edge: ee.ToEdge(), + }, + } } } else { return &gripql.QueryResult{Result: &gripql.QueryResult_Edge{}} @@ -157,44 +193,6 @@ func Convert(graph gdbi.GraphInterface, dataType gdbi.DataType, markTypes map[st }, } - case gdbi.SelectionData: - selections := map[string]*gripql.Selection{} - for k, v := range t.GetSelections() { - switch markTypes[k] { - case gdbi.VertexData: - var ve *gripql.Vertex - if !v.Loaded { - ve = graph.GetVertex(v.ID, true).ToVertex() - } else { - ve = v.ToVertex() - } - selections[k] = &gripql.Selection{ - Result: &gripql.Selection_Vertex{ - Vertex: ve, - }, - } - case gdbi.EdgeData: - var ee *gripql.Edge - if !v.Loaded { - ee = graph.GetEdge(ee.Gid, true).ToEdge() - } else { - ee = v.ToEdge() - } - selections[k] = &gripql.Selection{ - Result: &gripql.Selection_Edge{ - Edge: ee, - }, - } - } - } - return &gripql.QueryResult{ - Result: &gripql.QueryResult_Selections{ - Selections: &gripql.Selections{ - Selections: selections, - }, - }, - } - case gdbi.RenderData: sValue, _ := structpb.NewValue(t.GetRender()) return &gripql.QueryResult{ @@ -205,10 +203,10 @@ func Convert(graph gdbi.GraphInterface, dataType gdbi.DataType, markTypes map[st case gdbi.PathData: path := t.GetPath() - o := make([]interface{}, len(path)) + o := make([]any, len(path)) for i := range path { - j := map[string]interface{}{} + j := map[string]any{} if path[i].Vertex != "" { j["vertex"] = path[i].Vertex } else if path[i].Edge != "" { diff --git a/engine/queue/queue.go b/engine/queue/queue.go deleted file mode 100644 index d0849b5fd..000000000 --- a/engine/queue/queue.go +++ /dev/null @@ -1,74 +0,0 @@ -package queue - -import ( - "fmt" - "sync" - "github.com/bmeg/grip/gdbi" -) - -type MemQueue struct { - input chan gdbi.Traveler - output chan gdbi.Traveler -} - -type Queue interface { - GetInput() chan gdbi.Traveler - GetOutput() chan gdbi.Traveler -} - - -func New() Queue { - o := MemQueue{ - input: make(chan gdbi.Traveler, 50), - output: make(chan gdbi.Traveler, 50), - } - queue := make([]gdbi.Traveler, 0, 1000) - closed := false - m := &sync.Mutex{} - inCount := 0 - outCount := 0 - go func() { - for i := range o.input { - m.Lock() - inCount++ - if i.IsSignal() { - //fmt.Printf("Queue got signal %d\n", i.Signal.ID) - } - //fmt.Printf("Queue Size: %d %d / %d\n", len(queue), inCount, outCount) - queue = append(queue, i) - m.Unlock() - } - closed = true - }() - go func() { - defer close(o.output) - for running := true; running ;{ - var v gdbi.Traveler - m.Lock() - if len(queue) > 0 { - v = queue[0] - queue = queue[1:] - } else { - if closed { - running = false - } - } - m.Unlock() - if v != nil { - o.output <- v - outCount++ - } - } - fmt.Printf("Closing Queue Size: %d %d / %d\n", len(queue), inCount, outCount) - fmt.Printf("Closing Buffered Queue\n") - }() - return &o -} - -func (q *MemQueue) GetInput() chan gdbi.Traveler { - return q.input -} - -func (q *MemQueue) GetOutput() chan gdbi.Traveler { - return q.output -} diff --git a/etl.py b/etl.py new file mode 100644 index 000000000..7aef004f7 --- /dev/null +++ b/etl.py @@ -0,0 +1,29 @@ +import json + + +def extract_ids_from_ndjson(input_file, output_file): + ids = [] + + # Read the NDJSON file + with open(input_file, 'r') as f: + for line in f: + data = json.loads(line.strip()) + ids.append(data['_id']) + + with open(input_file_edge, 'r') as f: + for line in f: + data = json.loads(line.strip()) + ids.append(data['_id']) + + + # Write the IDs to the output file in the specified format + with open(output_file, 'w') as f: + f.write('[' + ','.join([f'"{id}"' for id in ids]) + ']') + +# Specify the input and output file paths +input_file = 'OUT/Observation.vertex.json' +input_file_edge= 'OUT/Observation.in.edge.json' +output_file = 'output.json' + +# Extract the IDs and write them to the output file +extract_ids_from_ndjson(input_file, output_file) diff --git a/example/amazon_convert.py b/example/amazon_convert.py index 5b5a81872..71d0e1402 100755 --- a/example/amazon_convert.py +++ b/example/amazon_convert.py @@ -21,14 +21,14 @@ def __init__(self, outpath): self.record_count = 0 def add_record(self, rec): - q = {"gid" : rec['ASIN'], "label" : rec.get("group", "Unknown"), "data" : {}} + q = {"_id" : rec['ASIN'], "_label" : rec.get("group", "Unknown")} for i in ["Id", "group", "title", "salesrank"]: if i in rec: - q["data"][i] = rec[i] + q[i] = rec[i] self.vert_handle.write(json.dumps(q) + "\n") for i in rec.get('similar', []): - e = { "from" : rec['ASIN'], "to" : i, "label" : "similar" } + e = { "_from" : rec['ASIN'], "_to" : i, "_label" : "similar" } self.edge_handle.write(json.dumps(e) + "\n") self.record_count += 1 diff --git a/example/load_matrix.py b/example/load_matrix.py index f66857174..04f9981ac 100755 --- a/example/load_matrix.py +++ b/example/load_matrix.py @@ -25,26 +25,26 @@ def load_matrix(args): if args.dump is not None: dump_vertex_file = open(args.dump + ".vertex", "w") dump_edge_file = open(args.dump + ".edge", "w") - def dump_vertex(gid, label, data): - print("Add Vertex: %s" % (gid)) - dump_vertex_file.write(json.dumps({"gid":gid, "label":label, "data":data}) + "\n") + def dump_vertex(id, label, data): + print("Add Vertex: %s" % (id)) + dump_vertex_file.write(json.dumps({"_id":id, "_label":label}.update(data)) + "\n") def dump_edge(src, dst, label, data): print("Add Edge: %s %s" % (src, dst)) - dump_edge_file.write(json.dumps({"from":src, "to":dst, "label": label, "data":data})+"\n") + dump_edge_file.write(json.dumps({"_from":src, "_to":dst, "_label": label}.update(data))+"\n") if args.connect: if not args.no_vertex: #every row x col creates an edge with the weight value for c in matrix.columns: cname = "%s%s" % (args.col_prefix, c) - if list(O.query().V(c).count())[0]['count'] == 0: + if list(O.V(c).count())[0]['count'] == 0: if args.dump is not None: dump_vertex(c, args.col_label, {}) else: O.addVertex(c, args.col_label) for r in matrix.index: rname = "%s%s" % (args.row_prefix, r) - if list(O.query().V(r).count())[0]['count'] == 0: + if list(O.V(r).count())[0]['count'] == 0: if args.dump: dump_vertex(r, args.row_label, {}) else: @@ -88,7 +88,7 @@ def dump_edge(src, dst, label, data): else: O.addVertex(rname, args.row_label, data) data["_rowname"] = name - data["_gid"] = rname + data["_id"] = rname for dst, edge in args.edge: try: dstFmt = dst.format(**data) @@ -106,7 +106,7 @@ def dump_edge(src, dst, label, data): except KeyError: dstFmt = None if dstFmt is not None: - if list(O.query().V(dstFmt).count())[0]['count'] == 0: + if list(O.V(dstFmt).count())[0]['count'] == 0: if args.dump: dump_vertex(dstFmt, label, {}) else: @@ -124,13 +124,13 @@ def dump_edge(src, dst, label, data): parser.add_argument("--sep", default="\t", help="TSV delimiter") parser.add_argument("--server", default="http://localhost:8201", help="Server Address") parser.add_argument("--row-label", dest="row_label", default="Row", help="Vertex Label used when loading rows") - parser.add_argument("--row-prefix", default="", help="Prefix added to row vertex gid") + parser.add_argument("--row-prefix", default="", help="Prefix added to row vertex id") parser.add_argument("-t", "--transpose", action="store_true", default=False, help="Transpose matrix") - parser.add_argument("--index-col", default=0, type=int, help="Column number to use as index (and gid for vertex load)") + parser.add_argument("--index-col", default=0, type=int, help="Column number to use as index (and id for vertex load)") parser.add_argument("--skiprows", default=None, type=int, help="Skip rows at top of file") parser.add_argument("--connect", action="store_true", default=False, help="Switch to 'fully connected mode' and load matrix cell values on edges between row and column names") parser.add_argument("--col-label", dest="col_label", default="Col", help="Column vertex label in 'connect' mode") - parser.add_argument("--col-prefix", default="", help="Prefix added to col vertex gid in 'connect' mode") + parser.add_argument("--col-prefix", default="", help="Prefix added to col vertex id in 'connect' mode") parser.add_argument("--edge-label", dest="edge_label", default="weight", help="Edge label for edges in 'connect' mode") parser.add_argument("--edge-prop", dest="edge_prop", default="w", help="Property name for storing value when in 'connect' mode") diff --git a/existing-sql/graph.go b/existing-sql/graph.go index 4ac37e539..cc4994cd0 100644 --- a/existing-sql/graph.go +++ b/existing-sql/graph.go @@ -45,6 +45,10 @@ func (g *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { return errors.New("not implemented") } +func (g *Graph) BulkDel(data *gdbi.DeleteData) error { + return errors.New("not implemented") +} + // DelVertex is not implemented in the SQL driver func (g *Graph) DelVertex(key string) error { return errors.New("not implemented") @@ -75,7 +79,7 @@ func (g *Graph) GetVertex(key string, load bool) *gdbi.Vertex { id := parts[1] gidField := g.schema.GetVertexGid(table) q := fmt.Sprintf("SELECT * FROM %s WHERE %s=%s", table, gidField, id) - data := make(map[string]interface{}) + data := make(map[string]any) row := g.db.QueryRowx(q) types, err := rowColumnTypeMap(row) if err != nil { @@ -109,7 +113,7 @@ func (g *Graph) getTableBackedEdge(key string, load bool) *gripql.Edge { edgeSchema := g.schema.GetEdge(table) gidField := edgeSchema.GidField q := fmt.Sprintf("SELECT * FROM %s WHERE %s=%s", table, gidField, id) - data := make(map[string]interface{}) + data := make(map[string]any) row := g.db.QueryRowx(q) types, err := rowColumnTypeMap(row) if err != nil { @@ -156,7 +160,7 @@ func (g *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Verte } defer rows.Close() for rows.Next() { - data := make(map[string]interface{}) + data := make(map[string]any) if err := rows.MapScan(data); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexList: MapScan") return @@ -198,7 +202,7 @@ func (g *Graph) VertexLabelScan(ctx context.Context, label string) chan string { return } v := rowDataToVertex(v, data, types, false) - o <- v.Gid + o <- v.Id } if err := rows.Err(); err != nil { log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: iterating") @@ -333,7 +337,7 @@ func (g *Graph) GetVertexChannel(ctx context.Context, reqChan chan gdbi.ElementL return } v := rowDataToVertex(g.schema.GetVertex(table), data, types, load) - r := batchMap[v.Gid] + r := batchMap[v.Id] for _, ri := range r { ri.Vertex = gdbi.NewElementFromVertex(v) o <- ri diff --git a/existing-sql/util.go b/existing-sql/util.go index bd204ce9d..42613093f 100644 --- a/existing-sql/util.go +++ b/existing-sql/util.go @@ -89,7 +89,7 @@ func convertData(data map[string]interface{}, types map[string]*sql.ColumnType) func rowDataToVertex(schema *Vertex, data map[string]interface{}, types map[string]*sql.ColumnType, load bool) *gripql.Vertex { v := &gripql.Vertex{ - Gid: fmt.Sprintf("%v:%v", schema.Table, data[schema.GidField]), + Id: fmt.Sprintf("%v:%v", schema.Table, data[schema.GidField]), Label: schema.Label, } if load { @@ -101,7 +101,7 @@ func rowDataToVertex(schema *Vertex, data map[string]interface{}, types map[stri func rowDataToEdge(schema *Edge, data map[string]interface{}, types map[string]*sql.ColumnType, load bool) *gripql.Edge { e := &gripql.Edge{ - Gid: fmt.Sprintf("%v:%v", schema.Table, data[schema.GidField]), + Id: fmt.Sprintf("%v:%v", schema.Table, data[schema.GidField]), Label: schema.Label, From: fmt.Sprintf("%v:%v", schema.From.DestTable, data[schema.From.SourceField]), To: fmt.Sprintf("%v:%v", schema.To.DestTable, data[schema.To.SourceField]), @@ -133,7 +133,7 @@ func (geid generatedEdgeID) String() string { func (geid generatedEdgeID) Edge() *gripql.Edge { return &gripql.Edge{ - Gid: geid.String(), + Id: geid.String(), Label: geid.Label, From: fmt.Sprintf("%v:%v", geid.FromTable, geid.FromID), To: fmt.Sprintf("%v:%v", geid.ToTable, geid.ToID), diff --git a/gdbi/data_element.go b/gdbi/data_element.go new file mode 100644 index 000000000..1d643b3f5 --- /dev/null +++ b/gdbi/data_element.go @@ -0,0 +1,147 @@ +package gdbi + +import ( + "errors" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "google.golang.org/protobuf/types/known/structpb" +) + +// ToVertex converts data element to vertex +func (elem *DataElement) ToVertex() *gripql.Vertex { + sValue, err := structpb.NewStruct(elem.Data) + if err != nil { + log.Errorf("ToVertex: %s For elem.Data: '%#v'\n", err, elem.Data) + } + return &gripql.Vertex{ + Id: elem.ID, + Label: elem.Label, + Data: sValue, + } +} + +// ToEdge converts data element to edge +func (elem *DataElement) ToEdge() *gripql.Edge { + sValue, err := structpb.NewStruct(elem.Data) + if err != nil { + log.Errorf("ToEdge: %s For elem.Data: '%#v'\n", err, elem.Data) + } + return &gripql.Edge{ + Id: elem.ID, + From: elem.From, + To: elem.To, + Label: elem.Label, + Data: sValue, + } +} + +// ToDict converts data element to generic map +func (elem *DataElement) ToDict() map[string]interface{} { + /* + out := map[string]interface{}{ + "_id": "", + "_label": "", + "_to": "", + "_from": "", + "*": map[string]interface{}{}, + } + */ + out := map[string]interface{}{} + if elem == nil { + return out + } + for k, v := range elem.Data { + out[k] = v + } + if elem.ID != "" { + out["_id"] = elem.ID + } + if elem.Label != "" { + out["_label"] = elem.Label + } + if elem.To != "" { + out["_to"] = elem.To + } + if elem.From != "" { + out["_from"] = elem.From + } + return out +} + +func (elem *DataElement) FromDict(d map[string]any) { + if elem.Data == nil { + elem.Data = map[string]any{} + } + for k, v := range d { + switch k { + case "_to": + if vStr, ok := v.(string); ok { + elem.To = vStr + } + case "_from": + if vStr, ok := v.(string); ok { + elem.From = vStr + } + case "_id": + if vStr, ok := v.(string); ok { + elem.ID = vStr + } + case "_label": + if vStr, ok := v.(string); ok { + elem.Label = vStr + } + default: + elem.Data[k] = v + } + } + elem.Loaded = true +} + +// Validate returns an error if the vertex is invalid +func (vertex *Vertex) Validate() error { + if vertex.ID == "" { + return errors.New("'_id' cannot be blank") + } + if vertex.Label == "" { + return errors.New("'_label' cannot be blank") + } + for k := range vertex.Data { + err := gripql.ValidateFieldName(k) + if err != nil { + return err + } + } + return nil +} + +func NewGraphElement(g *gripql.GraphElement) *GraphElement { + o := GraphElement{Graph: g.Graph} + if g.Vertex != nil { + o.Vertex = NewElementFromVertex(g.Vertex) + } + if g.Edge != nil { + o.Edge = NewElementFromEdge(g.Edge) + } + return &o +} + +func NewElementFromVertex(v *gripql.Vertex) *Vertex { + return &Vertex{ + ID: v.Id, + Label: v.Label, + Data: v.Data.AsMap(), + Loaded: true, + } +} + +func NewElementFromEdge(e *gripql.Edge) *Edge { + return &Edge{ + ID: e.Id, + Label: e.Label, + To: e.To, + From: e.From, + Data: e.Data.AsMap(), + Loaded: true, + } +} diff --git a/gdbi/interface.go b/gdbi/interface.go index 88eca9abb..4de3e1b61 100644 --- a/gdbi/interface.go +++ b/gdbi/interface.go @@ -26,16 +26,46 @@ type DataElement struct { Loaded bool } -type Vertex = DataElement +// DataRef is a handler interface above DataElement, that allows processing pipelines +// to avoid loading data data required for DataElement until it is actually needed +type DataRef interface { + Get() *DataElement + Copy() DataRef +} + +func (d *DataElement) Get() *DataElement { + return d +} + +func (d *DataElement) Copy() DataRef { + return &DataElement{ + ID: d.ID, + To: d.To, + From: d.From, + Label: d.Label, + Loaded: d.Loaded, + Data: d.Data, + } +} +type Vertex = DataElement type Edge = DataElement +type VertexRef = DataRef +type EdgeRef = DataRef + type GraphElement struct { Vertex *Vertex Edge *Edge Graph string } +type DeleteData struct { + Graph string + Vertices []string + Edges []string +} + type Aggregate struct { Name string Key interface{} @@ -68,15 +98,18 @@ type Traveler interface { IsSignal() bool GetSignal() Signal IsNull() bool - GetCurrent() *DataElement + GetCurrent() DataRef GetCurrentID() string - AddCurrent(r *DataElement) Traveler + AddCurrent(r DataRef) Traveler Copy() Traveler HasMark(label string) bool - GetMark(label string) *DataElement - AddMark(label string, r *DataElement) Traveler + GetMark(label string) DataRef + // AddMark adds a new mark to the data and return a duplicated Traveler + AddMark(label string, r DataRef) Traveler + // UpdateMark changes the data of a mark in the original traveler (vs AddMark which changes a copy of the traveler) + UpdateMark(label string, r DataRef) ListMarks() []string - GetSelections() map[string]*DataElement + GetSelections() map[string]DataRef GetRender() interface{} GetPath() []DataElementID GetAggregation() *Aggregate @@ -102,8 +135,8 @@ const ( type ElementLookup struct { ID string Ref Traveler - Vertex *Vertex - Edge *Edge + Vertex VertexRef + Edge EdgeRef } // GraphDB is the base interface for graph databases @@ -130,6 +163,7 @@ type GraphInterface interface { AddEdge(edge []*Edge) error BulkAdd(<-chan *GraphElement) error + BulkDel(*DeleteData) error DelVertex(key string) error DelEdge(key string) error @@ -158,5 +192,6 @@ type GraphInterface interface { type Manager interface { //Get handle to temporary KeyValue store driver GetTempKV() kvi.KVInterface + GetTmpDir() string Cleanup() } diff --git a/gdbi/pipeline.go b/gdbi/pipeline.go index c5d2569e2..32fe60a72 100644 --- a/gdbi/pipeline.go +++ b/gdbi/pipeline.go @@ -9,6 +9,7 @@ import ( type PipelineState interface { GetLastType() DataType SetLastType(DataType) + StepLoadData() bool } type CustomProcGen interface { @@ -16,10 +17,15 @@ type CustomProcGen interface { GetProcessor(db GraphInterface, ps PipelineState) (Processor, error) } +type PipelineExtension struct { + StartType DataType + MarksTypes map[string]DataType +} + type CompileOptions struct { //Compile pipeline extension - PipelineExtension DataType - ExtensionMarkTypes map[string]DataType + Extends *PipelineExtension + StoreMarks bool } // Compiler takes a gripql query and turns it into an executable pipeline @@ -39,3 +45,48 @@ type Pipeline interface { DataType() DataType MarkTypes() map[string]DataType } + +type StatementCompiler interface { + V(gs *gripql.GraphStatement_V, ps *State) (Processor, error) + In(gs *gripql.GraphStatement_In, ps *State) (Processor, error) + Out(gs *gripql.GraphStatement_Out, ps *State) (Processor, error) + InNull(gs *gripql.GraphStatement_InNull, ps *State) (Processor, error) + OutNull(gs *gripql.GraphStatement_OutNull, ps *State) (Processor, error) + Both(gs *gripql.GraphStatement_Both, ps *State) (Processor, error) + InE(gs *gripql.GraphStatement_InE, ps *State) (Processor, error) + InENull(gs *gripql.GraphStatement_InENull, ps *State) (Processor, error) + OutE(gs *gripql.GraphStatement_OutE, ps *State) (Processor, error) + OutENull(gs *gripql.GraphStatement_OutENull, ps *State) (Processor, error) + BothE(gs *gripql.GraphStatement_BothE, ps *State) (Processor, error) + Has(gs *gripql.GraphStatement_Has, ps *State) (Processor, error) + HasLabel(gs *gripql.GraphStatement_HasLabel, ps *State) (Processor, error) + HasKey(gs *gripql.GraphStatement_HasKey, ps *State) (Processor, error) + HasID(gs *gripql.GraphStatement_HasId, ps *State) (Processor, error) + + Limit(gs *gripql.GraphStatement_Limit, ps *State) (Processor, error) + Skip(gs *gripql.GraphStatement_Skip, ps *State) (Processor, error) + Range(gs *gripql.GraphStatement_Range, ps *State) (Processor, error) + Count(gs *gripql.GraphStatement_Count, ps *State) (Processor, error) + Distinct(gs *gripql.GraphStatement_Distinct, ps *State) (Processor, error) + As(gs *gripql.GraphStatement_As, ps *State) (Processor, error) + Set(gs *gripql.GraphStatement_Set, ps *State) (Processor, error) + Increment(gs *gripql.GraphStatement_Increment, ps *State) (Processor, error) + Mark(gs *gripql.GraphStatement_Mark, ps *State) (Processor, error) + Jump(gs *gripql.GraphStatement_Jump, ps *State) (Processor, error) + Select(gs *gripql.GraphStatement_Select, ps *State) (Processor, error) + + Render(gs *gripql.GraphStatement_Render, ps *State) (Processor, error) + Pivot(gs *gripql.GraphStatement_Pivot, ps *State) (Processor, error) + + Path(gs *gripql.GraphStatement_Path, ps *State) (Processor, error) + Unwind(gs *gripql.GraphStatement_Unwind, ps *State) (Processor, error) + Group(gs *gripql.GraphStatement_Group, ps *State) (Processor, error) + ToType(gs *gripql.GraphStatement_Totype, ps *State) (Processor, error) + + Fields(gs *gripql.GraphStatement_Fields, ps *State) (Processor, error) + Aggregate(gs *gripql.GraphStatement_Aggregate, ps *State) (Processor, error) + + Sort(gs *gripql.GraphStatement_Sort, ps *State) (Processor, error) + + Custom(gs *gripql.GraphStatement, ps *State) (Processor, error) +} diff --git a/gdbi/queue.go b/gdbi/queue.go new file mode 100644 index 000000000..a5164a012 --- /dev/null +++ b/gdbi/queue.go @@ -0,0 +1,73 @@ +package gdbi + +import ( + "sync" + + "github.com/bmeg/grip/log" +) + +type MemQueue struct { + input chan Traveler + output chan Traveler +} + +type Queue interface { + GetInput() chan Traveler + GetOutput() chan Traveler +} + +func NewQueue() Queue { + o := MemQueue{ + input: make(chan Traveler, 50), + output: make(chan Traveler, 50), + } + queue := make([]Traveler, 0, 1000) + closed := false + m := &sync.Mutex{} + inCount := 0 + outCount := 0 + go func() { + for i := range o.input { + m.Lock() + inCount++ + if i.IsSignal() { + log.Debugf("Queue got signal %d\n", i.GetSignal().ID) + } + //fmt.Printf("Queue Size: %d %d / %d\n", len(queue), inCount, outCount) + queue = append(queue, i) + m.Unlock() + } + closed = true + }() + go func() { + defer close(o.output) + for running := true; running; { + var v Traveler + m.Lock() + if len(queue) > 0 { + v = queue[0] + queue = queue[1:] + } else { + if closed { + running = false + } + } + m.Unlock() + if v != nil { + o.output <- v + outCount++ + } + } + log.Debugf("Closing Queue Size: %d %d / %d\n", len(queue), inCount, outCount) + log.Debugf("Closing Buffered Queue\n") + }() + return &o +} + +func (q *MemQueue) GetInput() chan Traveler { + return q.input +} + +func (q *MemQueue) GetOutput() chan Traveler { + return q.output +} diff --git a/gdbi/schema/scanner.go b/gdbi/schema/scanner.go index 89157caf2..f0caba195 100644 --- a/gdbi/schema/scanner.go +++ b/gdbi/schema/scanner.go @@ -29,11 +29,11 @@ func SchemaScan(ctx context.Context, graphName string, graph gdbi.GraphInterface vids := []any{} for res := range pipeline.Run(ctx, p, "./") { v := res.GetVertex() - vids = append(vids, v.Gid) + vids = append(vids, v.Id) util.MergeMaps(lSchema, v.GetData().AsMap()) } sSchema, _ := structpb.NewStruct(lSchema) - vEnt := &gripql.Vertex{Gid: label, Label: label, Data: sSchema} + vEnt := &gripql.Vertex{Id: label, Label: label, Data: sSchema} vSchema = append(vSchema, vEnt) fromToPairs := make(fromto) @@ -66,7 +66,7 @@ func SchemaScan(ctx context.Context, graphName string, graph gdbi.GraphInterface for k, v := range fromToPairs { sV, _ := structpb.NewStruct(v.(map[string]interface{})) e := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), + Id: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), Label: k.label, From: k.from, To: k.to, diff --git a/engine/pipeline/state.go b/gdbi/state.go similarity index 55% rename from engine/pipeline/state.go rename to gdbi/state.go index 33ef0a965..c8824ff77 100644 --- a/engine/pipeline/state.go +++ b/gdbi/state.go @@ -1,14 +1,14 @@ -package pipeline +package gdbi import ( - "github.com/bmeg/grip/engine/inspect" - "github.com/bmeg/grip/gdbi" + //"github.com/bmeg/grip/engine/inspect" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/gripql/inspect" ) type State struct { - LastType gdbi.DataType - MarkTypes map[string]gdbi.DataType + LastType DataType + MarkTypes map[string]DataType Steps []string StepOutputs map[string][]string CurStep string @@ -28,21 +28,21 @@ func (ps *State) StepLoadData() bool { return false } -func (ps *State) GetLastType() gdbi.DataType { +func (ps *State) GetLastType() DataType { return ps.LastType } -func (ps *State) SetLastType(a gdbi.DataType) { +func (ps *State) SetLastType(a DataType) { ps.LastType = a } -func NewPipelineState(stmts []*gripql.GraphStatement) *State { +func NewPipelineState(stmts []*gripql.GraphStatement, storeMarks bool) *State { steps := inspect.PipelineSteps(stmts) - stepOut := inspect.PipelineStepOutputs(stmts) + stepOut := inspect.PipelineStepOutputs(stmts, storeMarks) return &State{ - LastType: gdbi.NoData, - MarkTypes: map[string]gdbi.DataType{}, + LastType: NoData, + MarkTypes: map[string]DataType{}, Steps: steps, StepOutputs: stepOut, } diff --git a/gdbi/statement_processor.go b/gdbi/statement_processor.go new file mode 100644 index 000000000..675473db9 --- /dev/null +++ b/gdbi/statement_processor.go @@ -0,0 +1,253 @@ +package gdbi + +import ( + "fmt" + + "github.com/bmeg/grip/gdbi/tpath" + "github.com/bmeg/grip/gripql" +) + +func StatementProcessor( + sc StatementCompiler, + gs *gripql.GraphStatement, + db GraphInterface, + ps *State) (Processor, error) { + + switch stmt := gs.GetStatement().(type) { + + case *gripql.GraphStatement_V: + if ps.LastType != NoData { + return nil, fmt.Errorf(`"V" statement is only valid at the beginning of the traversal`) + } + o, err := sc.V(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_In: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.In(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_InNull: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.InNull(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_Out: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.Out(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_OutNull: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"out" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.OutNull(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_Both: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"both" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.Both(stmt, ps) + ps.LastType = VertexData + return o, err + + case *gripql.GraphStatement_InE: + if ps.LastType != VertexData { + return nil, fmt.Errorf(`"inEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) + } + o, err := sc.InE(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_InENull: + if ps.LastType != VertexData { + return nil, fmt.Errorf(`"inEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) + } + o, err := sc.InENull(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_OutE: + if ps.LastType != VertexData { + return nil, fmt.Errorf(`"outEdgeNull" statement is only valid for the vertex type not: %s`, ps.LastType.String()) + } + o, err := sc.OutE(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_OutENull: + if ps.LastType != VertexData { + return nil, fmt.Errorf(`"outEdgeNull" statement is only valid for the vertex type not: %s`, ps.LastType.String()) + } + o, err := sc.OutENull(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_BothE: + if ps.LastType != VertexData { + return nil, fmt.Errorf(`"bothEdge" statement is only valid for the vertex type not: %s`, ps.LastType.String()) + } + o, err := sc.BothE(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_Has: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"Has" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.Has(stmt, ps) + return o, err + + case *gripql.GraphStatement_HasLabel: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"HasLabel" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.HasLabel(stmt, ps) + return o, err + + case *gripql.GraphStatement_HasKey: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"HasKey" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.HasKey(stmt, ps) + return o, err + + case *gripql.GraphStatement_HasId: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"HasId" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.HasID(stmt, ps) + ps.LastType = EdgeData + return o, err + + case *gripql.GraphStatement_Limit: + return sc.Limit(stmt, ps) + + case *gripql.GraphStatement_Skip: + return sc.Skip(stmt, ps) + + case *gripql.GraphStatement_Range: + return sc.Range(stmt, ps) + + case *gripql.GraphStatement_Count: + o, err := sc.Count(stmt, ps) + ps.LastType = CountData + return o, err + + case *gripql.GraphStatement_Distinct: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"distinct" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + o, err := sc.Distinct(stmt, ps) + return o, err + + case *gripql.GraphStatement_As: + if ps.LastType == NoData { + return nil, fmt.Errorf(`"mark" statement is not valid at the beginning of a traversal`) + } + if stmt.As == "" { + return nil, fmt.Errorf(`"mark" statement cannot have an empty name`) + } + if err := gripql.ValidateFieldName(stmt.As); err != nil { + return nil, fmt.Errorf(`"mark" statement invalid; %v`, err) + } + if stmt.As == tpath.CURRENT { + return nil, fmt.Errorf(`"mark" statement invalid; uses reserved name %s`, tpath.CURRENT) + } + ps.MarkTypes[stmt.As] = ps.LastType + return sc.As(stmt, ps) + + case *gripql.GraphStatement_Set: + return sc.Set(stmt, ps) + + case *gripql.GraphStatement_Increment: + return sc.Increment(stmt, ps) + + case *gripql.GraphStatement_Mark: + return sc.Mark(stmt, ps) + + case *gripql.GraphStatement_Jump: + return sc.Jump(stmt, ps) + + case *gripql.GraphStatement_Select: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"select" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + out, err := sc.Select(stmt, ps) + ps.LastType = ps.MarkTypes[stmt.Select] + return out, err + + case *gripql.GraphStatement_Render: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"render" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + out, err := sc.Render(stmt, ps) + ps.LastType = RenderData + return out, err + + case *gripql.GraphStatement_Pivot: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"pivot" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + out, err := sc.Pivot(stmt, ps) + ps.LastType = RenderData + return out, err + + case *gripql.GraphStatement_Path: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"path" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + out, err := sc.Path(stmt, ps) + ps.LastType = PathData + return out, err + + case *gripql.GraphStatement_Unwind: + return sc.Unwind(stmt, ps) + + case *gripql.GraphStatement_Group: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"group" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + return sc.Group(stmt, ps) + + case *gripql.GraphStatement_Totype: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"totype" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + return sc.ToType(stmt, ps) + + case *gripql.GraphStatement_Fields: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"fields" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + return sc.Fields(stmt, ps) + + case *gripql.GraphStatement_Aggregate: + if ps.LastType != VertexData && ps.LastType != EdgeData { + return nil, fmt.Errorf(`"aggregate" statement is only valid for edge or vertex types not: %s`, ps.LastType.String()) + } + out, err := sc.Aggregate(stmt, ps) + ps.LastType = AggregationData + return out, err + + case *gripql.GraphStatement_Sort: + out, err := sc.Sort(stmt, ps) + return out, err + + default: + + return sc.Custom(gs, ps) + } +} diff --git a/gdbi/tpath/fields.go b/gdbi/tpath/fields.go new file mode 100644 index 000000000..f6cd6c4e7 --- /dev/null +++ b/gdbi/tpath/fields.go @@ -0,0 +1,5 @@ +package tpath + +func IsGraphField(f string) bool { + return f == "_gid" || f == "_label" || f == "_to" || f == "_from" +} diff --git a/gdbi/tpath/namepath.go b/gdbi/tpath/namepath.go new file mode 100644 index 000000000..bb84c8345 --- /dev/null +++ b/gdbi/tpath/namepath.go @@ -0,0 +1,94 @@ +package tpath + +import ( + "strings" +) + +// Current represents the 'current' traveler namespace +const CURRENT = "_current" + +// GetNamespace returns the namespace of the provided path +// +// Example: +// GetNamespace("$gene.symbol.ensembl") returns "gene" +func GetNamespace(path string) string { + namespace := "" + parts := strings.Split(path, ".") + if strings.HasPrefix(parts[0], "$") { + namespace = strings.TrimPrefix(parts[0], "$") + } + if namespace == "" { + namespace = CURRENT + } + return namespace +} + +// NormalizePath +// +// Example: +// NormalizePath("gene.symbol.ensembl") returns "$_current.symbol.ensembl" + +func NormalizePath(path string) string { + namespace := CURRENT + parts := strings.Split(path, ".") + + if strings.HasPrefix(parts[0], "$") { + if len(parts[0]) > 1 { + namespace = parts[0][1:] + } + parts = parts[1:] + } + + parts = append([]string{"$" + namespace}, parts...) + return strings.Join(parts, ".") +} + +func ToLocalPath(path string) string { + parts := strings.Split(path, ".") + if strings.HasPrefix(parts[0], "$") { + parts[0] = "$" + } + return strings.Join(parts, ".") +} + +func distinct(x []string) []string { + c := map[string]bool{} + for _, k := range x { + c[k] = true + } + out := []string{} + for k := range c { + out = append(out, k) + } + return out +} + +func GetAllNamespaces(d any) []string { + out := []string{} + + if x, ok := d.([]any); ok { + for _, c := range x { + l := GetAllNamespaces(c) + if len(l) > 0 { + out = append(out, l...) + } + } + return distinct(out) + } else if x, ok := d.(map[string]any); ok { + for k, v := range x { + if strings.HasPrefix(k, "$") { + out = append(out, GetNamespace(k)) + } + l := GetAllNamespaces(v) + if len(l) > 0 { + out = append(out, l...) + } + } + return distinct(out) + } else if x, ok := d.(string); ok { + if strings.HasPrefix(x, "$") { + out = append(out, GetNamespace(x)) + } + } + return out +} diff --git a/gdbi/tpath/namepath_test.go b/gdbi/tpath/namepath_test.go new file mode 100644 index 000000000..26cd7bd6f --- /dev/null +++ b/gdbi/tpath/namepath_test.go @@ -0,0 +1,22 @@ +package tpath + +import "testing" + +func TestPathNormalize(t *testing.T) { + + pairs := [][]string{ + {"_label", "$_current._label"}, + {"name", "$_current.name"}, + {"$.name", "$_current.name"}, + {"$name", "$name"}, + {"$a.name", "$a.name"}, + } + + for _, p := range pairs { + o := NormalizePath(p[0]) + if o != p[1] { + t.Errorf("Normalize %s error: %s != %s", p[0], o, p[1]) + } + } + +} diff --git a/gdbi/tpath/render.go b/gdbi/tpath/render.go new file mode 100644 index 000000000..1af02c478 --- /dev/null +++ b/gdbi/tpath/render.go @@ -0,0 +1,41 @@ +package tpath + +import ( + "github.com/bmeg/jsonpath" +) + +func Render(template any, data map[string]any) (any, error) { + switch elem := template.(type) { + case string: + path := NormalizePath(elem) + return jsonpath.JsonPathLookup(data, path) + case map[string]interface{}: + o := make(map[string]interface{}) + for k, v := range elem { + val, err := Render(v, data) + if err == nil { + o[k] = val + } else if vstring, ok := v.(string); ok && vstring[0] == '$' { + o[k] = nil + } else { + o[k] = v + } + } + return o, nil + case []any: + o := make([]any, len(elem)) + for i := range elem { + val, err := Render(elem[i], data) + if err == nil { + o[i] = val + } else if vstring, ok := elem[i].(string); ok && vstring[0] == '$' { + o[i] = nil + } else { + o[i] = elem[i] + } + } + return o, nil + default: + return template, nil + } +} diff --git a/gdbi/traveler.go b/gdbi/traveler.go index 9053bc5a6..b5162e13f 100644 --- a/gdbi/traveler.go +++ b/gdbi/traveler.go @@ -1,12 +1,8 @@ package gdbi import ( - "errors" - "fmt" - - "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/util/copy" - "google.golang.org/protobuf/types/known/structpb" ) // These consts mark the type of a Pipeline traveler chan @@ -26,7 +22,7 @@ const ( ) // AddCurrent creates a new copy of the travel with new 'current' value -func (t *BaseTraveler) AddCurrent(r *DataElement) Traveler { +func (t *BaseTraveler) AddCurrent(r DataRef) Traveler { o := BaseTraveler{ Marks: map[string]*DataElement{}, Path: make([]DataElementID, len(t.Path)+1), @@ -38,14 +34,17 @@ func (t *BaseTraveler) AddCurrent(r *DataElement) Traveler { for i := range t.Path { o.Path[i] = t.Path[i] } - if r == nil { - o.Path[len(t.Path)] = DataElementID{} - } else if r.To != "" { - o.Path[len(t.Path)] = DataElementID{Edge: r.ID} - } else { - o.Path[len(t.Path)] = DataElementID{Vertex: r.ID} + if r != nil { + rd := r.Get() + if rd == nil { + o.Path[len(t.Path)] = DataElementID{} + } else if rd.To != "" { + o.Path[len(t.Path)] = DataElementID{Edge: rd.ID} + } else { + o.Path[len(t.Path)] = DataElementID{Vertex: rd.ID} + } + o.Current = r.Get() } - o.Current = r return &o } @@ -57,12 +56,13 @@ func (t *BaseTraveler) Copy() Traveler { Signal: t.Signal, } for k, v := range t.Marks { + vg := v.Get() o.Marks[k] = &DataElement{ - ID: v.ID, - Label: v.Label, - From: v.From, To: v.To, - Data: copy.DeepCopy(v.Data).(map[string]interface{}), - Loaded: v.Loaded, + ID: vg.ID, + Label: vg.Label, + From: vg.From, To: vg.To, + Data: copy.DeepCopy(vg.Data).(map[string]interface{}), + Loaded: vg.Loaded, } } for i := range t.Path { @@ -103,12 +103,12 @@ func (t *BaseTraveler) ListMarks() []string { } // AddMark adds a result to travels state map using `label` as the name -func (t *BaseTraveler) AddMark(label string, r *DataElement) Traveler { +func (t *BaseTraveler) AddMark(label string, r DataRef) Traveler { o := BaseTraveler{Marks: map[string]*DataElement{}, Path: make([]DataElementID, len(t.Path))} for k, v := range t.Marks { o.Marks[k] = v } - o.Marks[label] = r + o.Marks[label] = r.Get() for i := range t.Path { o.Path[i] = t.Path[i] } @@ -116,26 +116,38 @@ func (t *BaseTraveler) AddMark(label string, r *DataElement) Traveler { return &o } +func (t *BaseTraveler) UpdateMark(label string, r DataRef) { + if label == tpath.CURRENT { + t.Current = r.Get() + return + } + t.Marks[label] = r.Get() +} + // GetMark gets stored result in travels state using its label -func (t *BaseTraveler) GetMark(label string) *DataElement { +func (t *BaseTraveler) GetMark(label string) DataRef { return t.Marks[label] } // GetCurrent get current result value attached to the traveler -func (t *BaseTraveler) GetCurrent() *DataElement { +func (t *BaseTraveler) GetCurrent() DataRef { return t.Current } func (t *BaseTraveler) GetCurrentID() string { - return t.Current.ID + return t.Current.Get().ID } func (t *BaseTraveler) GetCount() uint32 { return t.Count } -func (t *BaseTraveler) GetSelections() map[string]*DataElement { - return t.Selections +func (t *BaseTraveler) GetSelections() map[string]DataRef { + out := map[string]DataRef{} + for k, v := range t.Selections { + out[k] = v + } + return out } func (t *BaseTraveler) GetRender() interface{} { @@ -149,104 +161,3 @@ func (t *BaseTraveler) GetPath() []DataElementID { func (t BaseTraveler) GetAggregation() *Aggregate { return t.Aggregation } - -func NewElementFromVertex(v *gripql.Vertex) *Vertex { - return &Vertex{ - ID: v.Gid, - Label: v.Label, - Data: v.Data.AsMap(), - Loaded: true, - } -} - -func NewElementFromEdge(e *gripql.Edge) *Edge { - return &Edge{ - ID: e.Gid, - Label: e.Label, - To: e.To, - From: e.From, - Data: e.Data.AsMap(), - Loaded: true, - } -} - -// ToVertex converts data element to vertex -func (elem *DataElement) ToVertex() *gripql.Vertex { - sValue, err := structpb.NewStruct(elem.Data) - if err != nil { - fmt.Printf("Error: %s %#v\n", err, elem.Data) - } - return &gripql.Vertex{ - Gid: elem.ID, - Label: elem.Label, - Data: sValue, - } -} - -// ToEdge converts data element to edge -func (elem *DataElement) ToEdge() *gripql.Edge { - sValue, _ := structpb.NewStruct(elem.Data) - return &gripql.Edge{ - Gid: elem.ID, - From: elem.From, - To: elem.To, - Label: elem.Label, - Data: sValue, - } -} - -// ToDict converts data element to generic map -func (elem *DataElement) ToDict() map[string]interface{} { - out := map[string]interface{}{ - "gid": "", - "label": "", - "to": "", - "from": "", - "data": map[string]interface{}{}, - } - if elem == nil { - return out - } - if elem.ID != "" { - out["gid"] = elem.ID - } - if elem.Label != "" { - out["label"] = elem.Label - } - if elem.To != "" { - out["to"] = elem.To - } - if elem.From != "" { - out["from"] = elem.From - } - out["data"] = elem.Data - return out -} - -// Validate returns an error if the vertex is invalid -func (vertex *Vertex) Validate() error { - if vertex.ID == "" { - return errors.New("'gid' cannot be blank") - } - if vertex.Label == "" { - return errors.New("'label' cannot be blank") - } - for k := range vertex.Data { - err := gripql.ValidateFieldName(k) - if err != nil { - return err - } - } - return nil -} - -func NewGraphElement(g *gripql.GraphElement) *GraphElement { - o := GraphElement{Graph: g.Graph} - if g.Vertex != nil { - o.Vertex = NewElementFromVertex(g.Vertex) - } - if g.Edge != nil { - o.Edge = NewElementFromEdge(g.Edge) - } - return &o -} diff --git a/gdbi/traveler_doc.go b/gdbi/traveler_doc.go new file mode 100644 index 000000000..4aab7c89a --- /dev/null +++ b/gdbi/traveler_doc.go @@ -0,0 +1,305 @@ +package gdbi + +import ( + "strings" + + "github.com/bmeg/grip/gdbi/tpath" + "github.com/bmeg/grip/log" + "github.com/bmeg/jsonpath" +) + +// GetDoc returns the document representing the traveler data +func TravelerGetDoc(traveler Traveler, ns ...string) map[string]any { + if len(ns) == 0 { + out := map[string]any{} + out[tpath.CURRENT] = traveler.GetCurrent().Get().ToDict() + for _, k := range traveler.ListMarks() { + out[k] = traveler.GetMark(k).Get().ToDict() + } + return out + } + out := map[string]any{} + for _, n := range ns { + if n == tpath.CURRENT { + out[n] = traveler.GetCurrent().Get().ToDict() + } else { + m := traveler.GetMark(n) + if m != nil { + out[n] = m.Get().ToDict() + } + } + } + return out +} + +// TravelerGetMarkDoc returns the document representing the traveler data +func TravelerGetMarkDoc(traveler Traveler, ns string) map[string]any { + if ns == tpath.CURRENT { + return traveler.GetCurrent().Get().ToDict() + } + m := traveler.GetMark(ns) + if m != nil { + return m.Get().ToDict() + } + return nil +} + +// TravelerPathLookup gets the value of a field in the given Traveler +// +// Example for a traveler containing: +// +// { +// "_current": {...}, +// "marks": { +// "gene": { +// "_id": 1, +// "_label": "gene", +// "symbol": { +// "ensembl": "ENSG00000012048", +// "hgnc": 1100, +// "entrez": 672 +// } +// } +// } +// } +// } +// +// TravelerPathLookup(travler, "$gene.symbol.ensembl") returns "ENSG00000012048" +func TravelerPathLookup(traveler Traveler, path string) interface{} { + field := tpath.NormalizePath(path) + jpath := tpath.ToLocalPath(field) + namespace := tpath.GetNamespace(field) + var doc map[string]any + if namespace == tpath.CURRENT { + doc = traveler.GetCurrent().Get().ToDict() + } else { + doc = traveler.GetMark(namespace).Get().ToDict() + } + if field == "" { + return doc + } + res, err := jsonpath.JsonPathLookup(doc, jpath) + //log.Debug("field: ", field, " jpath: ", jpath, " namespace: ", namespace, " doc: ", doc, " res: ", res) + + if err != nil { + return nil + } + return res +} + +// TravelerSetValue(travler, "$gene.symbol.ensembl", "hi") inserts the value in the location" +func TravelerSetValue(traveler Traveler, path string, val interface{}) error { + field := tpath.NormalizePath(path) + namespace := tpath.GetNamespace(field) + jpath := tpath.ToLocalPath(field) + if field == "" { + return nil + } + doc := TravelerGetMarkDoc(traveler, namespace) + err := jsonpath.JsonPathSet(doc, jpath, val) + if err != nil { + return err + } + r := DataElement{} + r.FromDict(doc) + traveler.UpdateMark(namespace, &r) + return nil +} + +/* +func TravelerSetMarkDoc(traveler Traveler, ns string, doc map[string]any ) error { + + d = DataElement{} + + + if ns == tpath.CURRENT { + return traveler.GetCurrent().Get().ToDict() + } + m := traveler.GetMark(ns) + if m != nil { + return m.Get().ToDict() + } + return nil +} +*/ + +// TravelerPathExists returns true if the field exists in the given Traveler +func TravelerPathExists(traveler Traveler, path string) bool { + field := tpath.NormalizePath(path) + jpath := tpath.ToLocalPath(field) + namespace := tpath.GetNamespace(field) + if jpath == "" { + return false + } + doc := TravelerGetMarkDoc(traveler, namespace) + _, err := jsonpath.JsonPathLookup(doc, jpath) + return err == nil +} + +// RenderTraveler takes a template and fills in the values using the data structure +func RenderTraveler(traveler Traveler, template interface{}) interface{} { + doc := TravelerGetDoc(traveler) + out, _ := tpath.Render(template, doc) + return out +} + +// SelectTravelerFields returns a new copy of the traveler with only the selected fields +func SelectTravelerFields(t Traveler, keys ...string) Traveler { + includePaths := []string{} + excludePaths := []string{} +KeyLoop: + for _, key := range keys { + exclude := false + if strings.HasPrefix(key, "-") { + exclude = true + key = strings.TrimPrefix(key, "-") + } + namespace := tpath.GetNamespace(key) + switch namespace { + case tpath.CURRENT: + // noop + default: + log.Errorf("SelectTravelerFields: only can select field from current traveler") + continue KeyLoop + } + path := tpath.NormalizePath(key) + jpath := tpath.ToLocalPath(path) + spath := strings.TrimPrefix(jpath, "$.") + if exclude { + excludePaths = append(excludePaths, spath) + } else { + includePaths = append(includePaths, spath) + } + } + + var out Traveler = &BaseTraveler{} + out = out.AddCurrent(&DataElement{ + Data: map[string]interface{}{}, + }) + for _, mark := range t.ListMarks() { + out = out.AddMark(mark, t.GetMark(mark)) + } + + var cde *DataElement + var ode *DataElement + + cde = t.GetCurrent().Get() + ode = out.GetCurrent().Get() + + if len(excludePaths) > 0 { + cde = excludeFields(cde, excludePaths) + for k, v := range cde.Data { + ode.Data[k] = v + } + } + + ode.ID = cde.ID + ode.Label = cde.Label + ode.From = cde.From + ode.To = cde.To + + if len(includePaths) > 0 { + ode = includeFields(ode, cde, includePaths) + } + ode.Loaded = true + return out +} + +func includeFields(new, old *DataElement, paths []string) *DataElement { + newData := make(map[string]interface{}) +Include: + for _, path := range paths { + switch path { + case "_id", "_label", "_from", "_to": + // noop + default: + parts := strings.Split(path, ".") + var data map[string]interface{} + var ok bool + data = old.Data + for i := 0; i < len(parts); i++ { + if parts[i] == "data" { + continue + } + if i == len(parts)-1 { + if val, ok := data[parts[i]]; ok { + newData[parts[i]] = val + } else { + log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) + continue Include + } + } else { + if _, ok := data[parts[i]]; !ok { + log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) + continue Include + } + newData[parts[i]] = map[string]interface{}{} + data, ok = data[parts[i]].(map[string]interface{}) + if !ok { + log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) + continue Include + } + } + } + } + } + new.Data = newData + return new +} + +func excludeFields(elem *DataElement, paths []string) *DataElement { + result := &DataElement{ + ID: elem.ID, + Label: elem.Label, + From: elem.From, + To: elem.To, + Data: map[string]interface{}{}, + } + for k, v := range elem.Data { + result.Data[k] = v + } + data := result.Data +Exclude: + for _, path := range paths { + switch path { + case "_id": + result.ID = "" + case "_label": + result.Label = "" + case "_from": + result.From = "" + case "_to": + result.To = "" + case "data": + result.Data = map[string]interface{}{} + default: + parts := strings.Split(path, ".") + for i := 0; i < len(parts); i++ { + if parts[i] == "data" { + continue + } + if i == len(parts)-1 { + if _, ok := data[parts[i]]; !ok { + log.Errorf("SelectTravelerFields: excludeFields: property does not exist: %s", path) + continue Exclude + } + delete(data, parts[i]) + } else { + var ok bool + var val interface{} + var mapVal map[string]interface{} + if val, ok = elem.Data[parts[i]]; ok { + if mapVal, ok = val.(map[string]interface{}); ok { + data[parts[i]] = mapVal + } + } + if !ok { + log.Errorf("SelectTravelerFields: excludeFields: property does not exist: %s", path) + continue Exclude + } + } + } + } + } + return result +} diff --git a/jsonpath/jsonpath_test.go b/gdbi/traveler_doc_test.go similarity index 57% rename from jsonpath/jsonpath_test.go rename to gdbi/traveler_doc_test.go index 0c85da309..4532c8cb5 100644 --- a/jsonpath/jsonpath_test.go +++ b/gdbi/traveler_doc_test.go @@ -1,19 +1,20 @@ -package jsonpath +package gdbi import ( "os" "testing" - "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gdbi/tpath" + "github.com/stretchr/testify/assert" ) -var traveler gdbi.Traveler +var traveler Traveler func TestMain(m *testing.M) { // test traveler - traveler = &gdbi.BaseTraveler{} - traveler = traveler.AddCurrent(&gdbi.DataElement{ + traveler = &BaseTraveler{} + traveler = traveler.AddCurrent(&DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -28,7 +29,7 @@ func TestMain(m *testing.M) { "f": nil, }, }) - traveler = traveler.AddMark("testMark", &gdbi.DataElement{ + traveler = traveler.AddMark("testMark", &DataElement{ ID: "vertex2", Label: "bar", Data: map[string]interface{}{ @@ -44,112 +45,112 @@ func TestMain(m *testing.M) { func TestGetNamespace(t *testing.T) { expected := "foo" - result := GetNamespace("$foo.bar[1:3].baz") + result := tpath.GetNamespace("$foo.bar[1:3].baz") assert.Equal(t, expected, result) - result = GetNamespace("foo.bar[1:3].baz") + result = tpath.GetNamespace("foo.bar[1:3].baz") assert.NotEqual(t, expected, result) } func TestGetJSONPath(t *testing.T) { - expected := "$.data.a" - result := GetJSONPath("a") + expected := "$_current.a" + result := tpath.NormalizePath("a") assert.Equal(t, expected, result) - expected = "$.data.a" - result = GetJSONPath("_data.a") + expected = "$_current.a" + result = tpath.NormalizePath("$.a") assert.Equal(t, expected, result) - expected = "$.data.e[1].nested" - result = GetJSONPath("e[1].nested") + expected = "$_current.e[1].nested" + result = tpath.NormalizePath("e[1].nested") assert.Equal(t, expected, result) - expected = "$.data.a" - result = GetJSONPath("$testMark.a") + expected = "$testMark.a" + result = tpath.NormalizePath("$testMark.a") assert.Equal(t, expected, result) - expected = "$.data.a" - result = GetJSONPath("testMark.a") - assert.NotEqual(t, expected, result) + expected = "$_current.testMark.a" + result = tpath.NormalizePath("testMark.a") + assert.Equal(t, expected, result) } -func TestGetDoc(t *testing.T) { - expected := traveler.GetMark("testMark").ToDict() - result := GetDoc(traveler, "testMark") +func TestGetMarkDoc(t *testing.T) { + expected := traveler.GetMark("testMark").Get().ToDict() + result := TravelerGetMarkDoc(traveler, "testMark") assert.Equal(t, expected, result) - expected = traveler.GetMark("i-dont-exist").ToDict() - result = GetDoc(traveler, "i-dont-exist") + expected = traveler.GetMark("i-dont-exist").Get().ToDict() + result = TravelerGetMarkDoc(traveler, "i-dont-exist") assert.Equal(t, expected, result) - expected = traveler.GetCurrent().ToDict() - result = GetDoc(traveler, Current) + expected = traveler.GetCurrent().Get().ToDict() + result = TravelerGetMarkDoc(traveler, tpath.CURRENT) assert.Equal(t, expected, result) } func TestTravelerPathExists(t *testing.T) { - assert.True(t, TravelerPathExists(traveler, "_gid")) + assert.True(t, TravelerPathExists(traveler, "_id")) + assert.True(t, TravelerPathExists(traveler, "$_id")) assert.True(t, TravelerPathExists(traveler, "_label")) assert.True(t, TravelerPathExists(traveler, "a")) - assert.True(t, TravelerPathExists(traveler, "_data.a")) + assert.True(t, TravelerPathExists(traveler, "$a")) + assert.True(t, TravelerPathExists(traveler, "$_current.a")) assert.False(t, TravelerPathExists(traveler, "non-existent")) - assert.False(t, TravelerPathExists(traveler, "_data.non-existent")) + assert.False(t, TravelerPathExists(traveler, "$_current.non-existent")) - assert.True(t, TravelerPathExists(traveler, "$testMark._gid")) + assert.True(t, TravelerPathExists(traveler, "$testMark._id")) assert.True(t, TravelerPathExists(traveler, "$testMark._label")) assert.True(t, TravelerPathExists(traveler, "$testMark.a")) - assert.True(t, TravelerPathExists(traveler, "$testMark._data.a")) assert.False(t, TravelerPathExists(traveler, "$testMark.non-existent")) - assert.False(t, TravelerPathExists(traveler, "$testMark._data.non-existent")) } func TestRender(t *testing.T) { - expected := traveler.GetCurrent().Data["a"] - result := RenderTraveler(traveler, "a") + expected := traveler.GetCurrent().Get().Data["a"] + result := RenderTraveler(traveler, "$.a") assert.Equal(t, expected, result) expected = []interface{}{ - traveler.GetCurrent().Data["a"], - traveler.GetCurrent().Data["b"], - traveler.GetCurrent().Data["c"], - traveler.GetCurrent().Data["d"], + traveler.GetCurrent().Get().Data["a"], + traveler.GetCurrent().Get().Data["b"], + traveler.GetCurrent().Get().Data["c"], + traveler.GetCurrent().Get().Data["d"], } result = RenderTraveler(traveler, []interface{}{"a", "b", "c", "d"}) assert.Equal(t, expected, result) expected = map[string]interface{}{ - "current.gid": traveler.GetCurrent().ID, - "current.label": traveler.GetCurrent().Label, - "current.a": traveler.GetCurrent().Data["a"], - "current.b": traveler.GetCurrent().Data["b"], - "current.c": traveler.GetCurrent().Data["c"], - "current.d": traveler.GetCurrent().Data["d"], - "mark.gid": traveler.GetMark("testMark").ID, - "mark.label": traveler.GetMark("testMark").Label, - "mark.a": traveler.GetMark("testMark").Data["a"], - "mark.b": traveler.GetMark("testMark").Data["b"], - "mark.c": traveler.GetMark("testMark").Data["c"], - "mark.d": traveler.GetMark("testMark").Data["d"], + "current.id": traveler.GetCurrent().Get().ID, + "current.label": traveler.GetCurrent().Get().Label, + "current.a": traveler.GetCurrent().Get().Data["a"], + "current.b": traveler.GetCurrent().Get().Data["b"], + "current.c": traveler.GetCurrent().Get().Data["c"], + "current.d": traveler.GetCurrent().Get().Data["d"], + "mark.id": traveler.GetMark("testMark").Get().ID, + "mark.label": traveler.GetMark("testMark").Get().Label, + "mark.a": traveler.GetMark("testMark").Get().Data["a"], + "mark.b": traveler.GetMark("testMark").Get().Data["b"], + "mark.c": traveler.GetMark("testMark").Get().Data["c"], + "mark.d": traveler.GetMark("testMark").Get().Data["d"], "mark.d[0]": 4, "current.e[0].nested": "field1", "current.e.nested": []interface{}{"field1", "field2"}, - "current.f": traveler.GetCurrent().Data["f"], + "current.f": traveler.GetCurrent().Get().Data["f"], } result = RenderTraveler(traveler, map[string]interface{}{ - "current.gid": "_gid", + "current.id": "_id", "current.label": "_label", "current.a": "a", "current.b": "b", "current.c": "c", - "current.d": "_data.d", - "mark.gid": "$testMark._gid", + "current.d": "d", + "mark.id": "$testMark._id", "mark.label": "$testMark._label", "mark.a": "$testMark.a", "mark.b": "$testMark.b", - "mark.c": "$testMark._data.c", + "mark.c": "$testMark.c", "mark.d": "$testMark.d", "mark.d[0]": "$testMark.d[0]", - "current.e[0].nested": "_data.e[0].nested", + "current.e[0].nested": "e[0].nested", "current.e.nested": "e.nested", "current.f": "f", }) @@ -157,7 +158,7 @@ func TestRender(t *testing.T) { } func TestIncludeFields(t *testing.T) { - orig := &gdbi.DataElement{ + orig := &DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -170,13 +171,13 @@ func TestIncludeFields(t *testing.T) { "f": nil, }, } - new := &gdbi.DataElement{ + new := &DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{}, } - expected := &gdbi.DataElement{ + expected := &DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -192,7 +193,7 @@ func TestIncludeFields(t *testing.T) { } func TestExcludeFields(t *testing.T) { - orig := &gdbi.DataElement{ + orig := &DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -205,7 +206,7 @@ func TestExcludeFields(t *testing.T) { "f": nil, }, } - expected := &gdbi.DataElement{ + expected := &DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -222,8 +223,8 @@ func TestExcludeFields(t *testing.T) { } func TestSelectFields(t *testing.T) { - expected := (&gdbi.BaseTraveler{}).AddMark("testMark", traveler.GetMark("testMark")) - expected = expected.AddCurrent(&gdbi.DataElement{ + expected := (&BaseTraveler{}).AddMark("testMark", traveler.GetMark("testMark")) + expected = expected.AddCurrent(&DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -239,7 +240,7 @@ func TestSelectFields(t *testing.T) { result := SelectTravelerFields(traveler, "-a", "-_data.d") assert.Equal(t, expected, result) - expected = expected.AddCurrent(&gdbi.DataElement{ + expected = expected.AddCurrent(&DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{}, @@ -247,7 +248,7 @@ func TestSelectFields(t *testing.T) { result = SelectTravelerFields(traveler) assert.Equal(t, expected, result) - expected = expected.AddCurrent(&gdbi.DataElement{ + expected = expected.AddCurrent(&DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ @@ -258,13 +259,13 @@ func TestSelectFields(t *testing.T) { result = SelectTravelerFields(traveler, "a", "_data.b") assert.Equal(t, expected, result) - result = SelectTravelerFields(traveler, "_gid", "_label", "a", "_data.b") + result = SelectTravelerFields(traveler, "_id", "_label", "a", "_data.b") assert.Equal(t, expected, result) - result = SelectTravelerFields(traveler, "_gid", "_label", "a", "_data.b", "$testMark.b", "$testMark._data.d") + result = SelectTravelerFields(traveler, "_id", "_label", "a", "_data.b", "$testMark.b", "$testMark._data.d") assert.Equal(t, expected, result) - expected = expected.AddCurrent(&gdbi.DataElement{ + expected = expected.AddCurrent(&DataElement{ ID: "vertex1", Label: "foo", Data: map[string]interface{}{ diff --git a/go.mod b/go.mod index 0b5f15565..a2d80fdeb 100644 --- a/go.mod +++ b/go.mod @@ -1,139 +1,149 @@ module github.com/bmeg/grip -go 1.18 +go 1.24 + +toolchain go1.24.2 require ( - github.com/Shopify/sarama v1.22.1 - github.com/Workiva/go-datastructures v1.0.52 - github.com/akrylysov/pogreb v0.8.1 - github.com/akuity/grpc-gateway-client v0.0.0-20230321170839-38ca1b4b439c + github.com/IBM/sarama v1.45.1 + github.com/Shopify/sarama v1.38.1 + github.com/Workiva/go-datastructures v1.1.5 + github.com/akrylysov/pogreb v0.10.2 github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 + github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad + github.com/bmeg/jsonschema/v6 v6.0.4 + github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a github.com/boltdb/bolt v1.3.1 - github.com/casbin/casbin/v2 v2.40.6 - github.com/cockroachdb/pebble v0.0.0-20230701135918-609ae80aea41 + github.com/bytedance/sonic v1.14.0 + github.com/casbin/casbin/v2 v2.97.0 + github.com/cockroachdb/pebble v1.1.2 github.com/davecgh/go-spew v1.1.1 - github.com/dgraph-io/badger/v2 v2.0.1 - github.com/dop251/goja v0.0.0-20190429205339-8d6ee3d16611 - github.com/felixge/httpsnoop v1.0.1 - github.com/go-sql-driver/mysql v1.5.0 - github.com/golang/protobuf v1.5.2 - github.com/graphql-go/graphql v0.8.0 - github.com/graphql-go/handler v0.2.3 - github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 - github.com/hashicorp/go-multierror v1.0.0 - github.com/hashicorp/go-plugin v1.4.2 - github.com/imdario/mergo v0.3.7 + github.com/dgraph-io/badger/v2 v2.2007.4 + github.com/dop251/goja v0.0.0-20240707163329-b1681fb2a2f5 + github.com/felixge/httpsnoop v1.0.4 + github.com/go-sql-driver/mysql v1.8.1 + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 + github.com/hashicorp/go-multierror v1.1.1 + github.com/hashicorp/go-plugin v1.6.1 + github.com/imdario/mergo v0.3.16 github.com/influxdata/tdigest v0.0.1 - github.com/jmoiron/sqlx v1.2.0 + github.com/jmoiron/sqlx v1.4.0 github.com/kennygrant/sanitize v1.2.4 github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042 - github.com/kr/pretty v0.2.1 - github.com/lib/pq v1.2.0 - github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946 - github.com/machinebox/graphql v0.2.2 - github.com/minio/minio-go/v7 v7.0.50 - github.com/mitchellh/hashstructure/v2 v2.0.1 - github.com/mongodb/mongo-tools v0.0.0-20210401103731-387f92fbcf79 + github.com/kr/pretty v0.3.1 + github.com/lib/pq v1.10.9 + github.com/logrusorgru/aurora v2.0.3+incompatible + github.com/mattn/go-sqlite3 v1.14.23 + github.com/minio/minio-go/v7 v7.0.73 + github.com/mitchellh/hashstructure/v2 v2.0.2 + github.com/mongodb/mongo-tools v0.0.0-20250131183507-b8a566a7f38f github.com/paulbellamy/ratecounter v0.2.0 - github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d - github.com/segmentio/ksuid v1.0.2 - github.com/sirupsen/logrus v1.9.0 - github.com/spf13/cast v1.3.0 - github.com/spf13/cobra v1.0.1-0.20201006035406-b97b5ead31f7 - github.com/stretchr/testify v1.8.2 + github.com/robertkrimen/otto v0.4.0 + github.com/segmentio/ksuid v1.0.4 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cast v1.9.2 + github.com/spf13/cobra v1.8.1 + github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.0 - go.mongodb.org/mongo-driver v1.12.0 - golang.org/x/crypto v0.6.0 - golang.org/x/net v0.7.0 - golang.org/x/sync v0.1.0 - google.golang.org/api v0.110.0 - google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 - google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 - gopkg.in/olivere/elastic.v5 v5.0.80 - sigs.k8s.io/yaml v1.3.0 + go.mongodb.org/mongo-driver v1.17.0 + golang.org/x/net v0.37.0 + golang.org/x/sync v0.12.0 + golang.org/x/term v0.30.0 + google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a + google.golang.org/grpc v1.71.0 + google.golang.org/protobuf v1.36.7 + sigs.k8s.io/yaml v1.4.0 ) require ( - cloud.google.com/go/compute v1.18.0 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/DataDog/zstd v1.4.5 // indirect - github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect - github.com/alevinval/sse v1.0.1 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect + github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bytedance/sonic/loader v0.3.0 // indirect + github.com/casbin/govaluate v1.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cockroachdb/errors v1.8.1 // indirect - github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect - github.com/cockroachdb/redact v1.0.8 // indirect - github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 // indirect - github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e // indirect - github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect - github.com/dlclark/regexp2 v1.1.6 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cloudwego/base64x v0.1.5 // indirect + github.com/cockroachdb/errors v1.11.3 // indirect + github.com/cockroachdb/fifo v0.0.0-20240616162244-4768e80dfb9a // indirect + github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/redact v1.1.5 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/dgraph-io/ristretto v0.2.0 // indirect + github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect + github.com/dlclark/regexp2 v1.11.2 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/eapache/go-resiliency v1.1.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect + github.com/eapache/go-resiliency v1.7.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect - github.com/fatih/color v1.7.0 // indirect - github.com/go-resty/resty/v2 v2.7.0 // indirect - github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect + github.com/edsrzf/mmap-go v1.2.0 // indirect + github.com/fatih/color v1.17.0 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect + github.com/getsentry/sentry-go v0.28.1 // indirect + github.com/go-ini/ini v1.67.0 // indirect + github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect - github.com/hashicorp/go-hclog v0.14.1 // indirect - github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jessevdk/go-flags v1.4.0 // indirect - github.com/jhump/protoreflect v1.8.1 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.0 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect + github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect + github.com/hashicorp/yamux v0.1.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect + github.com/jessevdk/go-flags v1.6.1 // indirect + github.com/klauspost/compress v1.17.11 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/kr/text v0.2.0 // indirect - github.com/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5 // indirect - github.com/matryer/is v1.4.0 // indirect - github.com/mattn/go-colorable v0.1.7 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/maypok86/otter/v2 v2.1.0 // indirect github.com/minio/md5-simd v1.1.2 // indirect - github.com/minio/sha256-simd v1.0.0 // indirect - github.com/mitchellh/go-testing-interface v1.0.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect - github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect - github.com/oklog/run v1.0.0 // indirect - github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/montanaflynn/stats v0.7.1 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/onsi/ginkgo v1.13.0 // indirect + github.com/onsi/gomega v1.33.1 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.12.0 // indirect - github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect - github.com/rs/xid v1.4.0 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + github.com/rs/xid v1.5.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - go.opencensus.io v0.24.0 // indirect - golang.org/x/exp v0.0.0-20200513190911-00229845015e // indirect - golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect + github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect + golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect + golang.org/x/crypto v0.36.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.23.0 // indirect gonum.org/v1/gonum v0.8.2 // indirect - google.golang.org/appengine v1.6.7 // indirect - gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect - gopkg.in/ini.v1 v1.67.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a // indirect gopkg.in/sourcemap.v1 v1.0.5 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ace137e9b..6c09f3d77 100644 --- a/go.sum +++ b/go.sum @@ -1,529 +1,311 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/3rf/mongo-lint v0.0.0-20140604191638-3550fdcf1f43/go.mod h1:ggh9ZlgUveoGPv/xlt2+6f/bGVEl/h+WlV4LX/dyxEI= -github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g= +github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0 h1:+m0M/LFxN43KvULkDNfdXOgrjtg6UYJPFBJyuEcRCAw= +github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.0/go.mod h1:PwOyop78lveYMRs6oCxjiVyBdyCgIYH6XHIVZO9/SFQ= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM= +github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= +github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ= +github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= -github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e h1:ZIWapoIRN1VqT8GR8jAwb1Ie9GyehWjVcGh32Y2MznE= +github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/IBM/sarama v1.45.1 h1:nY30XqYpqyXOXSNoe2XCgjj9jklGM1Ye94ierUb1jQ0= +github.com/IBM/sarama v1.45.1/go.mod h1:qifDhA3VWSrQ1TjSMyxDl3nYL3oX2C83u+G6L79sq4w= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= 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/Shopify/sarama v1.22.1 h1:exyEsKLGyCsDiqpV5Lr4slFi8ev2KiM3cP1KZ6vnCQ0= -github.com/Shopify/sarama v1.22.1/go.mod h1:FRzlvRpMFO/639zY1SDxUxkqH97Y0ndM5CbGj6oG3As= -github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= -github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A= +github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= +github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0= +github.com/Workiva/go-datastructures v1.1.5 h1:5YfhQ4ry7bZc2Mc7R0YZyYwpf5c6t1cEFvdAhd6Mkf4= +github.com/Workiva/go-datastructures v1.1.5/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/akrylysov/pogreb v0.8.1 h1:PvNdy6Xnw6WQYDo//ruRNN6uZIxLnSI2tpm0/xr7HFE= -github.com/akrylysov/pogreb v0.8.1/go.mod h1:pNs6QmpQ1UlTJKDezuRWmaqkgUE2TuU0YTWyqJZ7+lI= -github.com/akuity/grpc-gateway-client v0.0.0-20230321170839-38ca1b4b439c h1:+TGlC7RoqCnRm7F6jvyxsnIaMM8VfsbDsDWVVifgxS4= -github.com/akuity/grpc-gateway-client v0.0.0-20230321170839-38ca1b4b439c/go.mod h1:2LXcIC4bAFvsZitqz5qtaTfYS5vCbz4BTA/BgkJLM0g= -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= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alevinval/sse v1.0.1 h1:cFubh2lMNdHT6niFLCsyTuhAgljaAWbdmceAe6qPIfo= -github.com/alevinval/sse v1.0.1/go.mod h1:Bvl1EawUlmW1y1vSU5uDl03+1Zsqqz/+6D2PAUvftcw= +github.com/akrylysov/pogreb v0.10.2 h1:e6PxmeyEhWyi2AKOBIJzAEi4HkiC+lKyCocRGlnDi78= +github.com/akrylysov/pogreb v0.10.2/go.mod h1:pNs6QmpQ1UlTJKDezuRWmaqkgUE2TuU0YTWyqJZ7+lI= github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= -github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9 h1:sIgPwNZKv3pSuIm/hngszbBrg3pKlZcyJ+HTzeFyjNA= +github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9/go.mod h1:Jy39KqCHrPeU9J3SEAdVnZ5dxE6VZm8tX899z5n6ud8= github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad h1:ICgBexeLB7iv/IQz4rsP+MimOXFZUwWSPojEypuOaQ8= github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad/go.mod h1:ft96Irkp72C7ZrUWRenG7LrF0NKMxXdRvsypo5Njhm4= +github.com/bmeg/jsonschema/v6 v6.0.4 h1:AXFAz7G05VZkKretSSU+uacMKF8+C16ONG6pzFzzA7E= +github.com/bmeg/jsonschema/v6 v6.0.4/go.mod h1:gTh32doM+BEZyi/TDPJEp8k3qXTckXY4ohptV2xExQY= +github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a h1:O0JcMLcazrwVzf8iC/RogUen4CG5UVErrBU76UkxhYQ= +github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a/go.mod h1:rlek2WcKAhnynqE7NJi8U+RDbUkRFr8Kqpb2SDmcW94= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/casbin/casbin/v2 v2.40.6 h1:Fy8UmYaLst1zjyQ7Uw/Kq9Vxgyk91EtZO/cUUSm3kpQ= -github.com/casbin/casbin/v2 v2.40.6/go.mod h1:sEL80qBYTbd+BPeL4iyvwYzFT3qwLaESq5aFKVLbLfA= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= +github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= +github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= +github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/casbin/casbin/v2 v2.97.0 h1:FFHIzY+6fLIcoAB/DKcG5xvscUo9XqRpBniRYhlPWkg= +github.com/casbin/casbin/v2 v2.97.0/go.mod h1:jX8uoN4veP85O/n2674r2qtfSXI6myvxW85f6TH50fw= +github.com/casbin/govaluate v1.1.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A= +github.com/casbin/govaluate v1.2.0 h1:wXCXFmqyY+1RwiKfYo3jMKyrtZmOL3kHwaqDyCPOYak= +github.com/casbin/govaluate v1.2.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= +github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= -github.com/cockroachdb/pebble v0.0.0-20230701135918-609ae80aea41 h1:lYBVTS2P5fx79WWjoR/Gf4Fx5sZiIVCFWpuxntyiskY= -github.com/cockroachdb/pebble v0.0.0-20230701135918-609ae80aea41/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks= -github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= -github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 h1:DJK8W/iB+s/qkTtmXSrHA49lp5O3OsR7E6z4byOLy34= -github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= -github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= +github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= +github.com/cockroachdb/fifo v0.0.0-20240616162244-4768e80dfb9a h1:f52TdbU4D5nozMAhO9TvTJ2ZMCXtN4VIAmfrrZ0JXQ4= +github.com/cockroachdb/fifo v0.0.0-20240616162244-4768e80dfb9a/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/craiggwilson/goke v0.0.0-20200309222237-69a77cdfe646/go.mod h1:IX+FckvUr3c6SNWSzspUD94HqCMFCW+sIK0lJGSkWkg= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= -github.com/dgraph-io/badger/v2 v2.0.1 h1:+D6dhIqC6jIeCclnxMHqk4HPuXgrRN5UfBsLR4dNQ3A= -github.com/dgraph-io/badger/v2 v2.0.1/go.mod h1:YoRSIp1LmAJ7zH7tZwRvjNMUYLxB4wl3ebYkaIruZ04= -github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e h1:aeUNgwup7PnDOBAD1BOKAqzb/W/NksOj6r3dwKKuqfg= -github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e/go.mod h1:edzKIzGvqUCMzhTVWbiTSe75zD9Xxq0GtSBtFmaUTZs= -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 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= +github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= +github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= +github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= +github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE= +github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU= 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/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg= -github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dop251/goja v0.0.0-20190429205339-8d6ee3d16611 h1:1MBTvhEvrqHgSDeoxWrBgDt+ndbmURmCgFZL7f6OXk4= -github.com/dop251/goja v0.0.0-20190429205339-8d6ee3d16611/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/dlclark/regexp2 v1.11.2 h1:/u628IuisSTwri5/UKloiIsH8+qF2Pu7xEQX+yIKg68= +github.com/dlclark/regexp2 v1.11.2/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dop251/goja v0.0.0-20240707163329-b1681fb2a2f5 h1:ZRqTaoW9WZ2DqeOQGhK9q73eCb47SEs30GV2IRHT9bo= +github.com/dop251/goja v0.0.0-20240707163329-b1681fb2a2f5/go.mod h1:o31y53rb/qiIAONF7w3FHJZRqqP3fzHUr1HqanthByw= 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= -github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA= +github.com/eapache/go-resiliency v1.7.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84= +github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= -github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/fortytw2/leaktest v1.2.0 h1:cj6GCiwJDH7l3tMHLjZDo0QqPtrXJiWSI9JgpeQKw+Q= -github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= -github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= -github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/getsentry/sentry-go v0.28.1 h1:zzaSm/vHmGllRM6Tpx1492r0YDzauArdBfkJRtY6P5k= +github.com/getsentry/sentry-go v0.28.1/go.mod h1:1fQZ+7l7eeJ3wYi82q5Hg8GqAPgefRq+FP/QhafYVgg= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= -github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= -github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible h1:0b/xya7BKGhXuqFESKM4oIiRo9WOt2ebz7KxfreD6ug= -github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +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-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q= +github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -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= -github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +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.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -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= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= -github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4= -github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/graphql-go/graphql v0.8.0 h1:JHRQMeQjofwqVvGwYnr8JnPTY0AxgVy1HpHSGPLdH0I= -github.com/graphql-go/graphql v0.8.0/go.mod h1:nKiHzRM0qopJEwCITUuIsxk9PlVlwIiiI8pnJEhordQ= -github.com/graphql-go/handler v0.2.3 h1:CANh8WPnl5M9uA25c2GBhPqJhE53Fg0Iue/fRNla71E= -github.com/graphql-go/handler v0.2.3/go.mod h1:leLF6RpV5uZMN1CdImAxuiayrYYhOk33bZciaUGaXeU= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 h1:gDLXvp5S9izjldquuoAhDzccbskOL6tDC5jMSyx3zxE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da h1:xRmpO92tb8y+Z85iUOMOicpCfaYcv7o3Cg3wKrIpg8g= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= +github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v1.4.2 h1:yFvG3ufXXpqiMiZx9HLcaK3XbIqQ1WJFR/F1a2CuVw0= -github.com/hashicorp/go-plugin v1.4.2/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-plugin v1.6.1 h1:P7MR2UP6gNKGPp+y7EZw2kOiq4IR9WiqLvp0XOsVdwI= +github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -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/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/tdigest v0.0.1 h1:XpFptwYmnEKUqmkcDjrzffswZ3nvNeevbUSLPP/ZzIY= github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= -github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= -github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= -github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= -github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= -github.com/jhump/protoreflect v1.8.1 h1:z7Ciiz3Bz37zSd485fbiTW8ABafIasyOWZI0N9EUUdo= -github.com/jhump/protoreflect v1.8.1/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bBK4= +github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= +github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= +github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o= +github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o= github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs= +github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.10.1/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042 h1:Vzdm5hdlLdpJOKK+hKtkV5u7xGZmNW6aUBjGcTfwx84= github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042/go.mod h1:fYE0718xXI13XMYLc6iHtvXudfyCGMsZ9hxSM1Ommpg= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= 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.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946 h1:z+WaKrgu3kCpcdnbK9YG+JThpOCd1nU5jO5ToVmSlR4= -github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/machinebox/graphql v0.2.2 h1:dWKpJligYKhYKO5A2gvNhkJdQMNZeChZYyBbrZkBZfo= -github.com/machinebox/graphql v0.2.2/go.mod h1:F+kbVMHuwrQ5tYgU9JXlnskM8nOaFxCAEolaQybkjWA= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= +github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= 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/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5 h1:0x4qcEHDpruK6ML/m/YSlFUUu0UpRD3I2PHsNCuGnyA= -github.com/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= -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.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -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/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0= +github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/maypok86/otter/v2 v2.1.0 h1:H+FO9NtLuSWYUlIUQ/kT6VNEpWSIF4w4GZJRDhxYb7k= +github.com/maypok86/otter/v2 v2.1.0/go.mod h1:jX2xEKz9PrNVbDqnk8JUuOt5kURK8h7jd1kDYI5QsZk= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.50 h1:4IL4V8m/kI90ZL6GupCARZVrBv8/XrcKcJhaJ3iz68k= -github.com/minio/minio-go/v7 v7.0.50/go.mod h1:IbbodHyjUAguneyucUaahv+VMNs/EOTV9du7A7/Z3HU= -github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= -github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/minio/minio-go/v7 v7.0.73 h1:qr2vi96Qm7kZ4v7LLebjte+MQh621fFWnv93p12htEo= +github.com/minio/minio-go/v7 v7.0.73/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/hashstructure/v2 v2.0.1 h1:L60q1+q7cXE4JeEJJKMnh2brFIe3rZxCihYAB61ypAY= -github.com/mitchellh/hashstructure/v2 v2.0.1/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= +github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mongodb/mongo-tools v0.0.0-20210401103731-387f92fbcf79 h1:CZL8qkA44Gzu/kgryouBYguyU/+OjakvJZY9L4rjpmM= -github.com/mongodb/mongo-tools v0.0.0-20210401103731-387f92fbcf79/go.mod h1:AzIs4b2QF3RLAt42whkBASG0zdRG0gNdmtNjgaG+v1E= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= -github.com/nsf/termbox-go v0.0.0-20160718140619-0723e7c3d0a3/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/mongodb/mongo-tools v0.0.0-20250131183507-b8a566a7f38f h1:Xbo8OTSAov884rc8pIY/M00S4T4MYi5Dq2JRTeCUIFY= +github.com/mongodb/mongo-tools v0.0.0-20250131183507-b8a566a7f38f/go.mod h1:YU7ppONj7YpoxHeYwrwH1JlVMsXdRlCNXCXP3W9hqYw= +github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= +github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= +github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= +github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= @@ -531,102 +313,73 @@ github.com/onsi/ginkgo v1.13.0 h1:M76yO2HkZASFjXL0HSoZJ1AYEmQxNJmY41Jx1zNUq1Y= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/paulbellamy/ratecounter v0.2.0 h1:2L/RhJq+HA8gBQImDXtLPrDXK5qAj6ozWVK/zFXVJGs= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41 h1:GeinFsrjWz97fAxVUEd748aV0cYL+I6k44gFJTCVvpU= -github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= +github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= 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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= -github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d h1:1VUlQbCfkoSGv7qP7Y+ro3ap1P1pPZxgdGVqiTVy5C4= -github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY= -github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= +github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= +github.com/robertkrimen/otto v0.4.0 h1:/c0GRrK1XDPcgIasAsnlpBT5DelIeB9U/Z/JCQsgr7E= +github.com/robertkrimen/otto v0.4.0/go.mod h1:uW9yN1CYflmUQYvAMS0m+ZiNo3dMzRUDQJX0jWbzgxw= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/segmentio/ksuid v1.0.2 h1:9yBfKyw4ECGTdALaF09Snw3sLJmYIX6AbPJrAy6MrDc= -github.com/segmentio/ksuid v1.0.2/go.mod h1:BXuJDr2byAiHuQaQtSKoXh1J0YmUDurywOXgB2w+OSU= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -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.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c= +github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE= 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.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -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= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY= +github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec= +github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY= +github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE= +github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.1-0.20201006035406-b97b5ead31f7 h1:O63eWlXlvyw4YdsuatjRIU6emvJ2fqz+PTdMEoxIT2s= -github.com/spf13/cobra v1.0.1-0.20201006035406-b97b5ead31f7/go.mod h1:yk5b0mALVusDL5fMM6Rd1wgnoO5jUPhwsQ6LQAJTidQ= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -634,329 +387,162 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= 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.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= +github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xdg/stringprep v1.0.1-0.20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= -github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM= +github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.mongodb.org/mongo-driver v1.4.2/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.12.0 h1:aPx33jmn/rQuJXPQLZQ8NtfPQG8CaqgLThFtqRb0PiE= -go.mongodb.org/mongo-driver v1.12.0/go.mod h1:AZkxhPnFJUoH7kZlFkVKucV20K387miPfm7oimrSmK0= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.mongodb.org/mongo-driver v1.17.0 h1:Hp4q2MCjvY19ViwimTs00wHi7G4yzxh4/2+nTx8r40k= +go.mongodb.org/mongo-driver v1.17.0/go.mod h1:wwWm/+BuOddhcq3n68LKRmgk2wXzmF6s0SFOa0GINL4= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= +go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -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-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc= -golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -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= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= @@ -964,141 +550,54 @@ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 h1:QQF+HdiI4iocoxUjjpLgvTYDHKm99C/VtTBFnfiCJos= -google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a h1:DMCgtIAIQGZqJXMVzJF4MV8BlWoJh2ZuFiRdAleyr58= +google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a h1:tPE/Kp+x9dMSwUm/uM0JKK0IfdiJkwAbSMSeZBXXJXc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250811230008-5f3141c8851a/go.mod h1:gw1tLEfykwDz2ET4a12jcXt4couGAm7IwsVaTy0Sflo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg= +google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 h1:yqElulDvOF26oZ2O+2/aoX7mQ8DY/6+p39neytrycd8= -google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= +google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= -gopkg.in/olivere/elastic.v5 v5.0.80 h1:AKjfcq3ZIAAqO4m8h/vJ3GP6nY8n9ft5mgf54fEqC60= -gopkg.in/olivere/elastic.v5 v5.0.80/go.mod h1:uhHoB4o3bvX5sorxBU29rPcmBQdV2Qfg0FBrx5D6pV0= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI= gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/tomb.v2 v2.0.0-20140626144623-14b3d72120e8/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/googleapis b/googleapis index 360a0e177..b0c32da88 160000 --- a/googleapis +++ b/googleapis @@ -1 +1 @@ -Subproject commit 360a0e177316b7e9811f2ccbbef11e5f83377f3f +Subproject commit b0c32da88f7502f4562e7d3d10c7ded09d9842ab diff --git a/grids/benchmark/edge_test.go b/grids/benchmark/edge_test.go index ec071149d..8eedb4518 100644 --- a/grids/benchmark/edge_test.go +++ b/grids/benchmark/edge_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/bmeg/grip/kvi" - "github.com/bmeg/grip/kvi/badgerdb" + "github.com/bmeg/grip/kvi/pebbledb" "github.com/bmeg/grip/log" "github.com/bmeg/grip/util" ) func BenchmarkEdgeStringScan(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return @@ -57,7 +57,7 @@ func BenchmarkEdgeStringScan(b *testing.B) { } func BenchmarkEdgeIntScan(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return diff --git a/grids/benchmark/insert_test.go b/grids/benchmark/insert_test.go index c4adb749e..a383691a4 100644 --- a/grids/benchmark/insert_test.go +++ b/grids/benchmark/insert_test.go @@ -9,7 +9,7 @@ import ( "github.com/akrylysov/pogreb" "github.com/bmeg/grip/kvi" - "github.com/bmeg/grip/kvi/badgerdb" + "github.com/bmeg/grip/kvi/pebbledb" "github.com/bmeg/grip/log" ) @@ -26,7 +26,7 @@ func RandStringRunes(n int) string { } func BenchmarkStringInsert(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return @@ -50,7 +50,7 @@ func BenchmarkStringInsert(b *testing.B) { } func BenchmarkIntInsert(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return @@ -110,7 +110,7 @@ func BenchmarkMixedInsert(b *testing.B) { log.Errorf("issue: %s", err) return } - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return @@ -143,7 +143,7 @@ func BenchmarkMixedInsert(b *testing.B) { } func BenchmarkStringScan(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return @@ -181,7 +181,7 @@ func BenchmarkStringScan(b *testing.B) { } func BenchmarkIntScan(b *testing.B) { - db, err := badgerdb.NewKVInterface("test.db", kvi.Options{}) + db, err := pebbledb.NewKVInterface("test.db", kvi.Options{}) if err != nil { log.Errorf("issue: %s", err) return diff --git a/grids/compiler.go b/grids/compiler.go deleted file mode 100644 index b19e98f18..000000000 --- a/grids/compiler.go +++ /dev/null @@ -1,115 +0,0 @@ -package grids - -import ( - "fmt" - - "github.com/bmeg/grip/engine/core" - "github.com/bmeg/grip/engine/pipeline" - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/util/protoutil" -) - -// Compiler gets a compiler that will use the graph the execute the compiled query -func (ggraph *Graph) Compiler() gdbi.Compiler { - return NewCompiler(ggraph) -} - -type Compiler struct { - graph *Graph -} - -func SelectPath(stmts []*gripql.GraphStatement, path []int) []*gripql.GraphStatement { - out := []*gripql.GraphStatement{} - for _, p := range path { - out = append(out, stmts[p]) - } - return out -} - -func NewCompiler(ggraph *Graph) gdbi.Compiler { - return core.NewCompiler(ggraph, core.IndexStartOptimize) - //return Compiler{graph: ggraph} -} - -func (comp Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.CompileOptions) (gdbi.Pipeline, error) { - fmt.Printf("Doing compile\n") - if len(stmts) == 0 { - return &core.DefaultPipeline{}, nil - } - - if err := core.Validate(stmts, opts); err != nil { - fmt.Printf("Failing validation\n") - return &core.DefaultPipeline{}, fmt.Errorf("invalid statments: %s", err) - } - - stmts = core.IndexStartOptimize(stmts) - - ps := pipeline.NewPipelineState(stmts) - if opts != nil { - ps.LastType = opts.PipelineExtension - ps.MarkTypes = opts.ExtensionMarkTypes - } - fmt.Printf("GRIDS compile: %#v %#v\n", *ps, opts) - - procs := make([]gdbi.Processor, 0, len(stmts)) - - optimizeOn := false - - fmt.Printf("Starting Grids Compiler: %s\n", stmts) - for i := 0; i < len(stmts); i++ { - gs := stmts[i] - ps.SetCurStatment(i) - if p, err := GetRawProcessor(comp.graph, ps, gs); err == nil && optimizeOn { - procs = append(procs, p) - } else { - p, err := core.StatementProcessor(gs, comp.graph, ps) - if err != nil { - fmt.Printf("Error %s at %d %#v", err, i, gs) - return &core.DefaultPipeline{}, err - } - procs = append(procs, p) - } - } - fmt.Printf("GRIDS: Pipeline: %#v\n", procs) - return core.NewPipeline(comp.graph, procs, ps), nil -} - -func GetRawProcessor(db *Graph, ps gdbi.PipelineState, stmt *gripql.GraphStatement) (gdbi.Processor, error) { - switch stmt := stmt.GetStatement().(type) { - case *gripql.GraphStatement_V: - ids := protoutil.AsStringList(stmt.V) - ps.SetLastType(gdbi.VertexData) - return &PathVProc{db: db, ids: ids}, nil - case *gripql.GraphStatement_In: - if ps.GetLastType() == gdbi.VertexData { - labels := protoutil.AsStringList(stmt.In) - ps.SetLastType(gdbi.VertexData) - return &PathInProc{db: db, labels: labels}, nil - } else if ps.GetLastType() == gdbi.EdgeData { - ps.SetLastType(gdbi.VertexData) - return &PathInEdgeAdjProc{db: db}, nil - } - case *gripql.GraphStatement_Out: - if ps.GetLastType() == gdbi.VertexData { - labels := protoutil.AsStringList(stmt.Out) - ps.SetLastType(gdbi.VertexData) - return &PathOutProc{db: db, labels: labels}, nil - } else if ps.GetLastType() == gdbi.EdgeData { - ps.SetLastType(gdbi.VertexData) - return &PathOutEdgeAdjProc{db: db}, nil - } - case *gripql.GraphStatement_InE: - labels := protoutil.AsStringList(stmt.InE) - ps.SetLastType(gdbi.EdgeData) - return &PathInEProc{db: db, labels: labels}, nil - case *gripql.GraphStatement_OutE: - labels := protoutil.AsStringList(stmt.OutE) - ps.SetLastType(gdbi.EdgeData) - return &PathOutEProc{db: db, labels: labels}, nil - case *gripql.GraphStatement_HasLabel: - labels := protoutil.AsStringList(stmt.HasLabel) - return &PathLabelProc{db: db, labels: labels}, nil - } - return nil, fmt.Errorf("unknown command: %T", stmt) -} diff --git a/grids/filters.go b/grids/filters.go new file mode 100644 index 000000000..b0e620adf --- /dev/null +++ b/grids/filters.go @@ -0,0 +1,140 @@ +package grids + +import ( + bFilters "github.com/bmeg/benchtop/filters" + "github.com/bmeg/benchtop/jsontable" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bytedance/sonic" + "github.com/bytedance/sonic/ast" +) + +type GripQLFilter struct { + Expression *gripql.HasExpression +} + +func (f *GripQLFilter) GetFilter() any { + return f.Expression +} +func (f *GripQLFilter) IsNoOp() bool { + // A GripQLFilter is a no-op if its Expression is nil + return f.Expression == nil +} + +func (f *GripQLFilter) Matches(row any) bool { + return MatchesHasExpression(row, f.Expression) +} + +func (f *GripQLFilter) RequiredFields() []string { + return extractKeys(f.Expression) +} + +func extractKeys(expr *gripql.HasExpression) []string { + keys := map[string]struct{}{} + + var recurse func(*gripql.HasExpression) + recurse = func(e *gripql.HasExpression) { + if e == nil { + return + } + switch st := e.Expression.(type) { + case *gripql.HasExpression_Condition: + keys[st.Condition.GetKey()] = struct{}{} + case *gripql.HasExpression_And: + for _, subExpr := range st.And.GetExpressions() { + recurse(subExpr) + } + case *gripql.HasExpression_Or: + for _, subExpr := range st.Or.GetExpressions() { + recurse(subExpr) + } + case *gripql.HasExpression_Not: + recurse(st.Not.GetNot()) + } + } + + recurse(expr) + + out := make([]string, 0, len(keys)) + for k := range keys { + out = append(out, k) + } + return out +} +func MatchesHasExpression(val any, stmt *gripql.HasExpression) bool { + switch stmt.Expression.(type) { + case *gripql.HasExpression_Condition: + cond := stmt.GetCondition() + var lookupVal any + + // Handle lookup based on input type + switch v := val.(type) { + case map[string]any: + lookupVal = jsontable.PathLookup(v, cond.Key) + case []byte: + pathArr, err := jsontable.ConvertJSONPathToArray(cond.Key) + if err != nil { + log.Errorf("Error converting JSON path: %v", err) + return false + } + node, err := sonic.Get(v, pathArr...) + if err != nil { + if err != ast.ErrNotExist { + log.Errorf("Sonic Fetch err for path: %s on doc %#v: %v", pathArr, string(v), err) + } + return false + } + lookupVal, err = node.Interface() + if err != nil { + log.Errorf("Error unmarshaling node: %v", err) + return false + } + default: + log.Errorf("Unsupported input type: %T", val) + return false + } + + return bFilters.ApplyFilterCondition( + lookupVal, + &bFilters.FieldFilter{ + Operator: cond.Condition, + Field: cond.Key, + Value: cond.Value.AsInterface(), + }, + ) + + case *gripql.HasExpression_And: + and := stmt.GetAnd() + andRes := []bool{} + for _, e := range and.Expressions { + andRes = append(andRes, MatchesHasExpression(val, e)) + } + for _, r := range andRes { + if !r { + return false + } + } + return true + + case *gripql.HasExpression_Or: + or := stmt.GetOr() + orRes := []bool{} + for _, e := range or.Expressions { + orRes = append(orRes, MatchesHasExpression(val, e)) + } + for _, r := range orRes { + if r { + return true + } + } + return false + + case *gripql.HasExpression_Not: + e := stmt.GetNot() + return !MatchesHasExpression(val, e) + + default: + log.Errorf("unknown where expression type: %T", stmt.Expression) + return false + } +} diff --git a/grids/graph.go b/grids/graph.go index 940956925..f8dd2dec5 100644 --- a/grids/graph.go +++ b/grids/graph.go @@ -4,112 +4,198 @@ import ( "bytes" "context" "fmt" + "runtime" + "slices" + "sort" "sync" + "sync/atomic" + "github.com/bmeg/benchtop" + "github.com/bmeg/benchtop/jsontable" + "github.com/bmeg/benchtop/pebblebulk" + "github.com/bmeg/grip/engine/core" "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/kvi" - "github.com/bmeg/grip/kvindex" "github.com/bmeg/grip/log" - "github.com/bmeg/grip/util/protoutil" "github.com/bmeg/grip/util/setcmp" + "github.com/bytedance/sonic" + "github.com/cockroachdb/pebble" multierror "github.com/hashicorp/go-multierror" ) +const ( + VTABLE_PREFIX = "v_" + ETABLE_PREFIX = "e_" +) + // GetTimestamp returns the update timestamp func (ggraph *Graph) GetTimestamp() string { - //return ggraph.kdb.ts.Get(ggraph.graphID) - return "" //FIXME -} - -type kvAddData struct { - key []byte - value []byte - vertex *gripql.Vertex - doc map[string]interface{} + return ggraph.ts.Get(ggraph.graphID) } -func insertVertex(tx kvi.KVBulkWrite, keyMap *KeyMap, vertex *gdbi.Vertex) error { +func insertVertex(tx *pebblebulk.PebbleBulk, vertex *gdbi.Vertex) error { if vertex.ID == "" { - return fmt.Errorf("Inserting null key vertex") - } - vertexKey, _ := keyMap.GetsertVertexKey(vertex.ID, vertex.Label) - key := VertexKey(vertexKey) - if vertex.Data == nil { - vertex.Data = map[string]interface{}{} - } - value, err := protoutil.StructMarshal(vertex.Data) - if err != nil { - return err + return fmt.Errorf("inserting null key vertex") } - if err := tx.Set(key, value); err != nil { + if err := tx.Set(VertexKey(vertex.ID), []byte(vertex.Label), nil); err != nil { return fmt.Errorf("AddVertex Error %s", err) } return nil } -func indexVertex(tx kvi.KVBulkWrite, idx *kvindex.KVIndex, vertex *gdbi.Vertex) error { - doc := vertexIdxStruct(vertex) - if err := idx.AddDocTx(tx, vertex.ID, doc); err != nil { - return fmt.Errorf("AddVertex Error %s", err) +func (ggraph *Graph) indexVertex(vertex *gdbi.Vertex, tx *pebblebulk.PebbleBulk) error { + vertexLabel := VTABLE_PREFIX + vertex.Label + ggraph.jsonkv.Lock.Lock() + table, ok := ggraph.jsonkv.Tables[vertexLabel] + ggraph.jsonkv.Lock.Unlock() + if !ok { + log.Debugf("Creating new table %s for label %s on graph %s", vertexLabel, vertex.Label, ggraph.graphID) + newTable, err := ggraph.jsonkv.New(vertexLabel, nil) + if err != nil { + return fmt.Errorf("indexVertex: %s", err) + } + ggraph.jsonkv.Lock.Lock() + table = newTable.(*jsontable.JSONTable) + ggraph.jsonkv.Tables[vertexLabel] = table + ggraph.jsonkv.Lock.Unlock() } - return nil -} - -func insertEdge(tx kvi.KVBulkWrite, keyMap *KeyMap, edge *gdbi.Edge) error { - var err error - var data []byte - if edge.ID == "" { - return fmt.Errorf("inserting null key edge") + rowLoc, err := table.AddRow( + benchtop.Row{ + Id: []byte(vertex.ID), + TableName: vertexLabel, + Data: vertex.Data, + }, + ) + if err != nil { + return fmt.Errorf("AddVertex Error %s", err) } + table.AddTableEntryInfo(tx, []byte(vertex.ID), *rowLoc) - eid, lid := keyMap.GetsertEdgeKey(edge.ID, edge.Label) - src, ok := keyMap.GetVertexKey(edge.From) + _, ok = ggraph.jsonkv.PageCache.Set(vertex.ID, *rowLoc) if !ok { - return fmt.Errorf("vertex %s not found", edge.From) + ggraph.jsonkv.PageCache.Invalidate(vertex.ID) + ggraph.jsonkv.PageCache.Set(vertex.ID, *rowLoc) + //log.Debugln("Replaced vals: ", vertex.ID, oldVal, newVal) } - dst, ok := keyMap.GetVertexKey(edge.To) - if !ok { - return fmt.Errorf("vertex %s not found", edge.To) + + _, fieldsExist := ggraph.jsonkv.Fields[vertexLabel] + if fieldsExist { + for field := range ggraph.jsonkv.Fields[vertexLabel] { + if val := jsontable.PathLookup(vertex.Data, field); val != nil { + err := tx.Set(benchtop.FieldKey(field, vertexLabel, val, []byte(vertex.ID)), []byte{}, nil) + if err != nil { + return err + } + Mval, err := sonic.ConfigFastest.Marshal(val) + if err != nil { + return err + } + err = tx.Set(benchtop.RFieldKey(vertexLabel, field, vertex.ID), Mval, nil) + if err != nil { + return err + } + } + } } - ekey := EdgeKey(eid, src, dst, lid) - skey := SrcEdgeKey(eid, src, dst, lid) - dkey := DstEdgeKey(eid, src, dst, lid) + return nil +} - data, err = protoutil.StructMarshal(edge.Data) +func insertEdge(tx *pebblebulk.PebbleBulk, edge *gdbi.Edge) error { + if edge.ID == "" || + edge.From == "" || + edge.To == "" || + edge.Label == "" { + log.Errorln("insertEdge Err: ", edge) + return fmt.Errorf("inserting null key edge") + } + err := tx.Set(EdgeKey(edge.ID, edge.From, edge.To, edge.Label), nil, nil) if err != nil { return err } - - err = tx.Set(ekey, data) + err = tx.Set(DstEdgeKey( + edge.ID, + edge.From, + edge.To, + edge.Label, + ), []byte{}, nil) if err != nil { return err } - err = tx.Set(skey, []byte{}) + err = tx.Set(SrcEdgeKey( + edge.ID, + edge.From, + edge.To, + edge.Label, + ), []byte{}, nil) if err != nil { return err } - err = tx.Set(dkey, []byte{}) + return nil +} + +func (ggraph *Graph) indexEdge(edge *gdbi.Edge, tx *pebblebulk.PebbleBulk) error { + edgeLabel := ETABLE_PREFIX + edge.Label + ggraph.jsonkv.Lock.Lock() + table, ok := ggraph.jsonkv.Tables[edgeLabel] + ggraph.jsonkv.Lock.Unlock() + + if !ok { + log.Debugf("Creating new table %s for label %s on graph %s", edgeLabel, edge.Label, ggraph.graphID) + newTable, err := ggraph.jsonkv.New(edgeLabel, nil) + if err != nil { + return fmt.Errorf("indexEdge: jsonkv.New: %s", err) + } + ggraph.jsonkv.Lock.Lock() + table = newTable.(*jsontable.JSONTable) + ggraph.jsonkv.Tables[edgeLabel] = table + ggraph.jsonkv.Lock.Unlock() + } + rowLoc, err := table.AddRow(benchtop.Row{Id: []byte(edge.ID), TableName: edgeLabel, Data: edge.Data}) if err != nil { - return err + return fmt.Errorf("indexEdge: table.AddRow: %s", err) + } + table.AddTableEntryInfo(tx, []byte(edge.ID), *rowLoc) + + _, ok = ggraph.jsonkv.PageCache.Set(edge.ID, *rowLoc) + if !ok { + ggraph.jsonkv.PageCache.Invalidate(edge.ID) + ggraph.jsonkv.PageCache.Set(edge.ID, *rowLoc) + } + + _, fieldsExist := ggraph.jsonkv.Fields[edgeLabel] + if fieldsExist { + for field := range ggraph.jsonkv.Fields[edgeLabel] { + if val := jsontable.PathLookup(edge.Data, field); val != nil { + err := tx.Set(benchtop.FieldKey(field, edgeLabel, val, []byte(edge.ID)), []byte{}, nil) + if err != nil { + return err + } + eMarsh, err := sonic.ConfigFastest.Marshal(val) + if err != nil { + return err + } + err = tx.Set(benchtop.RFieldKey(edgeLabel, field, edge.ID), eMarsh, nil) + if err != nil { + return err + } + } + } } return nil } -func indexEdge(tx kvi.KVBulkWrite, idx *kvindex.KVIndex, edge *gdbi.Edge) error { - err := idx.AddDocTx(tx, edge.ID, edgeIdxStruct(edge)) - return err +func (ggraph *Graph) Compiler() gdbi.Compiler { + return core.NewCompiler(ggraph, GridsOptimizer, core.IndexStartOptimize) } // AddVertex adds an edge to the graph, if it already exists // in the graph, it is replaced func (ggraph *Graph) AddVertex(vertices []*gdbi.Vertex) error { - err := ggraph.graphkv.BulkWrite(func(tx kvi.KVBulkWrite) error { + err := ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { var bulkErr *multierror.Error for _, vert := range vertices { - if err := insertVertex(tx, ggraph.keyMap, vert); err != nil { + if err := insertVertex(tx, vert); err != nil { bulkErr = multierror.Append(bulkErr, err) log.Errorf("AddVertex Error %s", err) } @@ -117,10 +203,11 @@ func (ggraph *Graph) AddVertex(vertices []*gdbi.Vertex) error { ggraph.ts.Touch(ggraph.graphID) return bulkErr.ErrorOrNil() }) - err = ggraph.indexkv.BulkWrite(func(tx kvi.KVBulkWrite) error { + + err = ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { var bulkErr *multierror.Error for _, vert := range vertices { - if err := indexVertex(tx, ggraph.idx, vert); err != nil { + if err := ggraph.indexVertex(vert, tx); err != nil { bulkErr = multierror.Append(bulkErr, err) log.Errorf("IndexVertex Error %s", err) } @@ -134,23 +221,28 @@ func (ggraph *Graph) AddVertex(vertices []*gdbi.Vertex) error { // AddEdge adds an edge to the graph, if the id is not "" and in already exists // in the graph, it is replaced func (ggraph *Graph) AddEdge(edges []*gdbi.Edge) error { - err := ggraph.graphkv.BulkWrite(func(tx kvi.KVBulkWrite) error { - for _, edge := range edges { - err := insertEdge(tx, ggraph.keyMap, edge) - if err != nil { - return err + var err error = nil + err = ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { + err = ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for _, edge := range edges { + err = insertEdge(tx, edge) + if err != nil { + log.Errorln("Err insertEdge: ", err) + return err + } } - } + return err + }) ggraph.ts.Touch(ggraph.graphID) - return nil + return err }) if err != nil { return err } - err = ggraph.indexkv.BulkWrite(func(tx kvi.KVBulkWrite) error { + err = ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { var bulkErr *multierror.Error for _, edge := range edges { - if err := indexEdge(tx, ggraph.idx, edge); err != nil { + if err := ggraph.indexEdge(edge, tx); err != nil { bulkErr = multierror.Append(bulkErr, err) } } @@ -162,162 +254,170 @@ func (ggraph *Graph) AddEdge(edges []*gdbi.Edge) error { } func (ggraph *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { - var anyErr error + var errs *multierror.Error insertStream := make(chan *gdbi.GraphElement, 100) - indexStream := make(chan *gdbi.GraphElement, 100) - s := &sync.WaitGroup{} - s.Add(2) + indexStream := make(chan *benchtop.Row, 100) + errChan := make(chan error, 2) + + var wg sync.WaitGroup + wg.Add(2) + go func() { - ggraph.graphkv.BulkWrite(func(tx kvi.KVBulkWrite) error { + defer wg.Done() + err := ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { for elem := range insertStream { if elem.Vertex != nil { - if err := insertVertex(tx, ggraph.keyMap, elem.Vertex); err != nil { - anyErr = err + if err := insertVertex(tx, elem.Vertex); err != nil { + return fmt.Errorf("vertex insert error: %v", err) } } if elem.Edge != nil { - if err := insertEdge(tx, ggraph.keyMap, elem.Edge); err != nil { - anyErr = err + if err := insertEdge(tx, elem.Edge); err != nil { + return fmt.Errorf("edge insert error: %v", err) } } } - s.Done() - return anyErr + return nil }) + if err != nil { + log.Errorf("ERR in graph Bulk Add: %s", err) + return + } + }() go func() { - ggraph.indexkv.BulkWrite(func(tx kvi.KVBulkWrite) error { - for elem := range indexStream { - if elem.Vertex != nil { - if err := indexVertex(tx, ggraph.idx, elem.Vertex); err != nil { - anyErr = err - } + defer wg.Done() + err := ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { + if err := ggraph.jsonkv.BulkLoad(indexStream, tx); err != nil { + return fmt.Errorf("jsonkv bulk load error: %v", err) + } + ggraph.ts.Touch(ggraph.graphID) + return nil + }) + errChan <- err + }() + + go func() { + defer func() { + close(insertStream) + close(indexStream) + }() + for elem := range stream { + insertStream <- elem + if elem.Vertex != nil { + indexStream <- &benchtop.Row{ + Id: []byte(elem.Vertex.ID), + TableName: VTABLE_PREFIX + elem.Vertex.Label, + Data: elem.Vertex.Data, } - if elem.Edge != nil { - if err := indexEdge(tx, ggraph.idx, elem.Edge); err != nil { - anyErr = err - } + } + if elem.Edge != nil { + indexStream <- &benchtop.Row{ + Id: []byte(elem.Edge.ID), + TableName: ETABLE_PREFIX + elem.Edge.Label, + Data: elem.Edge.Data, } } - s.Done() - return anyErr - }) + } }() - for i := range stream { - insertStream <- i - indexStream <- i - } - close(insertStream) - close(indexStream) - s.Wait() - return anyErr -} + wg.Wait() + close(errChan) -// DelEdge deletes edge with id `key` -func (ggraph *Graph) DelEdge(eid string) error { - edgeKey, ok := ggraph.keyMap.GetEdgeKey(eid) - if !ok { - return fmt.Errorf("edge not found") - } - ekeyPrefix := EdgeKeyPrefix(edgeKey) - var ekey []byte - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for it.Seek(ekeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), ekeyPrefix); it.Next() { - ekey = it.Key() + for err := range errChan { + if err != nil { + errs = multierror.Append(errs, err) } - return nil - }) - - if ekey == nil { - return fmt.Errorf("edge not found") } - _, sid, did, _ := EdgeKeyParse(ekey) - - skey := SrcEdgeKeyPrefix(edgeKey, sid, did) - dkey := DstEdgeKeyPrefix(edgeKey, sid, did) - - var bulkErr *multierror.Error - if err := ggraph.graphkv.Delete(ekey); err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - if err := ggraph.graphkv.Delete(skey); err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - if err := ggraph.graphkv.Delete(dkey); err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - if err := ggraph.keyMap.DelEdgeKey(eid); err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - ggraph.ts.Touch(ggraph.graphID) - return bulkErr.ErrorOrNil() + return errs.ErrorOrNil() } -// DelVertex deletes vertex with id `key` func (ggraph *Graph) DelVertex(id string) error { - vertexKey, ok := ggraph.keyMap.GetVertexKey(id) - if !ok { - return fmt.Errorf("vertex %s not found", id) - } - vid := VertexKey(vertexKey) - skeyPrefix := SrcEdgePrefix(vertexKey) - dkeyPrefix := DstEdgePrefix(vertexKey) + vid := VertexKey(id) + skeyPrefix := SrcEdgePrefix(id) + dkeyPrefix := DstEdgePrefix(id) delKeys := make([][]byte, 0, 1000) + edgesToDelete := make(map[string]string) var bulkErr *multierror.Error - - err := ggraph.graphkv.View(func(it kvi.KVIterator) error { - var bulkErr *multierror.Error + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { skey := it.Key() - // get edge ID from key eid, sid, did, label := SrcEdgeKeyParse(skey) - ekey := EdgeKey(eid, sid, did, label) - dkey := DstEdgeKey(eid, sid, did, label) - delKeys = append(delKeys, ekey, skey, dkey) - edgeID, ok := ggraph.keyMap.GetEdgeID(eid) - if ok { - if err := ggraph.keyMap.DelEdgeKey(edgeID); err != nil { - bulkErr = multierror.Append(bulkErr, err) + if ggraph.tempDeletedEdges != nil { + if _, exists := ggraph.tempDeletedEdges[eid]; exists { + continue } } + if _, exists := edgesToDelete[eid]; exists { + continue + } + + ekey := EdgeKey(eid, sid, did, label) + dkey := DstEdgeKey(eid, sid, did, label) + delKeys = append(delKeys, ekey, skey, dkey) + edgesToDelete[eid] = label } + for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { dkey := it.Key() - // get edge ID from key - eid, sid, did, label := SrcEdgeKeyParse(dkey) - ekey := EdgeKey(eid, sid, did, label) - skey := SrcEdgeKey(eid, sid, did, label) - delKeys = append(delKeys, ekey, skey, dkey) + eid, sid, did, label := DstEdgeKeyParse(dkey) - edgeID, ok := ggraph.keyMap.GetEdgeID(eid) - if ok { - if err := ggraph.keyMap.DelEdgeKey(edgeID); err != nil { - bulkErr = multierror.Append(bulkErr, err) + if ggraph.tempDeletedEdges != nil { + if _, exists := ggraph.tempDeletedEdges[eid]; exists { + continue } } + if _, exists := edgesToDelete[eid]; exists { + continue + } + + ekey := EdgeKey(eid, sid, did, label) + skey := SrcEdgeKey(eid, sid, did, label) + delKeys = append(delKeys, ekey, skey, dkey) + edgesToDelete[eid] = label } - return bulkErr.ErrorOrNil() + return nil }) + if err != nil { - bulkErr = multierror.Append(bulkErr, err) + return err } - if err := ggraph.keyMap.DelVertexKey(id); err != nil { + for eid, label := range edgesToDelete { + if err := ggraph.DeleteAnyRow(eid, label, true); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + + if ggraph.tempDeletedEdges != nil { + ggraph.tempDeletedEdges[eid] = struct{}{} + } + } + + loc, err := ggraph.jsonkv.PageCache.Get(context.Background(), id, ggraph.jsonkv.PageLoader) + if err != nil { + return err + } + + label := ggraph.jsonkv.LabelLookup[loc.Label] + if label == "" { + bulkErr = multierror.Append(bulkErr, fmt.Errorf("Failed to lookup table label %d", loc.Label)) + } + if err := ggraph.DeleteAnyRow(id, label, false); err != nil { bulkErr = multierror.Append(bulkErr, err) } - err = ggraph.graphkv.Update(func(tx kvi.KVTransaction) error { - if err := tx.Delete(vid); err != nil { + err = ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { + if err := tx.DeletePrefix(vid); err != nil { return err } for _, k := range delKeys { - if err := tx.Delete(k); err != nil { + if err := tx.DeletePrefix(k); err != nil { + log.Errorf("BulkWrite failed to delete key %s: %v", string(k), err) return err } } @@ -327,6 +427,55 @@ func (ggraph *Graph) DelVertex(id string) error { if err != nil { bulkErr = multierror.Append(bulkErr, err) } + + return bulkErr.ErrorOrNil() +} + +func (ggraph *Graph) DelEdge(eid string) error { + ekeyPrefix := EdgeKeyPrefix(eid) + var ekey []byte + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for it.Seek(ekeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), ekeyPrefix); it.Next() { + ekey = it.Key() + } + return nil + }) + if err != nil { + return err + } + + if ekey == nil { + log.Debugf("Edge %s not found", eid) + return nil + } + + _, sid, did, lbl := EdgeKeyParse(ekey) + skey := SrcEdgeKey(sid, did, eid, lbl) + dkey := DstEdgeKey(sid, did, eid, lbl) + + var bulkErr *multierror.Error + err = ggraph.jsonkv.Pb.BulkWrite(func(tx *pebblebulk.PebbleBulk) error { + if err := tx.Delete(ekey, nil); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + if err := tx.Delete(skey, nil); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + if err := tx.Delete(dkey, nil); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + ggraph.ts.Touch(ggraph.graphID) + return nil + }) + + if err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + + if err := ggraph.DeleteAnyRow(eid, lbl, true); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + return bulkErr.ErrorOrNil() } @@ -335,7 +484,7 @@ func (ggraph *Graph) GetEdgeList(ctx context.Context, loadProp bool) <-chan *gdb o := make(chan *gdbi.Edge, 100) go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { ePrefix := EdgeListPrefix() for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { select { @@ -343,24 +492,22 @@ func (ggraph *Graph) GetEdgeList(ctx context.Context, loadProp bool) <-chan *gdb return nil default: } - keyValue := it.Key() - ekey, skey, dkey, label := EdgeKeyParse(keyValue) - labelID, _ := ggraph.keyMap.GetLabelID(label) - sid, _ := ggraph.keyMap.GetVertexID(skey) - did, _ := ggraph.keyMap.GetVertexID(dkey) - eid, _ := ggraph.keyMap.GetEdgeID(ekey) - e := &gdbi.Edge{ID: eid, Label: labelID, From: sid, To: did} + eid, sid, did, label := EdgeKeyParse(it.Key()) + e := &gdbi.Edge{ID: eid, Label: label, From: sid, To: did} if loadProp { - var err error - edgeData, _ := it.Value() - e.Data, err = protoutil.StructUnMarshal(edgeData) - e.Loaded = true + entry, err := ggraph.jsonkv.PageCache.Get(ctx, eid, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetEdgeList: PageCache.Get( error: %v", err) + continue + } + e.Data, err = ggraph.jsonkv.Tables[ETABLE_PREFIX+label].GetRow(entry) if err != nil { - log.Errorf("GetEdgeList: unmarshal error: %v", err) + log.Errorf("GetEdgeList: GetRow error: %v", err) continue } + e.Loaded = true } else { - e.Data = map[string]interface{}{} + e.Data = map[string]any{} } o <- e } @@ -372,131 +519,126 @@ func (ggraph *Graph) GetEdgeList(ctx context.Context, loadProp bool) <-chan *gdb // GetVertex loads a vertex given an id. It returns a nil if not found func (ggraph *Graph) GetVertex(id string, loadProp bool) *gdbi.Vertex { - key, ok := ggraph.keyMap.GetVertexKey(id) - if !ok { + ekeyPrefix := VertexKey(id) + var byteLabel []byte = nil + var err error = nil + err = ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for it.Seek(ekeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), ekeyPrefix); it.Next() { + byteLabel, err = it.Value() + } + return nil + }) + if err != nil || byteLabel == nil { return nil } - vkey := VertexKey(key) - var v *gdbi.Vertex - err := ggraph.graphkv.View(func(it kvi.KVIterator) error { - lKey := ggraph.keyMap.GetVertexLabel(key) - lID, _ := ggraph.keyMap.GetLabelID(lKey) - v = &gdbi.Vertex{ - ID: id, - Label: lID, + v := &gdbi.Vertex{ + ID: id, + Label: string(byteLabel), + } + if loadProp { + entry, err := ggraph.jsonkv.PageCache.Get(context.Background(), id, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetVertex: PageCache.Get( error: %v", err) + return nil } - if loadProp { - dataValue, err := it.Get(vkey) - v.Data, err = protoutil.StructUnMarshal(dataValue) - v.Loaded = true - if err != nil { - return fmt.Errorf("unmarshal error: %v", err) - } - } else { - v.Data = map[string]interface{}{} + v.Data, err = ggraph.jsonkv.Tables[VTABLE_PREFIX+v.Label].GetRow(entry) + if err != nil { + log.Errorf("GetVertex: table.GetRow( error: %v", err) + return nil } - return nil - }) - if err != nil { - return nil + v.Loaded = true + } else { + v.Data = map[string]any{} } return v } type elementData struct { - key uint64 - req gdbi.ElementLookup - data []byte + label string + req gdbi.ElementLookup + data []byte } -// GetVertexChannel is passed a channel of vertex ids and it produces a channel -// of vertices func (ggraph *Graph) GetVertexChannel(ctx context.Context, ids chan gdbi.ElementLookup, load bool) chan gdbi.ElementLookup { - data := make(chan elementData, 100) + out := make(chan gdbi.ElementLookup, 100) go func() { - defer close(data) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + defer close(out) + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for id := range ids { if id.IsSignal() { - data <- elementData{req: id} + out <- id } else { - key, _ := ggraph.keyMap.GetVertexKey(id.ID) - ed := elementData{key: key, req: id} if load { - vkey := VertexKey(key) - dataValue, err := it.Get(vkey) - if err == nil { - ed.data = dataValue + prefix := VertexKey(id.ID) + v := gdbi.Vertex{ID: id.ID} + for it.Seek(prefix); it.Valid() && bytes.HasPrefix(it.Key(), prefix); it.Next() { + label, err := it.Value() + if err != nil { + log.Errorln("GetVertexChannel it.Value() err: ", err) + continue + } + v.Label = string(label) + + entry, err := ggraph.jsonkv.PageCache.Get(ctx, id.ID, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetVertexChannel: PageCache.Get( error: %v", err) + continue + } + v.Data, err = ggraph.jsonkv.Tables[VTABLE_PREFIX+v.Label].GetRow(entry) + if err != nil { + log.Errorf("GetVertexChannel: GetRow error for ID %s: %v", id.ID, err) + continue + } + v.Loaded = true } + id.Vertex = &v + out <- id + + } else { + id.Vertex = &gdbi.Vertex{ID: id.ID} + out <- id } - data <- ed } } return nil }) }() - - out := make(chan gdbi.ElementLookup, 100) - go func() { - defer close(out) - for d := range data { - if d.req.IsSignal() { - out <- d.req - } else { - lKey := ggraph.keyMap.GetVertexLabel(d.key) - lID, _ := ggraph.keyMap.GetLabelID(lKey) - v := gdbi.Vertex{ID: d.req.ID, Label: lID} - if load { - var err error - v.Data, err = protoutil.StructUnMarshal(d.data) - if err != nil { - log.Errorf("GetVertexChannel: unmarshal error: %v", err) - continue - } - v.Loaded = true - } else { - v.Data = map[string]interface{}{} - } - d.req.Vertex = &v - out <- d.req - } - } - }() - return out } +type lookup struct { + req gdbi.ElementLookup + key string +} + // GetOutChannel process requests of vertex ids and find the connected vertices on outgoing edges func (ggraph *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { - vertexChan := make(chan elementData, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } + // Todo: implement bulk cache get + bulk get row to try to make this faster + lookupChan := make(chan lookup, 1000) go func() { - defer close(vertexChan) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + defer close(lookupChan) + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for req := range reqChan { if req.IsSignal() { - vertexChan <- elementData{req: req} + lookupChan <- lookup{req: req} } else { - key, ok := ggraph.keyMap.GetVertexKey(req.ID) - if ok { - skeyPrefix := SrcEdgePrefix(key) - for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { - keyValue := it.Key() - _, _, dst, label := SrcEdgeKeyParse(keyValue) - if len(edgeLabelKeys) == 0 || setcmp.ContainsUint(edgeLabelKeys, label) { - vkey := VertexKey(dst) - vertexChan <- elementData{ - data: vkey, - req: req, - } + found := false + skeyPrefix := SrcEdgePrefix(req.ID) + for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { + _, _, dst, label := SrcEdgeKeyParse(it.Key()) + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { + lookupChan <- lookup{ + key: dst, + req: req, } + found = true + } + } + if !found && emitNull { + lookupChan <- lookup{ + req: req, + key: "", } } } @@ -508,35 +650,40 @@ func (ggraph *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.Elemen o := make(chan gdbi.ElementLookup, 100) go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for req := range vertexChan { - if req.req.IsSignal() { - o <- req.req - } else { - vkey := VertexKeyParse(req.data) - gid, _ := ggraph.keyMap.GetVertexID(vkey) - lkey := ggraph.keyMap.GetVertexLabel(vkey) - lid, _ := ggraph.keyMap.GetLabelID(lkey) - v := &gdbi.Vertex{ID: gid, Label: lid} + for req := range lookupChan { + if req.req.IsSignal() { + o <- req.req + } else { + if req.key != "" { + entry, err := ggraph.jsonkv.PageCache.Get(ctx, req.key, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetOutChannel: PageCache.Get( error: %v", err) + continue + } + vLabel, ok := ggraph.jsonkv.LabelLookup[entry.Label] + if !ok { + log.Errorf("GetOutChannel: Label not a string %s", vLabel) + continue + } + v := &gdbi.Vertex{ID: req.key, Label: vLabel} if load { - dataValue, err := it.Get(req.data) - if err == nil { - v.Data, err = protoutil.StructUnMarshal(dataValue) - if err != nil { - log.Errorf("GetOutChannel: unmarshal error: %v", err) - continue - } - v.Loaded = true + v.Data, err = ggraph.jsonkv.Tables[VTABLE_PREFIX+v.Label].GetRow(entry) + if err != nil { + log.Errorf("GetOutChannel: GetRow on %s: %s error: %v", vLabel, req.key, err) + continue } + v.Loaded = true } else { - v.Data = map[string]interface{}{} + v.Data = map[string]any{} } req.req.Vertex = v o <- req.req + } else { + req.req.Vertex = nil + o <- req.req } } - return nil - }) + } }() return o } @@ -544,50 +691,51 @@ func (ggraph *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.Elemen // GetInChannel process requests of vertex ids and find the connected vertices on incoming edges func (ggraph *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { o := make(chan gdbi.ElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for req := range reqChan { if req.IsSignal() { o <- req } else { - vkey, ok := ggraph.keyMap.GetVertexKey(req.ID) - if ok { - dkeyPrefix := DstEdgePrefix(vkey) - for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { - keyValue := it.Key() - _, src, _, label := DstEdgeKeyParse(keyValue) - if len(edgeLabelKeys) == 0 || setcmp.ContainsUint(edgeLabelKeys, label) { - vkey := VertexKey(src) - srcID, _ := ggraph.keyMap.GetVertexID(src) - lKey := ggraph.keyMap.GetVertexLabel(src) - lID, _ := ggraph.keyMap.GetLabelID(lKey) - v := &gdbi.Vertex{ID: srcID, Label: lID} - if load { - dataValue, err := it.Get(vkey) - if err == nil { - v.Data, err = protoutil.StructUnMarshal(dataValue) - if err != nil { - log.Errorf("GetInChannel: unmarshal error: %v", err) - continue - } - v.Loaded = true - } - } else { - v.Data = map[string]interface{}{} + found := false + dkeyPrefix := DstEdgePrefix(req.ID) + for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { + _, sid, _, label := DstEdgeKeyParse(it.Key()) + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { + entry, err := ggraph.jsonkv.PageCache.Get(ctx, sid, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetInChannel: PageCache.Get( error: %v", err) + continue + } + + vLabel, ok := ggraph.jsonkv.LabelLookup[entry.Label] + if !ok { + log.Errorf("GetInChannel Label lookup failed") + continue + } + + v := &gdbi.Vertex{ID: sid, Label: vLabel} + if load { + v.Data, err = ggraph.jsonkv.Tables[VTABLE_PREFIX+v.Label].GetRow(entry) + if err != nil { + log.Errorf("GetInChannel: GetRow on %s: %s error: %v", vLabel, sid, err) + continue } - req.Vertex = v - o <- req + v.Loaded = true + } else { + v.Data = map[string]any{} } + req.Vertex = v + o <- req + found = true } } + + if !found && emitNull { + req.Vertex = nil + o <- req + } } } return nil @@ -599,56 +747,53 @@ func (ggraph *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.Element // GetOutEdgeChannel process requests of vertex ids and find the connected outgoing edges func (ggraph *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { o := make(chan gdbi.ElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for req := range reqChan { if req.IsSignal() { o <- req } else { - vkey, ok := ggraph.keyMap.GetVertexKey(req.ID) - if ok { - skeyPrefix := SrcEdgePrefix(vkey) - for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { - keyValue := it.Key() - eid, src, dst, label := SrcEdgeKeyParse(keyValue) - if len(edgeLabelKeys) == 0 || setcmp.ContainsUint(edgeLabelKeys, label) { - e := gdbi.Edge{} - e.ID, _ = ggraph.keyMap.GetEdgeID(eid) - e.From, _ = ggraph.keyMap.GetVertexID(src) - e.To, _ = ggraph.keyMap.GetVertexID(dst) - e.Label, _ = ggraph.keyMap.GetLabelID(label) - if load { - ekey := EdgeKey(eid, src, dst, label) - dataValue, err := it.Get(ekey) - if err == nil { - e.Data, err = protoutil.StructUnMarshal(dataValue) - if err != nil { - log.Errorf("GetOutEdgeChannel: unmarshal error: %v", err) - continue - } - e.Loaded = true - } - } else { - e.Data = map[string]interface{}{} + found := false + skeyPrefix := SrcEdgePrefix(req.ID) + for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { + eid, src, dst, label := SrcEdgeKeyParse(it.Key()) + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { + e := gdbi.Edge{ + From: src, + To: dst, + Label: label, + ID: eid, + } + if load { + entry, err := ggraph.jsonkv.PageCache.Get(ctx, e.ID, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetOutEdgeChannel: PageCache.Get( error: %v", err) + continue + } + e.Data, err = ggraph.jsonkv.Tables[ETABLE_PREFIX+e.Label].GetRow(entry) + if err != nil { + log.Errorf("GetOutEdgeChannel: GetRow error: %v", err) + continue } - req.Edge = &e - o <- req + e.Loaded = true + } else { + e.Data = map[string]any{} } + req.Edge = &e + o <- req + found = true } } + + if !found && emitNull { + req.Edge = nil + o <- req + } } } return nil }) - }() return o } @@ -656,51 +801,51 @@ func (ggraph *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.El // GetInEdgeChannel process requests of vertex ids and find the connected incoming edges func (ggraph *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { o := make(chan gdbi.ElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for req := range reqChan { if req.IsSignal() { o <- req } else { - vkey, ok := ggraph.keyMap.GetVertexKey(req.ID) - if ok { - dkeyPrefix := DstEdgePrefix(vkey) - for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { - keyValue := it.Key() - eid, src, dst, label := DstEdgeKeyParse(keyValue) - if len(edgeLabelKeys) == 0 || setcmp.ContainsUint(edgeLabelKeys, label) { - e := gdbi.Edge{} - e.ID, _ = ggraph.keyMap.GetEdgeID(eid) - e.From, _ = ggraph.keyMap.GetVertexID(src) - e.To, _ = ggraph.keyMap.GetVertexID(dst) - e.Label, _ = ggraph.keyMap.GetLabelID(label) - if load { - ekey := EdgeKey(eid, src, dst, label) - dataValue, err := it.Get(ekey) - if err == nil { - e.Data, err = protoutil.StructUnMarshal(dataValue) - if err != nil { - log.Errorf("GetInEdgeChannel: unmarshal error: %v", err) - continue - } - e.Loaded = true - } - } else { - e.Data = map[string]interface{}{} + found := false + dkeyPrefix := DstEdgePrefix(req.ID) + for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { + eid, src, dst, label := DstEdgeKeyParse(it.Key()) + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { + e := gdbi.Edge{ + ID: eid, + From: src, + To: dst, + Label: label, + } + if load { + entry, err := ggraph.jsonkv.PageCache.Get(ctx, e.ID, ggraph.jsonkv.PageLoader) + if err != nil { + log.Errorf("GetInEdgeChannel: PageCache.Get( error: %v", err) + continue + } + //log.Debugln("IN EDGE LABEL: ", e.Label, "ENTRY: ", entry, "ID: ", e.ID) + + e.Data, err = ggraph.jsonkv.Tables[ETABLE_PREFIX+e.Label].GetRow(entry) + if err != nil { + log.Errorf("GetInEdgeChannel: GetRow error: %v", err) + continue } - req.Edge = &e - o <- req + e.Loaded = true + } else { + e.Data = map[string]any{} } + req.Edge = &e + o <- req + found = true } } + + if !found && emitNull { + req.Edge = nil + o <- req + } } } return nil @@ -712,36 +857,32 @@ func (ggraph *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.Ele // GetEdge loads an edge given an id. It returns nil if not found func (ggraph *Graph) GetEdge(id string, loadProp bool) *gdbi.Edge { - ekey, ok := ggraph.keyMap.GetEdgeKey(id) - if !ok { - return nil - } - ekeyPrefix := EdgeKeyPrefix(ekey) - + ekeyPrefix := EdgeKeyPrefix(id) var e *gdbi.Edge - err := ggraph.graphkv.View(func(it kvi.KVIterator) error { + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { for it.Seek(ekeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), ekeyPrefix); it.Next() { - eid, src, dst, labelKey := EdgeKeyParse(it.Key()) - gid, _ := ggraph.keyMap.GetEdgeID(eid) - from, _ := ggraph.keyMap.GetVertexID(src) - to, _ := ggraph.keyMap.GetVertexID(dst) - label, _ := ggraph.keyMap.GetLabelID(labelKey) + eid, src, dst, label := EdgeKeyParse(it.Key()) e = &gdbi.Edge{ - ID: gid, - From: from, - To: to, + ID: eid, + From: src, + To: dst, Label: label, } if loadProp { - var err error - d, _ := it.Value() - e.Data, err = protoutil.StructUnMarshal(d) + entry, err := ggraph.jsonkv.PageCache.Get(context.Background(), e.ID, ggraph.jsonkv.PageLoader) if err != nil { - return fmt.Errorf("unmarshal error: %v", err) + log.Errorf("GetEdge: PageCache.Get( error: %v", err) + continue + } + + e.Data, err = ggraph.jsonkv.Tables[ETABLE_PREFIX+e.Label].GetRow(entry) + if err != nil { + log.Errorf("GetEdge: GetRow error: %v", err) + continue } e.Loaded = true } else { - e.Data = map[string]interface{}{} + e.Data = map[string]any{} } } return nil @@ -757,32 +898,37 @@ func (ggraph *Graph) GetVertexList(ctx context.Context, loadProp bool) <-chan *g o := make(chan *gdbi.Vertex, 100) go func() { defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { + ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { vPrefix := VertexListPrefix() - for it.Seek(vPrefix); it.Valid() && bytes.HasPrefix(it.Key(), vPrefix); it.Next() { select { case <-ctx.Done(): return nil default: } - v := &gdbi.Vertex{} - keyValue := it.Key() - vKey := VertexKeyParse(keyValue) - lKey := ggraph.keyMap.GetVertexLabel(vKey) - v.ID, _ = ggraph.keyMap.GetVertexID(vKey) - v.Label, _ = ggraph.keyMap.GetLabelID(lKey) + byteLabel, err := it.Value() + if err != nil { + log.Errorf("GetVertexList it.Value() error: %s", err) + } + v := &gdbi.Vertex{ + ID: VertexKeyParse(it.Key()), + Label: string(byteLabel), + } if loadProp { - var err error - dataValue, _ := it.Value() - v.Data, err = protoutil.StructUnMarshal(dataValue) + entry, err := ggraph.jsonkv.PageCache.Get(context.Background(), v.ID, ggraph.jsonkv.PageLoader) if err != nil { - log.Errorf("GetVertexList: unmarshal error: %v", err) + log.Errorf("GetVertexList: PageCache.Get on %s error: %s", v.ID, err) + continue + } + + v.Data, err = ggraph.jsonkv.Tables[VTABLE_PREFIX+v.Label].GetRow(entry) + if err != nil { + log.Errorf("GetVertexList: table.GetRow error: %s", err) continue } v.Loaded = true } else { - v.Data = map[string]interface{}{} + v.Data = map[string]any{} } o <- v } @@ -794,20 +940,469 @@ func (ggraph *Graph) GetVertexList(ctx context.Context, loadProp bool) <-chan *g // ListVertexLabels returns a list of vertex types in the graph func (ggraph *Graph) ListVertexLabels() ([]string, error) { - labelField := fmt.Sprintf("%s.v.label", ggraph.graphID) labels := []string{} - for i := range ggraph.idx.FieldTerms(labelField) { - labels = append(labels, i.(string)) + for i := range ggraph.jsonkv.GetLabels(false, true) { + labels = append(labels, i) } return labels, nil } // ListEdgeLabels returns a list of edge types in the graph func (ggraph *Graph) ListEdgeLabels() ([]string, error) { - labelField := fmt.Sprintf("%s.e.label", ggraph.graphID) labels := []string{} - for i := range ggraph.idx.FieldTerms(labelField) { - labels = append(labels, i.(string)) + for i := range ggraph.jsonkv.GetLabels(true, true) { + labels = append(labels, i) } return labels, nil } + +// New Bulk Delete Function. Testing... +// BulkDel deletes vertices and edges in bulk. +func (ggraph *Graph) BulkDel(data *gdbi.DeleteData) error { + type keyBatch struct { + singles [][]byte + ranges [][2][]byte + posKeys [][]byte + } + + type itemInfo struct { + id string + label string + isEdge bool + tbl string + } + + type fieldInfo struct { + rKey []byte + field string + tbl string + id []byte + } + + const shardSize = 64 + const bufferSize = 8192 + numCpus := runtime.NumCPU() + ctx := context.Background() + + var bulkErr *multierror.Error + addErr := func(err error) { + if err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + } + + // Sharded bitmap for edge deduplication (lock-free for reads) + type shard struct { + mu sync.Mutex + set map[string]struct{} + count uint32 // Atomic counter for seen edges + } + shards := make([]*shard, shardSize) + for i := range shards { + shards[i] = &shard{set: make(map[string]struct{}, bufferSize/shardSize)} + } + hasSeenEdge := func(eid string) bool { + h := fnv32a(eid) % uint32(shardSize) + shard := shards[h] + shard.mu.Lock() + defer shard.mu.Unlock() + if _, exists := shard.set[eid]; exists { + return true + } + shard.set[eid] = struct{}{} + atomic.AddUint32(&shard.count, 1) + return false + } + getSeenCount := func() uint64 { + var total uint64 + for _, shard := range shards { + total += uint64(atomic.LoadUint32(&shard.count)) + } + return total + } + + // Channels and wait groups + itemChan := make(chan itemInfo, bufferSize) + fieldChan := make(chan fieldInfo, bufferSize) + keyChan := make(chan keyBatch, bufferSize) + var prodWG, consWG, aggWG, fieldWG sync.WaitGroup + + // Aggregator for keys + var singles [][]byte + var ranges [][2][]byte + var posKeys [][]byte + aggWG.Add(1) + go func() { + defer aggWG.Done() + for batch := range keyChan { + select { + case <-ctx.Done(): + return + default: + singles = append(singles, batch.singles...) + ranges = append(ranges, batch.ranges...) + posKeys = append(posKeys, batch.posKeys...) + } + } + }() + + // Aggregator for fields + var allFields []fieldInfo + fieldWG.Add(1) + go func() { + defer fieldWG.Done() + for fi := range fieldChan { + allFields = append(allFields, fi) + } + }() + + // Workers for items + consWG.Add(numCpus) + for range numCpus { + go func() { + defer consWG.Done() + localBatch := keyBatch{posKeys: make([][]byte, 0, bufferSize)} + i := 0 + for item := range itemChan { + select { + case <-ctx.Done(): + return + default: + } + if i%100_000 == 0 && i != 0 { + log.Debugf("[BulkDel worker] processed %d items", i) + } + i++ + + // Fetch from page cache + loc, err := ggraph.jsonkv.PageCache.Get(ctx, item.id, ggraph.jsonkv.PageLoader) + if err != nil { + addErr(err) + continue + } + + // Mark table for deletion + table, ok := ggraph.jsonkv.Tables[item.tbl] + if !ok { + addErr(fmt.Errorf("table %s not found", item.tbl)) + continue + } + if err := table.MarkDeleteTable(loc); err != nil { + addErr(err) + } + + // Position key + localBatch.posKeys = append(localBatch.posKeys, benchtop.NewPosKey(loc.Label, []byte(item.id))) + ggraph.jsonkv.PageCache.Invalidate(item.id) + + // Send field infos + if fields, exists := ggraph.jsonkv.Fields[item.tbl]; exists { + for field := range fields { + rKey := benchtop.RFieldKey(item.tbl, field, item.id) + select { + case fieldChan <- fieldInfo{rKey: rKey, field: field, tbl: item.tbl, id: []byte(item.id)}: + case <-ctx.Done(): + return + } + } + } + + if len(localBatch.posKeys) >= 500_000 { + keyChan <- localBatch + localBatch = keyBatch{posKeys: make([][]byte, 0, bufferSize)} + } + } + + if len(localBatch.posKeys) > 0 { + keyChan <- localBatch + } + }() + } + + // Prepare vertex producers + slices.Sort(data.Vertices) + vertexSlices := make([][]string, numCpus) + for i, vid := range data.Vertices { + vertexSlices[i%numCpus] = append(vertexSlices[i%numCpus], vid) + } + for i := range vertexSlices { + slices.Sort(vertexSlices[i]) + } + + for _, slice := range vertexSlices { + if len(slice) == 0 { + continue + } + prodWG.Add(1) + go func(slice []string) { + defer prodWG.Done() + localBatch := keyBatch{singles: make([][]byte, 0, 256), ranges: make([][2][]byte, 0, 256)} + + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for _, vid := range slice { + select { + case <-ctx.Done(): + return ctx.Err() + default: + } + + sPrefix := SrcEdgePrefix(vid) + if err := it.Seek(sPrefix); err != nil { + return err + } + if it.Valid() && bytes.HasPrefix(it.Key(), sPrefix) { + nextPrefix := upperBound(sPrefix) + if nextPrefix != nil { + localBatch.ranges = append(localBatch.ranges, [2][]byte{sPrefix, nextPrefix}) + } + for it.Valid() && bytes.HasPrefix(it.Key(), sPrefix) { + eid, sid, did, lbl := SrcEdgeKeyParse(it.Key()) + if !hasSeenEdge(eid) { + localBatch.singles = append(localBatch.singles, + EdgeKey(eid, sid, did, lbl), + bytes.Clone(it.Key()), + DstEdgeKey(eid, sid, did, lbl)) + select { + case itemChan <- itemInfo{id: eid, label: lbl, isEdge: true, tbl: ETABLE_PREFIX + lbl}: + case <-ctx.Done(): + return ctx.Err() + } + } + it.Next() + } + } + + dPrefix := DstEdgePrefix(vid) + if err := it.Seek(dPrefix); err != nil { + return err + } + if it.Valid() && bytes.HasPrefix(it.Key(), dPrefix) { + nextPrefix := upperBound(dPrefix) + if nextPrefix != nil { + localBatch.ranges = append(localBatch.ranges, [2][]byte{dPrefix, nextPrefix}) + } + for it.Valid() && bytes.HasPrefix(it.Key(), dPrefix) { + eid, sid, did, lbl := DstEdgeKeyParse(it.Key()) + if !hasSeenEdge(eid) { + localBatch.singles = append(localBatch.singles, + EdgeKey(eid, sid, did, lbl), + SrcEdgeKey(eid, sid, did, lbl), + bytes.Clone(it.Key())) + select { + case itemChan <- itemInfo{id: eid, label: lbl, isEdge: true, tbl: ETABLE_PREFIX + lbl}: + case <-ctx.Done(): + return ctx.Err() + } + } + it.Next() + } + } + + vkey := VertexKey(vid) + if err := it.Seek(vkey); err != nil { + return err + } + var label string + if it.Valid() && bytes.Equal(it.Key(), vkey) { + labelBytes, err := it.Value() + if err != nil { + return err + } + label = string(labelBytes) + } + localBatch.singles = append(localBatch.singles, vkey) + if label != "" { + select { + case itemChan <- itemInfo{id: vid, label: label, isEdge: false, tbl: VTABLE_PREFIX + label}: + case <-ctx.Done(): + return ctx.Err() + } + } + } + return nil + }) + addErr(err) + + if len(localBatch.singles) > 0 || len(localBatch.ranges) > 0 { + select { + case keyChan <- localBatch: + case <-ctx.Done(): + } + } + }(slice) + } + + // Prepare edge producers + slices.Sort(data.Edges) + edgeSlices := make([][]string, numCpus) + for i, eid := range data.Edges { + edgeSlices[i%numCpus] = append(edgeSlices[i%numCpus], eid) + } + for i := range edgeSlices { + slices.Sort(edgeSlices[i]) + } + + for _, slice := range edgeSlices { + if len(slice) == 0 { + continue + } + prodWG.Add(1) + go func(slice []string) { + defer prodWG.Done() + localBatch := keyBatch{singles: make([][]byte, 0, 12), ranges: make([][2][]byte, 0, 12)} + + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for _, eid := range slice { + select { + case <-ctx.Done(): + return ctx.Err() + default: + } + + if hasSeenEdge(eid) { + continue + } + + prefix := EdgeKeyPrefix(eid) + if err := it.Seek(prefix); err != nil { + return err + } + if it.Valid() && bytes.HasPrefix(it.Key(), prefix) { + nextPrefix := upperBound(prefix) + if nextPrefix != nil { + localBatch.ranges = append(localBatch.ranges, [2][]byte{prefix, nextPrefix}) + } + var label string + for it.Valid() && bytes.HasPrefix(it.Key(), prefix) { + _, sid, did, lbl := EdgeKeyParse(it.Key()) + label = lbl + localBatch.singles = append(localBatch.singles, + SrcEdgeKey(eid, sid, did, lbl), + DstEdgeKey(eid, sid, did, lbl)) + it.Next() + } + if label != "" { + select { + case itemChan <- itemInfo{id: eid, label: label, isEdge: true, tbl: ETABLE_PREFIX + label}: + case <-ctx.Done(): + return ctx.Err() + } + } + } + } + return nil + }) + addErr(err) + + if len(localBatch.singles) > 0 || len(localBatch.ranges) > 0 { + select { + case keyChan <- localBatch: + case <-ctx.Done(): + } + } + }(slice) + } + + // Close channels and wait + go func() { + prodWG.Wait() + close(itemChan) + }() + consWG.Wait() + close(keyChan) + aggWG.Wait() + close(fieldChan) + fieldWG.Wait() + + // Process field indices with single iterator + var indexDelKeys [][]byte + if len(allFields) > 0 { + sort.Slice(allFields, func(i, j int) bool { + return bytes.Compare(allFields[i].rKey, allFields[j].rKey) < 0 + }) + err := ggraph.jsonkv.Pb.View(func(it *pebblebulk.PebbleIterator) error { + for _, fi := range allFields { + if err := it.Seek(fi.rKey); err != nil { + return err + } + if it.Valid() && bytes.Equal(it.Key(), fi.rKey) { + valueBytes, err := it.Value() + if err != nil { + return err + } + var fieldValue any + if err := sonic.ConfigFastest.Unmarshal(valueBytes, &fieldValue); err != nil { + return err + } + if fieldValue != nil { + fKey := benchtop.FieldKey(fi.field, fi.tbl, fieldValue, fi.id) + indexDelKeys = append(indexDelKeys, fKey, fi.rKey) + } + } + } + return nil + }) + addErr(err) + } + + // Chunked deletes with Pebble batch + chunked := func(singles [][]byte, ranges [][2][]byte, posKeys [][]byte, indexDelKeys [][]byte) error { + batch := ggraph.jsonkv.Pb.Db.NewBatch() + defer batch.Close() + for _, k := range singles { + if err := batch.Delete(k, nil); err != nil { + return err + } + } + for _, r := range ranges { + if err := batch.DeleteRange(r[0], r[1], nil); err != nil { + return err + } + } + for _, k := range posKeys { + if err := batch.Delete(k, nil); err != nil { + return err + } + } + for _, k := range indexDelKeys { + if err := batch.Delete(k, nil); err != nil { + return err + } + } + return batch.Commit(pebble.Sync) + } + + // Perform deletes + ggraph.jsonkv.PebbleLock.Lock() + if err := chunked(singles, ranges, posKeys, indexDelKeys); err != nil { + addErr(err) + } + ggraph.ts.Touch(ggraph.graphID) + ggraph.jsonkv.PebbleLock.Unlock() + + log.Debugf("Total edges seen: %d", getSeenCount()) + return bulkErr.ErrorOrNil() +} + +// upperBound computes the tight upper bound for range delete +func upperBound(prefix []byte) []byte { + ub := make([]byte, len(prefix)) + copy(ub, prefix) + for i := len(ub) - 1; i >= 0; i-- { + if ub[i] < 0xFF { + ub[i]++ + return ub[:i+1] + } + } + return nil +} + +// fnv32a computes FNV-1a 32-bit hash +func fnv32a(s string) uint32 { + var h uint32 = 2166136261 + for i := range s { + h ^= uint32(s[i]) + h *= 16777619 + } + return h +} diff --git a/grids/graphdb.go b/grids/graphdb.go index c2e9b3339..14b7a637f 100644 --- a/grids/graphdb.go +++ b/grids/graphdb.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "path/filepath" + "sync" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" @@ -18,7 +19,7 @@ type GDB struct { // NewKVGraphDB intitalize a new grids graph driver func NewGraphDB(baseDir string) (gdbi.GraphDB, error) { - log.Warning("GRIP driver is development. Do not use") + log.Redf("Disclaimer: the Grids driver is an experimental database driver. Use with caution.") _, err := os.Stat(baseDir) if os.IsNotExist(err) { os.Mkdir(baseDir, 0700) @@ -32,16 +33,25 @@ func (kgraph *GDB) Graph(graph string) (gdbi.GraphInterface, error) { if err != nil { return nil, err } - if g, ok := kgraph.drivers[graph]; ok { + mu := sync.Mutex{} + mu.Lock() + g, ok := kgraph.drivers[graph] + mu.Unlock() + if ok { return g, nil } + dbPath := filepath.Join(kgraph.basePath, graph) if _, err := os.Stat(dbPath); err == nil { - g, err := newGraph(kgraph.basePath, graph) + // This also fetches an existing graph if it doesn't exist in kgraph.drivers + g, err := getGraph(kgraph.basePath, graph) if err != nil { return nil, err } + mu.Lock() kgraph.drivers[graph] = g + mu.Unlock() + return g, nil } return nil, fmt.Errorf("graph '%s' was not found", graph) @@ -50,13 +60,19 @@ func (kgraph *GDB) Graph(graph string) (gdbi.GraphInterface, error) { // ListGraphs lists the graphs managed by this driver func (gdb *GDB) ListGraphs() []string { out := []string{} - for k := range gdb.drivers { - out = append(out, k) - } if ds, err := filepath.Glob(filepath.Join(gdb.basePath, "*")); err == nil { for _, d := range ds { - b := filepath.Base(d) - out = append(out, b) + fi, err := os.Stat(d) + if err != nil { + continue + } + if fi.IsDir() { + versionPath := filepath.Join(d, "VERSION") + if _, err := os.Stat(versionPath); err == nil { + b := filepath.Base(d) + out = append(out, b) + } + } } } return out diff --git a/grids/index.go b/grids/index.go index bb59724a0..11d928119 100644 --- a/grids/index.go +++ b/grids/index.go @@ -3,112 +3,88 @@ package grids import ( "context" "fmt" - "strings" - "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" + "github.com/cockroachdb/pebble" + multierror "github.com/hashicorp/go-multierror" ) -func (kgraph *Graph) setupGraphIndex(graph string) error { - err := kgraph.idx.AddField(fmt.Sprintf("%s.v.label", graph)) - if err != nil { - return fmt.Errorf("failed to setup index on vertex label") - } - err = kgraph.idx.AddField(fmt.Sprintf("%s.e.label", graph)) - if err != nil { - return fmt.Errorf("failed to setup index on edge label") - } - return nil -} - -func (kgraph *Graph) deleteGraphIndex(graph string) error { - var anyError error - fields := kgraph.idx.ListFields() - for _, f := range fields { - t := strings.Split(f, ".") - if t[0] == graph { - if err := kgraph.idx.RemoveField(f); err != nil { - anyError = err - } - } - } - return anyError -} - -func normalizePath(path string) string { - path = jsonpath.GetJSONPath(path) - path = strings.TrimPrefix(path, "$.") - path = strings.TrimPrefix(path, "data.") - return path -} - -func vertexIdxStruct(v *gdbi.Vertex) map[string]interface{} { - k := map[string]interface{}{ - "v": map[string]interface{}{ - "label": v.Label, - v.Label: v.Data, - }, - } - return k -} - -func edgeIdxStruct(e *gdbi.Edge) map[string]interface{} { - k := map[string]interface{}{ - "e": map[string]interface{}{ - "label": e.Label, - e.Label: e.Data, - }, - } - return k -} - -//AddVertexIndex add index to vertices -func (ggraph *Graph) AddVertexIndex(label string, field string) error { +// AddVertexIndex add index to vertices +func (ggraph *Graph) AddVertexIndex(label, field string) error { log.WithFields(log.Fields{"label": label, "field": field}).Info("Adding vertex index") - field = normalizePath(field) - //TODO kick off background process to reindex existing data - return ggraph.idx.AddField(fmt.Sprintf("%s.v.%s.%s", ggraph.graphID, label, field)) + return ggraph.jsonkv.AddField(VTABLE_PREFIX+label, field) } -//DeleteVertexIndex delete index from vertices -func (ggraph *Graph) DeleteVertexIndex(label string, field string) error { +// DeleteVertexIndex delete index from vertices +func (ggraph *Graph) DeleteVertexIndex(label, field string) error { + fmt.Println("HELLO WE HARE HERE") log.WithFields(log.Fields{"label": label, "field": field}).Info("Deleting vertex index") - field = normalizePath(field) - return ggraph.idx.RemoveField(fmt.Sprintf("%s.v.%s.%s", ggraph.graphID, label, field)) + return ggraph.jsonkv.RemoveField(VTABLE_PREFIX+label, field) } -//GetVertexIndexList lists out all the vertex indices for a graph +// GetVertexIndexList lists out all the vertex indices for a graph func (ggraph *Graph) GetVertexIndexList() <-chan *gripql.IndexID { log.Debug("Running GetVertexIndexList") out := make(chan *gripql.IndexID) go func() { defer close(out) - fields := ggraph.idx.ListFields() - for _, f := range fields { - t := strings.Split(f, ".") - if len(t) > 3 { - out <- &gripql.IndexID{Graph: ggraph.graphID, Label: t[2], Field: t[3]} - } + for _, f := range ggraph.jsonkv.ListFields() { + out <- &gripql.IndexID{Graph: ggraph.graphID, Label: f.Label, Field: f.Field} } }() return out } -//VertexLabelScan produces a channel of all vertex ids in a graph -//that match a given label +// VertexLabelScan produces a channel of all vertex ids in a graph +// that match a given label func (ggraph *Graph) VertexLabelScan(ctx context.Context, label string) chan string { - log.WithFields(log.Fields{"label": label}).Debug("Running VertexLabelScan") - //TODO: Make this work better - out := make(chan string, 100) - go func() { - defer close(out) - //log.Printf("Searching %s %s", fmt.Sprintf("%s.label", ggraph.graph), label) - for i := range ggraph.idx.GetTermMatch(ctx, fmt.Sprintf("%s.v.label", ggraph.graphID), label, 0) { - //log.Printf("Found: %s", i) - out <- i + if label[:2] != VTABLE_PREFIX { + label = VTABLE_PREFIX + label + } + log.WithFields(log.Fields{"label": label}).Info("Running VertexLabelScan") + return ggraph.jsonkv.GetIDsForLabel(label) +} + +func (ggraph *Graph) DeleteAnyRow(id string, label string, edgeFlag bool) error { + var prefix string = "v_" + if edgeFlag { + prefix = "e_" + } + + loc, err := ggraph.jsonkv.PageCache.Get(context.Background(), id, ggraph.jsonkv.PageLoader) + if err != nil { + return err + } + + tableLabel := prefix + label + var bulkErr *multierror.Error + if fields, exists := ggraph.jsonkv.Fields[tableLabel]; exists { + for field := range fields { + if err := ggraph.jsonkv.DeleteRowField(tableLabel, field, id); err != nil { + log.Errorf("Failed to delete index for field '%s' in table '%s' for row '%s': %v", field, tableLabel, id, err) + bulkErr = multierror.Append(bulkErr, err) + } } - }() - return out + } + + ggraph.jsonkv.PebbleLock.Lock() + defer ggraph.jsonkv.PebbleLock.Unlock() + + table, ok := ggraph.jsonkv.Tables[prefix+label] + if !ok { + bulkErr = multierror.Append(bulkErr, fmt.Errorf("table %s not found in jsonkv.Tables: %#v", prefix+label, ggraph.jsonkv.Tables)) + return bulkErr.ErrorOrNil() + } + + err = table.DeleteRow(loc, []byte(id)) + if err != nil { + if err == pebble.ErrNotFound { + log.Debugf("Pebble not Found: %s", err) + return nil + } + bulkErr = multierror.Append(bulkErr, err) + } + ggraph.jsonkv.PageCache.Invalidate(id) + return bulkErr.ErrorOrNil() } diff --git a/grids/keyindex.go b/grids/keyindex.go new file mode 100644 index 000000000..2eae94c06 --- /dev/null +++ b/grids/keyindex.go @@ -0,0 +1,137 @@ +package grids + +import ( + "bytes" +) + +var vertexPrefix = []byte(".") +var edgePrefix = []byte("-") +var srcEdgePrefix = []byte("<") +var dstEdgePrefix = []byte(">") + +var intSize = 10 + +// VertexKey generates the key given a vertexId +func VertexKey(id string) []byte { + return bytes.Join([][]byte{ + vertexPrefix, + []byte(id), + }, []byte{0}) +} + +func VertexKeyParse(key []byte) (id string) { + tmp := bytes.Split(key, []byte{0}) + return string(tmp[1]) +} + +// EdgeKeyPrefix returns the byte array prefix for a particular edge id +func EdgeKeyPrefix(id string) []byte { + return bytes.Join([][]byte{ + edgePrefix, + []byte(id), + {}, + }, []byte{0}) +} + +// SrcEdgePrefix returns a byte array prefix for all entries in the source +// edge index a particular vertex (the source vertex) +func SrcEdgePrefix(id string) []byte { + return bytes.Join([][]byte{ + srcEdgePrefix, + []byte(id), + {}, + }, []byte{0}) +} + +// DstEdgePrefix returns a byte array prefix for all entries in the dest +// edge index a particular vertex (the dest vertex) +func DstEdgePrefix(id string) []byte { + return bytes.Join([][]byte{ + dstEdgePrefix, + []byte(id), + {}, + }, []byte{0}) +} + +// EdgeKey takes the required components of an edge key and returns the byte array +func EdgeKey(id, src, dst, label string) []byte { + return bytes.Join([][]byte{ + edgePrefix, + []byte(id), + []byte(label), + []byte(src), + []byte(dst), + }, []byte{0}) +} + +func EdgeKeyParse(key []byte) (eid string, sid string, did string, label string) { + tmp := bytes.Split(key, []byte{0}) + return string(tmp[1]), string(tmp[3]), string(tmp[4]), string(tmp[2]) +} + +// SrcEdgeKey creates a src edge index key +func SrcEdgeKey(eid, src, dst, label string) []byte { + return bytes.Join([][]byte{ + srcEdgePrefix, + []byte(src), + []byte(dst), + []byte(eid), + []byte(label), + }, []byte{0}) +} + +func SrcEdgeKeyParse(key []byte) (eid string, sid string, did string, label string) { + tmp := bytes.Split(key, []byte{0}) + return string(tmp[3]), string(tmp[1]), string(tmp[2]), string(tmp[4]) +} + +// DstEdgeKey creates a dest edge index key +func DstEdgeKey(eid, src, dst, label string) []byte { + return bytes.Join([][]byte{ + dstEdgePrefix, + []byte(dst), + []byte(src), + []byte(eid), + []byte(label), + }, []byte{0}) +} + +func DstEdgeKeyParse(key []byte) (eid string, sid string, did string, label string) { + tmp := bytes.Split(key, []byte{0}) + return string(tmp[3]), string(tmp[2]), string(tmp[1]), string(tmp[4]) +} + + +// VertexListPrefix returns a byte array prefix for all vertices in a graph +func VertexListPrefix() []byte { + return bytes.Join([][]byte{ + vertexPrefix, + {}, + }, []byte{0}) +} + +// EdgeListPrefix returns a byte array prefix for all edges in a graph +func EdgeListPrefix() []byte { + return bytes.Join([][]byte{ + edgePrefix, + {}, + }, []byte{0}) +} + +// SrcEdgeListPrefix returns a byte array prefix for all entries in the source +// edge index for a graph +func SrcEdgeListPrefix() []byte { + return bytes.Join([][]byte{ + srcEdgePrefix, + {}, + }, []byte{0}) +} + +// DstEdgeListPrefix returns a byte array prefix for all entries in the dest +// edge index for a graph +func DstEdgeListPrefix() []byte { + return bytes.Join([][]byte{ + dstEdgePrefix, + {}, + }, []byte{0}) +} diff --git a/grids/keymap.go b/grids/keymap.go deleted file mode 100644 index 70eaa5357..000000000 --- a/grids/keymap.go +++ /dev/null @@ -1,284 +0,0 @@ -package grids - -import ( - "bytes" - "encoding/binary" - "fmt" - "sync" - - "github.com/akrylysov/pogreb" - "github.com/bmeg/grip/log" -) - -type KeyMap struct { - db *pogreb.DB - - vIncCur uint64 - eIncCur uint64 - lIncCur uint64 - - vIncMut sync.Mutex - eIncMut sync.Mutex - lIncMut sync.Mutex -} - -var incMod uint64 = 1000 - -var vIDPrefix = []byte{'v'} -var eIDPrefix = []byte{'e'} -var lIDPrefix = []byte{'l'} - -var vKeyPrefix byte = 'V' -var eKeyPrefix byte = 'E' -var lKeyPrefix byte = 'L' - -var vLabelPrefix byte = 'x' -var eLabelPrefix byte = 'y' - -var vInc = []byte{'i', 'v'} -var eInc = []byte{'i', 'e'} -var lInc = []byte{'i', 'l'} - -func NewKeyMap(kv *pogreb.DB) *KeyMap { - return &KeyMap{db: kv} -} - -func (km *KeyMap) Close() { - km.db.Close() -} - -//GetsertVertexKey : Get or Insert Vertex Key -func (km *KeyMap) GetsertVertexKey(id, label string) (uint64, uint64) { - o, ok := getIDKey(vIDPrefix, id, km.db) - if !ok { - km.vIncMut.Lock() - var err error - o, err = dbInc(&km.vIncCur, vInc, km.db) - if err != nil { - log.Errorf("%s", err) - } - km.vIncMut.Unlock() - err = setKeyID(vKeyPrefix, id, o, km.db) - if err != nil { - log.Errorf("%s", err) - } - err = setIDKey(vIDPrefix, id, o, km.db) - if err != nil { - log.Errorf("%s", err) - } - } - lkey := km.GetsertLabelKey(label) - setIDLabel(vLabelPrefix, o, lkey, km.db) - return o, lkey -} - -func (km *KeyMap) GetVertexKey(id string) (uint64, bool) { - return getIDKey(vIDPrefix, id, km.db) -} - -//GetVertexID -func (km *KeyMap) GetVertexID(key uint64) (string, bool) { - return getKeyID(vKeyPrefix, key, km.db) -} - -func (km *KeyMap) GetVertexLabel(key uint64) uint64 { - k, _ := getIDLabel(vLabelPrefix, key, km.db) - return k -} - -//GetsertEdgeKey gets or inserts a new uint64 id for a given edge GID string -func (km *KeyMap) GetsertEdgeKey(id, label string) (uint64, uint64) { - o, ok := getIDKey(eIDPrefix, id, km.db) - if !ok { - km.eIncMut.Lock() - o, _ = dbInc(&km.eIncCur, eInc, km.db) - km.eIncMut.Unlock() - if err := setKeyID(eKeyPrefix, id, o, km.db); err != nil { - log.Errorf("%s", err) - } - if err := setIDKey(eIDPrefix, id, o, km.db); err != nil { - log.Errorf("%s", err) - } - } - lkey := km.GetsertLabelKey(label) - if err := setIDLabel(eLabelPrefix, o, lkey, km.db); err != nil { - log.Errorf("%s", err) - } - return o, lkey -} - -//GetEdgeKey gets the uint64 key for a given GID string -func (km *KeyMap) GetEdgeKey(id string) (uint64, bool) { - return getIDKey(eIDPrefix, id, km.db) -} - -//GetEdgeID gets the GID string for a given edge id uint64 -func (km *KeyMap) GetEdgeID(key uint64) (string, bool) { - return getKeyID(eKeyPrefix, key, km.db) -} - -func (km *KeyMap) GetEdgeLabel(key uint64) uint64 { - k, _ := getIDLabel(eLabelPrefix, key, km.db) - return k -} - -//DelVertexKey -func (km *KeyMap) DelVertexKey(id string) error { - key, ok := km.GetVertexKey(id) - if !ok { - return fmt.Errorf("%s vertexKey not found", id) - } - if err := delKeyID(vKeyPrefix, key, km.db); err != nil { - return err - } - if err := delIDKey(vIDPrefix, id, km.db); err != nil { - return err - } - return nil -} - -//DelEdgeKey -func (km *KeyMap) DelEdgeKey(id string) error { - key, ok := km.GetEdgeKey(id) - if !ok { - return fmt.Errorf("%s edgeKey not found", id) - } - if err := delKeyID(eKeyPrefix, key, km.db); err != nil { - return err - } - if err := delIDKey(eIDPrefix, id, km.db); err != nil { - return err - } - return nil -} - -//GetsertLabelKey gets-or-inserts a new label key uint64 for a given string -func (km *KeyMap) GetsertLabelKey(id string) uint64 { - u, ok := getIDKey(lIDPrefix, id, km.db) - if ok { - return u - } - km.lIncMut.Lock() - o, _ := dbInc(&km.lIncCur, lInc, km.db) - km.lIncMut.Unlock() - if err := setKeyID(lKeyPrefix, id, o, km.db); err != nil { - log.Errorf("%s", err) - } - if err := setIDKey(lIDPrefix, id, o, km.db); err != nil { - log.Errorf("%s", err) - } - return o -} - -func (km *KeyMap) GetLabelKey(id string) (uint64, bool) { - return getIDKey(lIDPrefix, id, km.db) -} - -//GetLabelID gets the GID for a given uint64 label key -func (km *KeyMap) GetLabelID(key uint64) (string, bool) { - return getKeyID(lKeyPrefix, key, km.db) -} - -func getIDKey(prefix []byte, id string, db *pogreb.DB) (uint64, bool) { - k := bytes.Join([][]byte{prefix, []byte(id)}, []byte{}) - v, err := db.Get(k) - if v == nil || err != nil { - return 0, false - } - key, _ := binary.Uvarint(v) - return key, true -} - -func setIDKey(prefix []byte, id string, key uint64, db *pogreb.DB) error { - k := bytes.Join([][]byte{prefix, []byte(id)}, []byte{}) - b := make([]byte, binary.MaxVarintLen64) - binary.PutUvarint(b, key) - return db.Put(k, b) -} - -func delIDKey(prefix []byte, id string, db *pogreb.DB) error { - k := bytes.Join([][]byte{prefix, []byte(id)}, []byte{}) - return db.Delete(k) -} - -func getIDLabel(prefix byte, key uint64, db *pogreb.DB) (uint64, bool) { - k := make([]byte, 1+binary.MaxVarintLen64) - k[0] = prefix - binary.PutUvarint(k[1:binary.MaxVarintLen64+1], key) - v, err := db.Get(k) - if v == nil || err != nil { - return 0, false - } - label, _ := binary.Uvarint(v) - return label, true -} - -func setIDLabel(prefix byte, key uint64, label uint64, db *pogreb.DB) error { - k := make([]byte, binary.MaxVarintLen64+1) - k[0] = prefix - binary.PutUvarint(k[1:binary.MaxVarintLen64+1], key) - - b := make([]byte, binary.MaxVarintLen64) - binary.PutUvarint(b, label) - - err := db.Put(k, b) - return err -} - -func setKeyID(prefix byte, id string, key uint64, db *pogreb.DB) error { - k := make([]byte, binary.MaxVarintLen64+1) - k[0] = prefix - binary.PutUvarint(k[1:binary.MaxVarintLen64+1], key) - return db.Put(k, []byte(id)) -} - -func getKeyID(prefix byte, key uint64, db *pogreb.DB) (string, bool) { - k := make([]byte, binary.MaxVarintLen64+1) - k[0] = prefix - binary.PutUvarint(k[1:binary.MaxVarintLen64+1], key) - b, err := db.Get(k) - if b == nil || err != nil { - return "", false - } - return string(b), true -} - -func delKeyID(prefix byte, key uint64, db *pogreb.DB) error { - k := make([]byte, binary.MaxVarintLen64+1) - k[0] = prefix - binary.PutUvarint(k[1:binary.MaxVarintLen64+1], key) - return db.Delete(k) -} - -func dbInc(inc *uint64, k []byte, db *pogreb.DB) (uint64, error) { - b := make([]byte, binary.MaxVarintLen64) - if *inc == 0 { - v, _ := db.Get(k) - if v == nil { - binary.PutUvarint(b, incMod) - if err := db.Put(k, b); err != nil { - return 0, err - } - (*inc) += 2 - return 1, nil - } - newInc, _ := binary.Uvarint(v) - *inc = newInc - binary.PutUvarint(b, (*inc)+incMod) - if err := db.Put(k, b); err != nil { - return 0, err - } - o := (*inc) - (*inc)++ - return o, nil - } - o := *inc - (*inc)++ - if *inc%incMod == 0 { - binary.PutUvarint(b, *inc+incMod) - if err := db.Put(k, b); err != nil { - return 0, err - } - } - return o, nil -} diff --git a/grids/keys.go b/grids/keys.go deleted file mode 100644 index f0724cc1d..000000000 --- a/grids/keys.go +++ /dev/null @@ -1,166 +0,0 @@ -package grids - -import ( - "encoding/binary" -) - -var vertexPrefix = []byte("v") -var edgePrefix = []byte("e") -var srcEdgePrefix = []byte("s") -var dstEdgePrefix = []byte("d") - -var intSize = 10 - -// VertexKey generates the key given a vertexId -func VertexKey(id uint64) []byte { - out := make([]byte, intSize+1) - out[0] = vertexPrefix[0] - binary.PutUvarint(out[1:intSize+1], id) - return out -} - -// VertexKeyParse takes a byte array key and returns: -// `graphId`, `vertexId` -func VertexKeyParse(key []byte) uint64 { - id, _ := binary.Uvarint(key[1 : intSize+1]) - return id -} - -// EdgeKey takes the required components of an edge key and returns the byte array -func EdgeKey(id, src, dst, label uint64) []byte { - out := make([]byte, 1+intSize*4) - out[0] = edgePrefix[0] - binary.PutUvarint(out[1:intSize+1], id) - binary.PutUvarint(out[intSize+1:intSize*2+1], src) - binary.PutUvarint(out[intSize*2+1:intSize*3+1], dst) - binary.PutUvarint(out[intSize*3+1:intSize*4+1], label) - return out -} - -// EdgeKeyPrefix returns the byte array prefix for a particular edge id -func EdgeKeyPrefix(id uint64) []byte { - out := make([]byte, 1+intSize) - out[0] = edgePrefix[0] - binary.PutUvarint(out[1:intSize+1], id) - return out -} - -// EdgeKeyParse takes a edge key and returns the elements encoded in it: -// `graph`, `edgeID`, `srcVertexId`, `dstVertexId`, `label` -func EdgeKeyParse(key []byte) (uint64, uint64, uint64, uint64) { - eid, _ := binary.Uvarint(key[1 : intSize+1]) - sid, _ := binary.Uvarint(key[intSize+1 : intSize*2+1]) - did, _ := binary.Uvarint(key[intSize*2+1 : intSize*3+1]) - label, _ := binary.Uvarint(key[intSize*3+1 : intSize*4+1]) - return eid, sid, did, label -} - -// VertexListPrefix returns a byte array prefix for all vertices in a graph -func VertexListPrefix() []byte { - out := make([]byte, 1) - out[0] = vertexPrefix[0] - return out -} - -// EdgeListPrefix returns a byte array prefix for all edges in a graph -func EdgeListPrefix() []byte { - out := make([]byte, 1) - out[0] = edgePrefix[0] - return out -} - -// SrcEdgeListPrefix returns a byte array prefix for all entries in the source -// edge index for a graph -func SrcEdgeListPrefix() []byte { - out := make([]byte, 1) - out[0] = srcEdgePrefix[0] - return out -} - -// DstEdgeListPrefix returns a byte array prefix for all entries in the dest -// edge index for a graph -func DstEdgeListPrefix() []byte { - out := make([]byte, 1) - out[0] = dstEdgePrefix[0] - return out -} - -// SrcEdgeKey creates a src edge index key -func SrcEdgeKey(eid, src, dst, label uint64) []byte { - out := make([]byte, 1+intSize*4) - out[0] = srcEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], src) - binary.PutUvarint(out[intSize+1:intSize*2+1], dst) - binary.PutUvarint(out[intSize*2+1:intSize*3+1], eid) - binary.PutUvarint(out[intSize*3+1:intSize*4+1], label) - return out -} - -// DstEdgeKey creates a dest edge index key -func DstEdgeKey(eid, src, dst, label uint64) []byte { - out := make([]byte, 1+intSize*4) - out[0] = dstEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], dst) - binary.PutUvarint(out[intSize+1:intSize*2+1], src) - binary.PutUvarint(out[intSize*2+1:intSize*3+1], eid) - binary.PutUvarint(out[intSize*3+1:intSize*4+1], label) - return out -} - -// SrcEdgeKeyParse takes a src index key entry and parses it into: -// `graph`, `edgeId`, `srcVertexId`, `dstVertexId`, `label`, `etype` -func SrcEdgeKeyParse(key []byte) (uint64, uint64, uint64, uint64) { - sid, _ := binary.Uvarint(key[1 : intSize+1]) - did, _ := binary.Uvarint(key[intSize+1 : intSize*2+1]) - eid, _ := binary.Uvarint(key[intSize*2+1 : intSize*3+1]) - label, _ := binary.Uvarint(key[intSize*3+1 : intSize*4+1]) - return eid, sid, did, label -} - -// DstEdgeKeyParse takes a dest index key entry and parses it into: -// `graph`, `edgeId`, `dstVertexId`, `srcVertexId`, `label`, `etype` -func DstEdgeKeyParse(key []byte) (uint64, uint64, uint64, uint64) { - did, _ := binary.Uvarint(key[1 : intSize+1]) - sid, _ := binary.Uvarint(key[intSize+1 : intSize*2+1]) - eid, _ := binary.Uvarint(key[intSize*2+1 : intSize*3+1]) - label, _ := binary.Uvarint(key[intSize*3+1 : intSize*4+1]) - return eid, sid, did, label -} - -// SrcEdgeKeyPrefix creates a byte array prefix for a src edge index entry -func SrcEdgeKeyPrefix(eid, src, dst uint64) []byte { - out := make([]byte, 1+intSize*3) - out[0] = srcEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], src) - binary.PutUvarint(out[intSize+1:intSize*2+1], dst) - binary.PutUvarint(out[intSize*2+1:intSize*3+1], eid) - return out -} - -// DstEdgeKeyPrefix creates a byte array prefix for a dest edge index entry -func DstEdgeKeyPrefix(src, dst, eid uint64) []byte { - out := make([]byte, 1+intSize*3) - out[0] = dstEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], dst) - binary.PutUvarint(out[intSize+1:intSize*2+1], src) - binary.PutUvarint(out[intSize*2+1:intSize*3+1], eid) - return out -} - -// SrcEdgePrefix returns a byte array prefix for all entries in the source -// edge index a particular vertex (the source vertex) -func SrcEdgePrefix(id uint64) []byte { - out := make([]byte, 1+intSize) - out[0] = srcEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], id) - return out -} - -// DstEdgePrefix returns a byte array prefix for all entries in the dest -// edge index a particular vertex (the dest vertex) -func DstEdgePrefix(id uint64) []byte { - out := make([]byte, 1+intSize) - out[0] = dstEdgePrefix[0] - binary.PutUvarint(out[1:intSize+1], id) - return out -} diff --git a/grids/new.go b/grids/new.go index 50e069064..ccc8da7ae 100644 --- a/grids/new.go +++ b/grids/new.go @@ -1,37 +1,31 @@ package grids import ( + "bufio" "fmt" "os" "path/filepath" + "strings" + "sync" - "github.com/akrylysov/pogreb" + "github.com/bmeg/benchtop/jsontable" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/kvi" - "github.com/bmeg/grip/kvi/pebbledb" - "github.com/bmeg/grip/kvindex" - "github.com/bmeg/grip/log" "github.com/bmeg/grip/timestamp" ) // Graph implements the GDB interface using a genertic key/value storage driver type Graph struct { - graphID string - graphKey uint64 - - keyMap *KeyMap - keykv pogreb.DB - graphkv kvi.KVInterface - indexkv kvi.KVInterface - idx *kvindex.KVIndex - ts *timestamp.Timestamp + graphID string + + jsonkv *jsontable.JSONDriver + ts *timestamp.Timestamp + tempDeletedEdges map[string]struct{} + edgesMutex sync.Mutex } // Close the connection func (g *Graph) Close() error { - g.keyMap.Close() - g.graphkv.Close() - g.indexkv.Close() + g.jsonkv.Close() return nil } @@ -51,35 +45,87 @@ func (kgraph *GDB) AddGraph(graph string) error { func newGraph(baseDir, name string) (*Graph, error) { dbPath := filepath.Join(baseDir, name) + fmt.Printf("Creating new GRIDS graph %s\n", name) - log.Infof("Creating new GRIDS graph %s", name) + // Create directory if it doesn't exist + if _, err := os.Stat(dbPath); os.IsNotExist(err) { + if err := os.Mkdir(dbPath, 0700); err != nil { + return nil, fmt.Errorf("failed to create directory %s: %v", dbPath, err) + } + } - _, err := os.Stat(dbPath) - if os.IsNotExist(err) { - os.Mkdir(dbPath, 0700) + // Create VERSION file + versionPath := filepath.Join(dbPath, "VERSION") + if err := os.WriteFile(versionPath, []byte("0.0.1"), 0644); err != nil { + return nil, fmt.Errorf("failed to create VERSION file: %v", err) } - keykvPath := fmt.Sprintf("%s/keymap", dbPath) - graphkvPath := fmt.Sprintf("%s/graph", dbPath) - indexkvPath := fmt.Sprintf("%s/index", dbPath) - keykv, err := pogreb.Open(keykvPath, nil) + + //bsonkvPath := fmt.Sprintf("%s", dbPath) + jsonkvPath := dbPath + tabledr, err := jsontable.NewJSONDriver(jsonkvPath) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to open jsonkv at %s: %v", jsonkvPath, err) } - graphkv, err := pebbledb.NewKVInterface(graphkvPath, kvi.Options{}) + jsonkv := tabledr.(*jsontable.JSONDriver) + + ts := timestamp.NewTimestamp() + + o := &Graph{ + jsonkv: jsonkv, + ts: &ts, + graphID: name, + tempDeletedEdges: make(map[string]struct{}), + edgesMutex: sync.Mutex{}, + } + return o, nil +} + +func getGraph(baseDir, name string) (*Graph, error) { + dbPath := filepath.Join(baseDir, name) + fmt.Printf("fetching GRIDS graph %s\n", name) + + versionPath := filepath.Join(dbPath, "VERSION") + file, err := os.Open(versionPath) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to open VERSION file at %s: %v", versionPath, err) + } + defer file.Close() + + scanner := bufio.NewScanner(file) + if scanner.Scan() { + version := scanner.Text() + if strings.TrimSpace(version) != "0.0.1" { + return nil, fmt.Errorf("VERSION file at %s does not have '0.0.1' on the first line", versionPath) + } + } else { + return nil, fmt.Errorf("VERSION file at %s is empty", versionPath) + } + + if err := scanner.Err(); err != nil { + return nil, fmt.Errorf("error reading VERSION file at %s: %v", versionPath, err) } - indexkv, err := pebbledb.NewKVInterface(indexkvPath, kvi.Options{}) + + //bsonkvPath := fmt.Sprintf("%s", dbPath) + jsonkvPath := dbPath + tabledr, err := jsontable.LoadJSONDriver(jsonkvPath) if err != nil { - return nil, err + return nil, fmt.Errorf("failed to open bsonkv at %s: %v", jsonkvPath, err) } - ts := timestamp.NewTimestamp() - o := &Graph{keyMap: NewKeyMap(keykv), graphkv: graphkv, indexkv: indexkv, ts: &ts, idx: kvindex.NewIndex(indexkv)} + jsonkv := tabledr.(*jsontable.JSONDriver) + + ts := timestamp.NewTimestamp() + o := &Graph{ + jsonkv: jsonkv, + ts: &ts, + graphID: name, + } return o, nil } -// DeleteGraph deletes `graph` +/* +Since each graph has its own directory, delete the directory to delete the graph +*/ func (kgraph *GDB) DeleteGraph(graph string) error { err := gripql.ValidateGraphName(graph) if err != nil { diff --git a/grids/optimizer.go b/grids/optimizer.go new file mode 100644 index 000000000..16912398f --- /dev/null +++ b/grids/optimizer.go @@ -0,0 +1,127 @@ +package grids + +import ( + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/util/protoutil" +) + +type OptimizationRule struct { + Match func(pipe []*gripql.GraphStatement) bool + Replace func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement +} + +func GridsOptimizer(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + // Preprocess to handle Has with And expressions + //pipe = expandHasAnd(pipe) + // Apply the first matching optimization rule + for _, rule := range startOptimizations { + if rule.Match(pipe) { + return rule.Replace(pipe) + } + } + // Return the original pipeline if no optimizations apply + return pipe +} + +var startOptimizations = []OptimizationRule{ + { + Match: func(pipe []*gripql.GraphStatement) bool { + if len(pipe) < 2 { + return false + } + if _, ok := pipe[0].GetStatement().(*gripql.GraphStatement_V); !ok { + return false + } + if _, ok := pipe[1].GetStatement().(*gripql.GraphStatement_Has); ok { + return true + } + return false + }, + Replace: func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + has := pipe[1].GetHas() + var optimized = []*gripql.GraphStatement{ + { + Statement: &gripql.GraphStatement_EngineCustom{ + Desc: "Grids V.Has() indexing", + Custom: lookupVertsCondIndexStep{ + expr: has, + }, + }, + }, + } + return append(optimized, pipe[2:]...) + }, + }, + { + Match: func(pipe []*gripql.GraphStatement) bool { + if len(pipe) < 3 { + return false + } + if _, ok := pipe[0].GetStatement().(*gripql.GraphStatement_V); !ok { + return false + } + if _, ok := pipe[1].GetStatement().(*gripql.GraphStatement_HasLabel); !ok { + return false + } + if _, ok := pipe[2].GetStatement().(*gripql.GraphStatement_Has); ok { + return true + } + return false + }, + Replace: func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + has := pipe[2].GetHas() + labels := protoutil.AsStringList(pipe[1].GetHasLabel()) + for i, label := range labels { + if label[:2] != VTABLE_PREFIX { + labels[i] = VTABLE_PREFIX + label + } + } + var optimized = []*gripql.GraphStatement{ + { + Statement: &gripql.GraphStatement_EngineCustom{ + Desc: "Grids V().HasLabel().Has() indexing", + Custom: lookupVertsHasLabelCondIndexStep{ + expr: has, + labels: labels, + }, + }, + }, + } + return append(optimized, pipe[3:]...) + }, + }, + { + Match: func(pipe []*gripql.GraphStatement) bool { + if len(pipe) < 2 { + return false + } + if _, ok := pipe[0].GetStatement().(*gripql.GraphStatement_V); !ok { + return false + } + if _, ok := pipe[1].GetStatement().(*gripql.GraphStatement_HasLabel); ok { + return true + } + return false + }, + Replace: func(pipe []*gripql.GraphStatement) []*gripql.GraphStatement { + labels := protoutil.AsStringList(pipe[1].GetHasLabel()) + for i, label := range labels { + if label[:2] != VTABLE_PREFIX { + labels[i] = VTABLE_PREFIX + label + } + } + var optimized = []*gripql.GraphStatement{ + { + Statement: &gripql.GraphStatement_EngineCustom{ + Desc: "Grids V().HasLabel()", + Custom: lookupVertsHasLabelCondIndexStep{ + expr: nil, + labels: labels, + }, + }, + }, + } + return append(optimized, pipe[2:]...) + }, + }, +} diff --git a/grids/processor.go b/grids/processor.go new file mode 100644 index 000000000..5baa8cf79 --- /dev/null +++ b/grids/processor.go @@ -0,0 +1,214 @@ +package grids + +import ( + "context" + + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" +) + +// ////////////////////////////////////////////////////////////////////////////// +// LookupVertexHasLabelCondIndex look up vertices has label + +type lookupVertsHasLabelCondIndexStep struct { + labels []string + expr *gripql.HasExpression + loadData bool +} + +func (t lookupVertsHasLabelCondIndexStep) GetProcessor(db gdbi.GraphInterface, ps gdbi.PipelineState) (gdbi.Processor, error) { + graph := db.(*Graph) + return &lookupVertsHasLabelCondIndexProc{ + db: graph, + expr: t.expr, + labels: t.labels, + loadData: ps.StepLoadData(), + }, nil + +} + +func (t lookupVertsHasLabelCondIndexStep) GetType() gdbi.DataType { + return gdbi.VertexData +} + +type lookupVertsHasLabelCondIndexProc struct { + db *Graph + labels []string + expr *gripql.HasExpression + loadData bool +} + +func (l *lookupVertsHasLabelCondIndexProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + log.Debugln("Entering lookupVertsHasLabelCondIndexProc custom processor", l.loadData) + var exists = true + // Here if one of l.labels doesn't exist then not going to be querying all the data so leave it like this. + cond := l.expr.GetCondition() + exists = len(l.db.jsonkv.Fields) > 0 && cond != nil + if exists { + for _, iterLabel := range l.labels { + label, ok := l.db.jsonkv.Fields[iterLabel] + if !ok { + exists = false + break + } + _, exists = label[cond.Key] + if !exists { + break + } + } + } + + count := 0 + if !exists || (l.expr == nil && cond == nil) { + go func() { + defer close(out) + for t := range in { + for _, label := range l.labels { + tableFound, ok := l.db.jsonkv.Tables[label] + if !ok { + log.Debugf("BSONTable for label '%s' is nil. Cannot scan.", label) + continue + } + for roMaps := range tableFound.Scan(l.loadData, &GripQLFilter{Expression: l.expr}) { + v := gdbi.Vertex{ + Label: label[2:], + Loaded: l.loadData, + } + if l.loadData { + v.ID = roMaps.(map[string]any)["_id"].(string) + delete(roMaps.(map[string]any), "_id") + v.Data = roMaps.(map[string]any) + } else { + v.ID = roMaps.(string) + v.Data = map[string]any{} + } + count += 1 + out <- t.AddCurrent(v.Copy()) + } + } + } + }() + } else { + queryChan := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(queryChan) + for t := range in { + cond := l.expr.GetCondition() + for _, label := range l.labels { + for id := range l.db.jsonkv.RowIdsByLabelFieldValue(label, cond.Key, cond.Value.AsInterface(), cond.Condition) { + queryChan <- gdbi.ElementLookup{ID: id, Ref: t} + } + } + } + }() + go func() { + defer close(out) + for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { + i := v.Ref + out <- i.AddCurrent(v.Vertex.Copy()) + } + }() + } + + return ctx +} + +// ////////////////////////////////////////////////////////////////////////////// +// LookupVertsCondIndex look up vertices by indexed +type lookupVertsCondIndexStep struct { + expr *gripql.HasExpression +} + +func (t lookupVertsCondIndexStep) GetProcessor(db gdbi.GraphInterface, ps gdbi.PipelineState) (gdbi.Processor, error) { + graph := db.(*Graph) + return &lookupVertsCondIndexProc{ + db: graph, + expr: t.expr, + loadData: ps.StepLoadData()}, nil +} + +func (t lookupVertsCondIndexStep) GetType() gdbi.DataType { + return gdbi.VertexData +} + +type lookupVertsCondIndexProc struct { + db *Graph + expr *gripql.HasExpression + loadData bool + fallback bool +} + +func (l *lookupVertsCondIndexProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { + log.Debugln("Entering lookupVertsCondIndexProc custom processor") + queryChan := make(chan gdbi.ElementLookup, 100) + cond := l.expr.GetCondition() + + /* Indexing only works if every vertex label is indexed for that specific field and it's only a condition Filter + otherwise this lookup will not fetch everything that was asked for */ + allMatch := len(l.db.jsonkv.Fields) > 0 && cond != nil + if allMatch { + for lbl := range l.db.jsonkv.GetLabels(false, false) { + if val, exists := l.db.jsonkv.Fields[lbl]; exists { + if _, ok := val[cond.Key]; !ok { + allMatch = false + break + } + } else { + allMatch = false + break + } + } + } + /* Optimized indexing only works for Simple filters. / + / If compound filter or index doesn't exist use backup method */ + if cond != nil && allMatch { + log.Debugln("Chose index optimized V().Has() statement path") + go func() { + defer close(queryChan) + for t := range in { + for id := range l.db.jsonkv.RowIdsByHas( + cond.Key, + cond.Value.AsInterface(), + cond.Condition, + ) { + queryChan <- gdbi.ElementLookup{ + ID: id, + Ref: t, + } + } + } + }() + } else { + log.Debugf("Base case GetVertexList is used. No indexing") + go func() { + defer close(queryChan) + for t := range in { + for v := range l.db.GetVertexList(ctx, true) { + if MatchesHasExpression( + AddSpecialFields(v), + l.expr, + ) { + queryChan <- gdbi.ElementLookup{ID: v.ID, Ref: t} + } + + } + } + }() + } + + go func() { + defer close(out) + for v := range l.db.GetVertexChannel(ctx, queryChan, l.loadData) { + i := v.Ref + out <- i.AddCurrent(v.Vertex.Copy()) + } + }() + return ctx +} + +func AddSpecialFields(v *gdbi.Vertex) any { + v.Data["_label"] = v.Label + v.Data["_id"] = v.ID + return v.Data +} diff --git a/grids/raw_graph.go b/grids/raw_graph.go deleted file mode 100644 index 96efd5656..000000000 --- a/grids/raw_graph.go +++ /dev/null @@ -1,262 +0,0 @@ -package grids - -import ( - "bytes" - "context" - - "github.com/bmeg/grip/kvi" - "github.com/bmeg/grip/util/setcmp" -) - -func (ggraph *Graph) RawGetVertexList(ctx context.Context) <-chan *GRIDDataElement { - o := make(chan *GRIDDataElement, 100) - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - vPrefix := VertexListPrefix() - for it.Seek(vPrefix); it.Valid() && bytes.HasPrefix(it.Key(), vPrefix); it.Next() { - select { - case <-ctx.Done(): - return nil - default: - } - keyValue := it.Key() - vkey := VertexKeyParse(keyValue) - lkey := ggraph.keyMap.GetVertexLabel(vkey) - o <- &GRIDDataElement{ - Gid: vkey, - Label: lkey, - Data: map[string]interface{}{}, - Loaded: false, - } - } - return nil - }) - }() - return o -} - -func (ggraph *Graph) RawGetEdgeList(ctx context.Context) <-chan *GRIDDataElement { - o := make(chan *GRIDDataElement, 100) - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - ePrefix := EdgeListPrefix() - for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { - select { - case <-ctx.Done(): - return nil - default: - } - keyValue := it.Key() - ekey, srcvkey, dstvkey, lkey := EdgeKeyParse(keyValue) - o <- &GRIDDataElement{ - Gid: ekey, - Label: lkey, - From: srcvkey, - To: dstvkey, - Data: map[string]interface{}{}, - Loaded: false, - } - } - return nil - }) - }() - return o -} - -func (ggraph *Graph) RawGetVertexChannel(reqChan chan *RawElementLookup) <-chan *RawElementLookup { - o := make(chan *RawElementLookup, 100) - go func() { - defer close(o) - for req := range reqChan { - if req.IsSignal() { - o <- req - } else { - vkey := req.ID - lkey := ggraph.keyMap.GetVertexLabel(vkey) - o <- &RawElementLookup{ - Element: &GRIDDataElement{ - Gid: vkey, - Label: lkey, - Data: map[string]interface{}{}, - Loaded: false, - }, - ID: req.ID, - Ref: req.Ref, - } - } - } - }() - return o -} - -func (ggraph *Graph) RawGetOutChannel(reqChan chan *RawElementLookup, edgeLabels []string) chan *RawElementLookup { - o := make(chan *RawElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for req := range reqChan { - if req.IsSignal() { - o <- req - } else { - ePrefix := SrcEdgePrefix(req.ID) - for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { - keyValue := it.Key() - _, _, dstvkey, lkey := SrcEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || setcmp.ContainsUint(edgeLabelKeys, lkey) { - dstlkey := ggraph.keyMap.GetVertexLabel(dstvkey) - o <- &RawElementLookup{ - Element: &GRIDDataElement{ - Gid: dstvkey, - Label: dstlkey, - Data: map[string]interface{}{}, - Loaded: false, - }, - ID: req.ID, - Ref: req.Ref, - } - } - } - } - } - return nil - }) - }() - return o -} - -func (ggraph *Graph) RawGetInChannel(reqChan chan *RawElementLookup, edgeLabels []string) chan *RawElementLookup { - o := make(chan *RawElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for req := range reqChan { - if req.IsSignal() { - o <- req - } else { - ePrefix := DstEdgePrefix(req.ID) - for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { - keyValue := it.Key() - _, srcvkey, _, lkey := DstEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || setcmp.ContainsUint(edgeLabelKeys, lkey) { - srclkey := ggraph.keyMap.GetVertexLabel(srcvkey) - o <- &RawElementLookup{ - Element: &GRIDDataElement{ - Gid: srcvkey, - Label: srclkey, - Data: map[string]interface{}{}, - Loaded: false, - }, - ID: req.ID, - Ref: req.Ref, - } - } - } - } - } - return nil - }) - }() - return o -} - -func (ggraph *Graph) RawGetOutEdgeChannel(reqChan chan *RawElementLookup, edgeLabels []string) chan *RawElementLookup { - o := make(chan *RawElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for req := range reqChan { - if req.IsSignal() { - o <- req - } else { - ePrefix := SrcEdgePrefix(req.ID) - for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { - keyValue := it.Key() - ekey, srcvkey, dstvkey, lkey := SrcEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || setcmp.ContainsUint(edgeLabelKeys, lkey) { - o <- &RawElementLookup{ - Element: &GRIDDataElement{ - Gid: ekey, - Label: lkey, - From: srcvkey, - To: dstvkey, - Data: map[string]interface{}{}, - Loaded: false, - }, - ID: req.ID, - Ref: req.Ref, - } - } - } - } - } - return nil - }) - }() - return o -} - -func (ggraph *Graph) RawGetInEdgeChannel(reqChan chan *RawElementLookup, edgeLabels []string) chan *RawElementLookup { - o := make(chan *RawElementLookup, 100) - edgeLabelKeys := make([]uint64, 0, len(edgeLabels)) - for i := range edgeLabels { - el, ok := ggraph.keyMap.GetLabelKey(edgeLabels[i]) - if ok { - edgeLabelKeys = append(edgeLabelKeys, el) - } - } - go func() { - defer close(o) - ggraph.graphkv.View(func(it kvi.KVIterator) error { - for req := range reqChan { - if req.IsSignal() { - o <- req - } else { - ePrefix := DstEdgePrefix(req.ID) - for it.Seek(ePrefix); it.Valid() && bytes.HasPrefix(it.Key(), ePrefix); it.Next() { - keyValue := it.Key() - ekey, srcvkey, dstvkey, lkey := DstEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || setcmp.ContainsUint(edgeLabelKeys, lkey) { - o <- &RawElementLookup{ - Element: &GRIDDataElement{ - Gid: ekey, - Label: lkey, - From: srcvkey, - To: dstvkey, - Data: map[string]interface{}{}, - Loaded: false, - }, - ID: req.ID, - Ref: req.Ref, - } - } - } - } - } - return nil - }) - }() - return o -} diff --git a/grids/raw_processors.go b/grids/raw_processors.go deleted file mode 100644 index 21c5e5192..000000000 --- a/grids/raw_processors.go +++ /dev/null @@ -1,301 +0,0 @@ -package grids - -import ( - "context" - - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/util/setcmp" -) - -// ElementLookup request to look up data -type RawElementLookup struct { - ID uint64 - Ref *GRIDTraveler - Element *GRIDDataElement -} - -func (rel *RawElementLookup) IsSignal() bool { - if rel.Ref != nil { - return rel.Ref.IsSignal() - } - return false -} - -type PathVProc struct { - db *Graph - ids []string -} - -func (r *PathVProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - go func() { - for range in { - } - defer close(out) - if len(r.ids) == 0 { - for elem := range r.db.RawGetVertexList(ctx) { - out <- &GRIDTraveler{Current: elem, Graph: r.db} - } - } else { - for _, i := range r.ids { - if key, ok := r.db.keyMap.GetVertexKey(i); ok { - label := r.db.keyMap.GetVertexLabel(key) - o := &GRIDTraveler{ - Current: &GRIDDataElement{Gid: key, Label: label, Data: map[string]interface{}{}, Loaded: false}, - Graph: r.db, - } - out <- o - } - } - } - }() - return ctx -} - -type PathOutProc struct { - db *Graph - labels []string -} - -func (r *PathOutProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, true, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.Gid, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetOutChannel(queryChan, r.labels) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -type PathInProc struct { - db *Graph - labels []string -} - -func (r *PathInProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, true, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.Gid, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetInChannel(queryChan, r.labels) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -type PathOutEProc struct { - db *Graph - labels []string -} - -func (r *PathOutEProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, false, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.Gid, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetOutEdgeChannel(queryChan, r.labels) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -// PathOutAdjEProc process edge to out -type PathOutEdgeAdjProc struct { - db *Graph -} - -func (r *PathOutEdgeAdjProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, true, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.To, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetVertexChannel(queryChan) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -type PathInEProc struct { - db *Graph - labels []string -} - -func (r *PathInEProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, true, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.Gid, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetInEdgeChannel(queryChan, r.labels) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -type PathInEdgeAdjProc struct { - db *Graph - labels []string -} - -func (r *PathInEdgeAdjProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - queryChan := make(chan *RawElementLookup, 100) - go func() { - defer close(queryChan) - for i := range in { - gi := NewGRIDTraveler(i, true, r.db) - if gi.IsSignal() { - queryChan <- &RawElementLookup{ - Ref: gi, - } - } else { - queryChan <- &RawElementLookup{ - ID: gi.Current.From, - Ref: gi, - } - } - } - }() - go func() { - defer close(out) - for ov := range r.db.RawGetVertexChannel(queryChan) { - if ov.IsSignal() { - out <- ov.Ref - } else { - i := ov.Ref - out <- i.AddRawCurrent(ov.Element) - } - } - }() - return ctx -} - -type PathLabelProc struct { - db *Graph - labels []string -} - -func (r *PathLabelProc) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - labels := []uint64{} - for i := range r.labels { - if j, ok := r.db.keyMap.GetLabelKey(r.labels[i]); ok { - labels = append(labels, j) - } - } - go func() { - defer close(out) - for i := range in { - if i.IsSignal() { - out <- i - } - gi := NewGRIDTraveler(i, true, r.db) - if setcmp.ContainsUint(labels, gi.Current.Label) { - out <- i - } - } - }() - return ctx -} diff --git a/grids/schema.go b/grids/schema.go index 21d3e343b..c12d38663 100644 --- a/grids/schema.go +++ b/grids/schema.go @@ -34,19 +34,21 @@ func (ma *GDB) BuildSchema(ctx context.Context, graph string, sampleN uint32, ra } func (gi *Graph) sampleSchema(ctx context.Context, n uint32, random bool) ([]*gripql.Vertex, []*gripql.Edge, error) { - labelField := fmt.Sprintf("v.label") - labels := []string{} - for i := range gi.idx.FieldTerms(labelField) { - labels = append(labels, i.(string)) + labels := gi.jsonkv.List() + vertLabels := []string{} + for _, label := range labels { + if label[:2] == "v_" { + vertLabels = append(vertLabels, label) + } } vOutput := []*gripql.Vertex{} eOutput := []*gripql.Edge{} fromToPairs := make(fromto) - for _, label := range labels { - schema := map[string]interface{}{} - for i := range gi.idx.GetTermMatch(context.Background(), labelField, label, int(n)) { + for _, label := range vertLabels { + schema := map[string]any{} + for i := range gi.VertexLabelScan(context.Background(), label) { v := gi.GetVertex(i, true) data := v.Data ds := gripql.GetDataFieldTypes(data) @@ -56,9 +58,10 @@ func (gi *Graph) sampleSchema(ctx context.Context, n uint32, random bool) ([]*gr reqChan <- gdbi.ElementLookup{ID: i} close(reqChan) for e := range gi.GetOutEdgeChannel(ctx, reqChan, true, false, []string{}) { - o := gi.GetVertex(e.Edge.To, false) - k := fromtokey{from: v.Label, to: o.Label, label: e.Edge.Label} - ds := gripql.GetDataFieldTypes(e.Edge.Data) + edge := e.Edge.Get() + o := gi.GetVertex(edge.To, false) + k := fromtokey{from: v.Label, to: o.Label, label: edge.Label} + ds := gripql.GetDataFieldTypes(edge.Data) if p, ok := fromToPairs[k]; ok { fromToPairs[k] = util.MergeMaps(p, ds) } else { @@ -67,13 +70,13 @@ func (gi *Graph) sampleSchema(ctx context.Context, n uint32, random bool) ([]*gr } } sSchema, _ := structpb.NewStruct(schema) - vSchema := &gripql.Vertex{Gid: label, Label: label, Data: sSchema} + vSchema := &gripql.Vertex{Id: label[2:], Label: label, Data: sSchema} vOutput = append(vOutput, vSchema) } for k, v := range fromToPairs { - sV, _ := structpb.NewStruct(v.(map[string]interface{})) + sV, _ := structpb.NewStruct(v.(map[string]any)) eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), + Id: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), Label: k.label, From: k.from, To: k.to, @@ -88,4 +91,4 @@ type fromtokey struct { from, to, label string } -type fromto map[fromtokey]interface{} +type fromto map[fromtokey]any diff --git a/grids/traveler.go b/grids/traveler.go deleted file mode 100644 index a2307bc19..000000000 --- a/grids/traveler.go +++ /dev/null @@ -1,269 +0,0 @@ -package grids - -import ( - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/util/copy" -) - -type GRIDTraveler struct { - Graph *Graph - Current *GRIDDataElement - Marks map[string]*GRIDDataElement - Selections map[string]*GRIDDataElement - Aggregation *gdbi.Aggregate - Count uint32 - Render interface{} - Path []GRIDDataElementID - Signal *gdbi.Signal -} - -type GRIDDataElementID struct { - IsVertex bool - Gid uint64 -} - -type GRIDDataElement struct { - Gid uint64 - To uint64 - From uint64 - Label uint64 - Data map[string]interface{} - Loaded bool -} - -func (rd *GRIDDataElement) VertexDataElement(ggraph *Graph) *gdbi.Vertex { - Gid, _ := ggraph.keyMap.GetVertexID(rd.Gid) - Label, _ := ggraph.keyMap.GetLabelID(rd.Label) - return &gdbi.DataElement{ID: Gid, Label: Label, Data: rd.Data, Loaded: rd.Loaded} -} - -func (rd *GRIDDataElement) EdgeDataElement(ggraph *Graph) *gdbi.Edge { - Gid, _ := ggraph.keyMap.GetEdgeID(rd.Gid) - Label, _ := ggraph.keyMap.GetLabelID(rd.Label) - To, _ := ggraph.keyMap.GetVertexID(rd.To) - From, _ := ggraph.keyMap.GetVertexID(rd.From) - return &gdbi.DataElement{ID: Gid, To: To, From: From, Label: Label, Data: rd.Data, Loaded: rd.Loaded} -} - -func (rd *GRIDDataElement) DataElement(ggraph *Graph) *gdbi.DataElement { - if rd.To != 0 { - return rd.EdgeDataElement(ggraph) - } - return rd.VertexDataElement(ggraph) -} - -func (rd *GRIDDataElement) Copy() *GRIDDataElement { - return &GRIDDataElement{ - Gid: rd.Gid, - Label: rd.Label, - To: rd.To, - From: rd.From, - Loaded: rd.Loaded, - Data: copy.DeepCopy(rd.Data).(map[string]interface{}), - } -} - -func DataElementToGRID(d *gdbi.DataElement, g *Graph) (*GRIDDataElement, error) { - if d.To != "" { - Gid, _ := g.keyMap.GetEdgeKey(d.ID) - Label, _ := g.keyMap.GetLabelKey(d.Label) - To, _ := g.keyMap.GetVertexKey(d.To) - From, _ := g.keyMap.GetVertexKey(d.From) - return &GRIDDataElement{ - Gid: Gid, Label: Label, To: To, From: From, Data: d.Data, Loaded: d.Loaded, - }, nil - } - Gid, _ := g.keyMap.GetVertexKey(d.ID) - Label, _ := g.keyMap.GetLabelKey(d.Label) - o := &GRIDDataElement{ - Gid: Gid, Label: Label, Data: d.Data, Loaded: d.Loaded, - } - return o, nil -} - -func NewGRIDTraveler(tr gdbi.Traveler, isVertex bool, gg *Graph) *GRIDTraveler { - if a, ok := tr.(*GRIDTraveler); ok { - return a - } - - if tr.IsSignal() { - s := tr.GetSignal() - return &GRIDTraveler{Signal: &s} - } - - cur := tr.GetCurrent() - el, _ := DataElementToGRID(cur, gg) - o := &GRIDTraveler{ - Graph: gg, - Current: el, - Aggregation: tr.GetAggregation(), - Count: tr.GetCount(), - Render: tr.GetRender(), - Path: []GRIDDataElementID{}, - Marks: map[string]*GRIDDataElement{}, - } - for _, e := range tr.GetPath() { - if e.Vertex != "" { - l, _ := gg.keyMap.GetVertexKey(e.Vertex) - o.Path = append(o.Path, GRIDDataElementID{IsVertex: true, Gid: l}) - } else { - l, _ := gg.keyMap.GetVertexKey(e.Edge) - o.Path = append(o.Path, GRIDDataElementID{IsVertex: false, Gid: l}) - } - } - for _, k := range tr.ListMarks() { - m := tr.GetMark(k) - o.Marks[k], _ = DataElementToGRID(m, gg) - } - - return o -} - -func (tr *GRIDTraveler) GetSignal() gdbi.Signal { - if tr.Signal == nil { - return gdbi.Signal{} - } - return *tr.Signal -} - -func (tr *GRIDTraveler) IsSignal() bool { - return tr.Signal != nil -} - -func (tr *GRIDTraveler) IsNull() bool { - return tr.Current != nil -} - -// AddCurrent creates a new copy of the travel with new 'current' value -func (t *GRIDTraveler) AddCurrent(r *gdbi.DataElement) gdbi.Traveler { - a := t.GRIDCopy() - c, _ := DataElementToGRID(r, t.Graph) - a.Current = c - return a -} - -func (t *GRIDTraveler) AddRawCurrent(r *GRIDDataElement) *GRIDTraveler { - o := GRIDTraveler{ - Graph: t.Graph, - Marks: map[string]*GRIDDataElement{}, - Path: make([]GRIDDataElementID, len(t.GetPath())+1), - } - - for k, v := range t.Marks { - o.Marks[k] = v.Copy() - } - for i := range t.Path { - o.Path[i] = t.Path[i] - } - if r == nil { - o.Path[len(t.Path)] = GRIDDataElementID{} - } else if r.To != 0 { - o.Path[len(t.Path)] = GRIDDataElementID{Gid: r.Gid, IsVertex: false} - } else { - o.Path[len(t.Path)] = GRIDDataElementID{Gid: r.Gid, IsVertex: true} - } - o.Current = r - return &o -} - -func (t *GRIDTraveler) GetCurrentID() string { - if t.Current.To == 0 { - s, _ := t.Graph.keyMap.GetVertexID(t.Current.Gid) - return s - } else { - s, _ := t.Graph.keyMap.GetEdgeID(t.Current.Gid) - return s - } -} - -// AddCurrent creates a new copy of the travel with new 'current' value -func (t *GRIDTraveler) Copy() gdbi.Traveler { - return t.GRIDCopy() -} - -func (t *GRIDTraveler) GRIDCopy() *GRIDTraveler { - o := GRIDTraveler{ - Graph: t.Graph, - Marks: map[string]*GRIDDataElement{}, - Path: make([]GRIDDataElementID, len(t.GetPath())), - Signal: t.Signal, - Count: t.Count, - Aggregation: t.Aggregation, - } - for k, v := range t.Marks { - o.Marks[k] = v.Copy() - } - for i := range t.Path { - o.Path[i] = t.Path[i] - } - o.Current = t.Current - return &o -} - -// HasMark checks to see if a results is stored in a travelers statemap -func (t *GRIDTraveler) HasMark(label string) bool { - _, ok := t.Marks[label] - return ok -} - -// ListMarks returns the list of marks in a travelers statemap -func (t *GRIDTraveler) ListMarks() []string { - marks := []string{} - for k := range t.Marks { - marks = append(marks, k) - } - return marks -} - -// AddMark adds a result to travels state map using `label` as the name -func (t *GRIDTraveler) AddMark(label string, r *gdbi.DataElement) gdbi.Traveler { - o := t.GRIDCopy() - n, _ := DataElementToGRID(r, t.Graph) - o.Marks[label] = n - return o -} - -// GetMark gets stored result in travels state using its label -func (t *GRIDTraveler) GetMark(label string) *gdbi.DataElement { - return t.Marks[label].DataElement(t.Graph) -} - -// GetCurrent get current result value attached to the traveler -func (t *GRIDTraveler) GetCurrent() *gdbi.DataElement { - return t.Current.DataElement(t.Graph) -} - -func (t *GRIDTraveler) GetCount() uint32 { - return t.Count -} - -func (t *GRIDTraveler) GetSelections() map[string]*gdbi.DataElement { - o := map[string]*gdbi.DataElement{} - for k, v := range t.Selections { - o[k] = v.DataElement(t.Graph) - } - return o -} - -func (t *GRIDTraveler) GetRender() interface{} { - return t.Render -} - -func (t *GRIDTraveler) GetPath() []gdbi.DataElementID { - out := make([]gdbi.DataElementID, len(t.Path)) - for i := range t.Path { - e := t.Path[i] - if e.IsVertex { - s, _ := t.Graph.keyMap.GetVertexID(e.Gid) - out[i] = gdbi.DataElementID{Vertex: s} - } else { - s, _ := t.Graph.keyMap.GetEdgeID(e.Gid) - out[i] = gdbi.DataElementID{Edge: s} - } - } - return out -} - -func (t GRIDTraveler) GetAggregation() *gdbi.Aggregate { - return t.Aggregation -} diff --git a/gripper/config.go b/gripper/config.go index 657c51fba..9859e7dc8 100644 --- a/gripper/config.go +++ b/gripper/config.go @@ -2,7 +2,7 @@ package gripper import ( "fmt" - "io/ioutil" + "os" //"path/filepath" "encoding/json" @@ -31,13 +31,13 @@ type ElementConfig struct { } type VertexConfig struct { - Gid string `json:"gid"` + Id string `json:"id"` Label string `json:"label"` Data ElementConfig `json:"data"` } type EdgeConfig struct { - Gid string `json:"gid"` + Id string `json:"id"` To string `json:"to"` From string `json:"from"` Label string `json:"label"` @@ -47,7 +47,7 @@ type EdgeConfig struct { func LoadConfig(path string) (*GraphConfig, error) { conf := &GraphConfig{} // Read file - source, err := ioutil.ReadFile(path) + source, err := os.ReadFile(path) if err != nil { return nil, fmt.Errorf("failed to read config at path %s: \n%v", path, err) } @@ -72,22 +72,22 @@ func GraphToConfig(graph *gripql.Graph) (*GraphConfig, error) { s, _ := json.Marshal(d) vc := VertexConfig{} json.Unmarshal(s, &vc) - vc.Gid = vert.Gid + vc.Id = vert.Id vc.Label = vert.Label vc.Data = dataToElementConfig(vert.Data.AsMap()) - out.Vertices[vert.Gid] = vc + out.Vertices[vert.Id] = vc } for _, edge := range graph.Edges { d := edge.Data.AsMap() s, _ := json.Marshal(d) ec := EdgeConfig{} json.Unmarshal(s, &ec) - ec.Gid = edge.Gid + ec.Id = edge.Id ec.Label = edge.Label ec.To = edge.To ec.From = edge.From ec.Data = dataToElementConfig(edge.Data.AsMap()) - out.Edges[edge.Gid] = ec + out.Edges[edge.Id] = ec } return &out, nil } diff --git a/gripper/graph.go b/gripper/graph.go index 8ceddc80e..801993c96 100644 --- a/gripper/graph.go +++ b/gripper/graph.go @@ -175,6 +175,10 @@ func (t *TabularGraph) BulkAdd(stream <-chan *gdbi.GraphElement) error { return fmt.Errorf("GRIPPER is ReadOnly") } +func (t *TabularGraph) BulkDel(*gdbi.DeleteData) error { + return fmt.Errorf("GRIPPER is ReadOnly") +} + func (t *TabularGraph) Compiler() gdbi.Compiler { return core.NewCompiler(t, TabularOptimizer) } diff --git a/gripper/gripper.pb.go b/gripper/gripper.pb.go index 45a04ad7d..fce95d41a 100644 --- a/gripper/gripper.pb.go +++ b/gripper/gripper.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc-gen-go v1.34.2 +// protoc v5.29.3 // source: gripper.proto package gripper @@ -476,7 +476,7 @@ func file_gripper_proto_rawDescGZIP() []byte { } var file_gripper_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_gripper_proto_goTypes = []interface{}{ +var file_gripper_proto_goTypes = []any{ (*Empty)(nil), // 0: gripper.Empty (*Collection)(nil), // 1: gripper.Collection (*RowID)(nil), // 2: gripper.RowID @@ -515,7 +515,7 @@ func file_gripper_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_gripper_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Empty); i { case 0: return &v.state @@ -527,7 +527,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Collection); i { case 0: return &v.state @@ -539,7 +539,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*RowID); i { case 0: return &v.state @@ -551,7 +551,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*RowRequest); i { case 0: return &v.state @@ -563,7 +563,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*FieldRequest); i { case 0: return &v.state @@ -575,7 +575,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*Row); i { case 0: return &v.state @@ -587,7 +587,7 @@ func file_gripper_proto_init() { return nil } } - file_gripper_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_gripper_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*CollectionInfo); i { case 0: return &v.state diff --git a/gripper/gripper_grpc.pb.go b/gripper/gripper_grpc.pb.go index 344d90d0f..18e548f0f 100644 --- a/gripper/gripper_grpc.pb.go +++ b/gripper/gripper_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.20.1 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: gripper.proto package gripper @@ -15,19 +15,28 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + GRIPSource_GetCollections_FullMethodName = "/gripper.GRIPSource/GetCollections" + GRIPSource_GetCollectionInfo_FullMethodName = "/gripper.GRIPSource/GetCollectionInfo" + GRIPSource_GetIDs_FullMethodName = "/gripper.GRIPSource/GetIDs" + GRIPSource_GetRows_FullMethodName = "/gripper.GRIPSource/GetRows" + GRIPSource_GetRowsByID_FullMethodName = "/gripper.GRIPSource/GetRowsByID" + GRIPSource_GetRowsByField_FullMethodName = "/gripper.GRIPSource/GetRowsByField" +) // GRIPSourceClient is the client API for GRIPSource service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type GRIPSourceClient interface { - GetCollections(ctx context.Context, in *Empty, opts ...grpc.CallOption) (GRIPSource_GetCollectionsClient, error) + GetCollections(ctx context.Context, in *Empty, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Collection], error) GetCollectionInfo(ctx context.Context, in *Collection, opts ...grpc.CallOption) (*CollectionInfo, error) - GetIDs(ctx context.Context, in *Collection, opts ...grpc.CallOption) (GRIPSource_GetIDsClient, error) - GetRows(ctx context.Context, in *Collection, opts ...grpc.CallOption) (GRIPSource_GetRowsClient, error) - GetRowsByID(ctx context.Context, opts ...grpc.CallOption) (GRIPSource_GetRowsByIDClient, error) - GetRowsByField(ctx context.Context, in *FieldRequest, opts ...grpc.CallOption) (GRIPSource_GetRowsByFieldClient, error) + GetIDs(ctx context.Context, in *Collection, opts ...grpc.CallOption) (grpc.ServerStreamingClient[RowID], error) + GetRows(ctx context.Context, in *Collection, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Row], error) + GetRowsByID(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[RowRequest, Row], error) + GetRowsByField(ctx context.Context, in *FieldRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Row], error) } type gRIPSourceClient struct { @@ -38,12 +47,13 @@ func NewGRIPSourceClient(cc grpc.ClientConnInterface) GRIPSourceClient { return &gRIPSourceClient{cc} } -func (c *gRIPSourceClient) GetCollections(ctx context.Context, in *Empty, opts ...grpc.CallOption) (GRIPSource_GetCollectionsClient, error) { - stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[0], "/gripper.GRIPSource/GetCollections", opts...) +func (c *gRIPSourceClient) GetCollections(ctx context.Context, in *Empty, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Collection], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[0], GRIPSource_GetCollections_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &gRIPSourceGetCollectionsClient{stream} + x := &grpc.GenericClientStream[Empty, Collection]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -53,38 +63,26 @@ func (c *gRIPSourceClient) GetCollections(ctx context.Context, in *Empty, opts . return x, nil } -type GRIPSource_GetCollectionsClient interface { - Recv() (*Collection, error) - grpc.ClientStream -} - -type gRIPSourceGetCollectionsClient struct { - grpc.ClientStream -} - -func (x *gRIPSourceGetCollectionsClient) Recv() (*Collection, error) { - m := new(Collection) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetCollectionsClient = grpc.ServerStreamingClient[Collection] func (c *gRIPSourceClient) GetCollectionInfo(ctx context.Context, in *Collection, opts ...grpc.CallOption) (*CollectionInfo, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(CollectionInfo) - err := c.cc.Invoke(ctx, "/gripper.GRIPSource/GetCollectionInfo", in, out, opts...) + err := c.cc.Invoke(ctx, GRIPSource_GetCollectionInfo_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *gRIPSourceClient) GetIDs(ctx context.Context, in *Collection, opts ...grpc.CallOption) (GRIPSource_GetIDsClient, error) { - stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[1], "/gripper.GRIPSource/GetIDs", opts...) +func (c *gRIPSourceClient) GetIDs(ctx context.Context, in *Collection, opts ...grpc.CallOption) (grpc.ServerStreamingClient[RowID], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[1], GRIPSource_GetIDs_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &gRIPSourceGetIDsClient{stream} + x := &grpc.GenericClientStream[Collection, RowID]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -94,29 +92,16 @@ func (c *gRIPSourceClient) GetIDs(ctx context.Context, in *Collection, opts ...g return x, nil } -type GRIPSource_GetIDsClient interface { - Recv() (*RowID, error) - grpc.ClientStream -} - -type gRIPSourceGetIDsClient struct { - grpc.ClientStream -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetIDsClient = grpc.ServerStreamingClient[RowID] -func (x *gRIPSourceGetIDsClient) Recv() (*RowID, error) { - m := new(RowID) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *gRIPSourceClient) GetRows(ctx context.Context, in *Collection, opts ...grpc.CallOption) (GRIPSource_GetRowsClient, error) { - stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[2], "/gripper.GRIPSource/GetRows", opts...) +func (c *gRIPSourceClient) GetRows(ctx context.Context, in *Collection, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Row], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[2], GRIPSource_GetRows_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &gRIPSourceGetRowsClient{stream} + x := &grpc.GenericClientStream[Collection, Row]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -126,60 +111,29 @@ func (c *gRIPSourceClient) GetRows(ctx context.Context, in *Collection, opts ... return x, nil } -type GRIPSource_GetRowsClient interface { - Recv() (*Row, error) - grpc.ClientStream -} - -type gRIPSourceGetRowsClient struct { - grpc.ClientStream -} - -func (x *gRIPSourceGetRowsClient) Recv() (*Row, error) { - m := new(Row) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsClient = grpc.ServerStreamingClient[Row] -func (c *gRIPSourceClient) GetRowsByID(ctx context.Context, opts ...grpc.CallOption) (GRIPSource_GetRowsByIDClient, error) { - stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[3], "/gripper.GRIPSource/GetRowsByID", opts...) +func (c *gRIPSourceClient) GetRowsByID(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[RowRequest, Row], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[3], GRIPSource_GetRowsByID_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &gRIPSourceGetRowsByIDClient{stream} + x := &grpc.GenericClientStream[RowRequest, Row]{ClientStream: stream} return x, nil } -type GRIPSource_GetRowsByIDClient interface { - Send(*RowRequest) error - Recv() (*Row, error) - grpc.ClientStream -} - -type gRIPSourceGetRowsByIDClient struct { - grpc.ClientStream -} - -func (x *gRIPSourceGetRowsByIDClient) Send(m *RowRequest) error { - return x.ClientStream.SendMsg(m) -} - -func (x *gRIPSourceGetRowsByIDClient) Recv() (*Row, error) { - m := new(Row) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsByIDClient = grpc.BidiStreamingClient[RowRequest, Row] -func (c *gRIPSourceClient) GetRowsByField(ctx context.Context, in *FieldRequest, opts ...grpc.CallOption) (GRIPSource_GetRowsByFieldClient, error) { - stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[4], "/gripper.GRIPSource/GetRowsByField", opts...) +func (c *gRIPSourceClient) GetRowsByField(ctx context.Context, in *FieldRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[Row], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &GRIPSource_ServiceDesc.Streams[4], GRIPSource_GetRowsByField_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &gRIPSourceGetRowsByFieldClient{stream} + x := &grpc.GenericClientStream[FieldRequest, Row]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -189,59 +143,49 @@ func (c *gRIPSourceClient) GetRowsByField(ctx context.Context, in *FieldRequest, return x, nil } -type GRIPSource_GetRowsByFieldClient interface { - Recv() (*Row, error) - grpc.ClientStream -} - -type gRIPSourceGetRowsByFieldClient struct { - grpc.ClientStream -} - -func (x *gRIPSourceGetRowsByFieldClient) Recv() (*Row, error) { - m := new(Row) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsByFieldClient = grpc.ServerStreamingClient[Row] // GRIPSourceServer is the server API for GRIPSource service. // All implementations must embed UnimplementedGRIPSourceServer -// for forward compatibility +// for forward compatibility. type GRIPSourceServer interface { - GetCollections(*Empty, GRIPSource_GetCollectionsServer) error + GetCollections(*Empty, grpc.ServerStreamingServer[Collection]) error GetCollectionInfo(context.Context, *Collection) (*CollectionInfo, error) - GetIDs(*Collection, GRIPSource_GetIDsServer) error - GetRows(*Collection, GRIPSource_GetRowsServer) error - GetRowsByID(GRIPSource_GetRowsByIDServer) error - GetRowsByField(*FieldRequest, GRIPSource_GetRowsByFieldServer) error + GetIDs(*Collection, grpc.ServerStreamingServer[RowID]) error + GetRows(*Collection, grpc.ServerStreamingServer[Row]) error + GetRowsByID(grpc.BidiStreamingServer[RowRequest, Row]) error + GetRowsByField(*FieldRequest, grpc.ServerStreamingServer[Row]) error mustEmbedUnimplementedGRIPSourceServer() } -// UnimplementedGRIPSourceServer must be embedded to have forward compatible implementations. -type UnimplementedGRIPSourceServer struct { -} +// UnimplementedGRIPSourceServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedGRIPSourceServer struct{} -func (UnimplementedGRIPSourceServer) GetCollections(*Empty, GRIPSource_GetCollectionsServer) error { +func (UnimplementedGRIPSourceServer) GetCollections(*Empty, grpc.ServerStreamingServer[Collection]) error { return status.Errorf(codes.Unimplemented, "method GetCollections not implemented") } func (UnimplementedGRIPSourceServer) GetCollectionInfo(context.Context, *Collection) (*CollectionInfo, error) { return nil, status.Errorf(codes.Unimplemented, "method GetCollectionInfo not implemented") } -func (UnimplementedGRIPSourceServer) GetIDs(*Collection, GRIPSource_GetIDsServer) error { +func (UnimplementedGRIPSourceServer) GetIDs(*Collection, grpc.ServerStreamingServer[RowID]) error { return status.Errorf(codes.Unimplemented, "method GetIDs not implemented") } -func (UnimplementedGRIPSourceServer) GetRows(*Collection, GRIPSource_GetRowsServer) error { +func (UnimplementedGRIPSourceServer) GetRows(*Collection, grpc.ServerStreamingServer[Row]) error { return status.Errorf(codes.Unimplemented, "method GetRows not implemented") } -func (UnimplementedGRIPSourceServer) GetRowsByID(GRIPSource_GetRowsByIDServer) error { +func (UnimplementedGRIPSourceServer) GetRowsByID(grpc.BidiStreamingServer[RowRequest, Row]) error { return status.Errorf(codes.Unimplemented, "method GetRowsByID not implemented") } -func (UnimplementedGRIPSourceServer) GetRowsByField(*FieldRequest, GRIPSource_GetRowsByFieldServer) error { +func (UnimplementedGRIPSourceServer) GetRowsByField(*FieldRequest, grpc.ServerStreamingServer[Row]) error { return status.Errorf(codes.Unimplemented, "method GetRowsByField not implemented") } func (UnimplementedGRIPSourceServer) mustEmbedUnimplementedGRIPSourceServer() {} +func (UnimplementedGRIPSourceServer) testEmbeddedByValue() {} // UnsafeGRIPSourceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to GRIPSourceServer will @@ -251,6 +195,13 @@ type UnsafeGRIPSourceServer interface { } func RegisterGRIPSourceServer(s grpc.ServiceRegistrar, srv GRIPSourceServer) { + // If the following call pancis, it indicates UnimplementedGRIPSourceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&GRIPSource_ServiceDesc, srv) } @@ -259,21 +210,11 @@ func _GRIPSource_GetCollections_Handler(srv interface{}, stream grpc.ServerStrea if err := stream.RecvMsg(m); err != nil { return err } - return srv.(GRIPSourceServer).GetCollections(m, &gRIPSourceGetCollectionsServer{stream}) -} - -type GRIPSource_GetCollectionsServer interface { - Send(*Collection) error - grpc.ServerStream -} - -type gRIPSourceGetCollectionsServer struct { - grpc.ServerStream + return srv.(GRIPSourceServer).GetCollections(m, &grpc.GenericServerStream[Empty, Collection]{ServerStream: stream}) } -func (x *gRIPSourceGetCollectionsServer) Send(m *Collection) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetCollectionsServer = grpc.ServerStreamingServer[Collection] func _GRIPSource_GetCollectionInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(Collection) @@ -285,7 +226,7 @@ func _GRIPSource_GetCollectionInfo_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripper.GRIPSource/GetCollectionInfo", + FullMethod: GRIPSource_GetCollectionInfo_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(GRIPSourceServer).GetCollectionInfo(ctx, req.(*Collection)) @@ -298,89 +239,40 @@ func _GRIPSource_GetIDs_Handler(srv interface{}, stream grpc.ServerStream) error if err := stream.RecvMsg(m); err != nil { return err } - return srv.(GRIPSourceServer).GetIDs(m, &gRIPSourceGetIDsServer{stream}) + return srv.(GRIPSourceServer).GetIDs(m, &grpc.GenericServerStream[Collection, RowID]{ServerStream: stream}) } -type GRIPSource_GetIDsServer interface { - Send(*RowID) error - grpc.ServerStream -} - -type gRIPSourceGetIDsServer struct { - grpc.ServerStream -} - -func (x *gRIPSourceGetIDsServer) Send(m *RowID) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetIDsServer = grpc.ServerStreamingServer[RowID] func _GRIPSource_GetRows_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(Collection) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(GRIPSourceServer).GetRows(m, &gRIPSourceGetRowsServer{stream}) + return srv.(GRIPSourceServer).GetRows(m, &grpc.GenericServerStream[Collection, Row]{ServerStream: stream}) } -type GRIPSource_GetRowsServer interface { - Send(*Row) error - grpc.ServerStream -} - -type gRIPSourceGetRowsServer struct { - grpc.ServerStream -} - -func (x *gRIPSourceGetRowsServer) Send(m *Row) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsServer = grpc.ServerStreamingServer[Row] func _GRIPSource_GetRowsByID_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(GRIPSourceServer).GetRowsByID(&gRIPSourceGetRowsByIDServer{stream}) + return srv.(GRIPSourceServer).GetRowsByID(&grpc.GenericServerStream[RowRequest, Row]{ServerStream: stream}) } -type GRIPSource_GetRowsByIDServer interface { - Send(*Row) error - Recv() (*RowRequest, error) - grpc.ServerStream -} - -type gRIPSourceGetRowsByIDServer struct { - grpc.ServerStream -} - -func (x *gRIPSourceGetRowsByIDServer) Send(m *Row) error { - return x.ServerStream.SendMsg(m) -} - -func (x *gRIPSourceGetRowsByIDServer) Recv() (*RowRequest, error) { - m := new(RowRequest) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsByIDServer = grpc.BidiStreamingServer[RowRequest, Row] func _GRIPSource_GetRowsByField_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(FieldRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(GRIPSourceServer).GetRowsByField(m, &gRIPSourceGetRowsByFieldServer{stream}) -} - -type GRIPSource_GetRowsByFieldServer interface { - Send(*Row) error - grpc.ServerStream -} - -type gRIPSourceGetRowsByFieldServer struct { - grpc.ServerStream + return srv.(GRIPSourceServer).GetRowsByField(m, &grpc.GenericServerStream[FieldRequest, Row]{ServerStream: stream}) } -func (x *gRIPSourceGetRowsByFieldServer) Send(m *Row) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type GRIPSource_GetRowsByFieldServer = grpc.ServerStreamingServer[Row] // GRIPSource_ServiceDesc is the grpc.ServiceDesc for GRIPSource service. // It's only intended for direct use with grpc.RegisterService, diff --git a/gripper/optimize.go b/gripper/optimize.go index b63e5550f..64893098b 100644 --- a/gripper/optimize.go +++ b/gripper/optimize.go @@ -3,9 +3,9 @@ package gripper import ( "context" - "github.com/bmeg/grip/engine/inspect" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/gripql/inspect" "github.com/bmeg/grip/util/setcmp" "github.com/bmeg/jsonpath" ) diff --git a/gripper/plugins.go b/gripper/plugins.go index fd4ea86de..dc5086424 100644 --- a/gripper/plugins.go +++ b/gripper/plugins.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -54,7 +53,7 @@ func LaunchPluginClient(plugindir string, name string, workdir string, params ma if err != nil { return nil, err } - err = ioutil.WriteFile(confPath, message, 0644) + err = os.WriteFile(confPath, message, 0644) if err != nil { return nil, err } diff --git a/gripper/schema.go b/gripper/schema.go index 60d478f37..99c7df131 100644 --- a/gripper/schema.go +++ b/gripper/schema.go @@ -133,14 +133,14 @@ func (g *TabularGDB) sampleSchema(ctx context.Context, graph string, n uint32, r for label, schema := range vLabelSchemas { sSchema, _ := structpb.NewStruct(schema) - vSchema := &gripql.Vertex{Gid: label, Label: label, Data: sSchema} + vSchema := &gripql.Vertex{Id: label, Label: label, Data: sSchema} vOutput = append(vOutput, vSchema) } for k, v := range fromToPairs { sV, _ := structpb.NewStruct(v.(map[string]interface{})) eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), + Id: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), Label: k.label, From: k.from, To: k.to, diff --git a/gripper/test-graph/make-table-graph.py b/gripper/test-graph/make-table-graph.py index 5880f1dfb..9e6e34911 100755 --- a/gripper/test-graph/make-table-graph.py +++ b/gripper/test-graph/make-table-graph.py @@ -22,7 +22,7 @@ def graph2tables(vFile, eFile, ePlanFile): if label not in tables: tables[label] = [] tables[label].append(data) - vTypes[data['gid']] = data['label'] + vTypes[data['id']] = data['label'] eTable = [] with open(eFile) as handle: @@ -52,7 +52,7 @@ def graph2tables(vFile, eFile, ePlanFile): if vTypes[e['to']] == plan['to'] and vTypes[e['from']] == plan['from'] and e['label'] == plan['label']: #print("add %s to %s" % (e['to'], e['from'])) for v in tables[vTypes[e['from']]]: - if v['gid'] == e['from']: + if v['id'] == e['from']: dstID = e['to'].split(":")[1] v['data'][ plan['field'] ] = dstID @@ -82,11 +82,11 @@ def keyUnion(a): for name, rows in tables.items(): p = os.path.join(outdir, "%s.tsv" % (name)) with open(p, "w") as handle: - if 'data' in rows[0] and 'gid' in rows[0]: + if 'data' in rows[0] and 'id' in rows[0]: headers = keyUnion( list(list(r['data'].keys()) for r in rows) ) handle.write("\t".join(['id'] + headers) + "\n") for row in rows: - id = row['gid'].split(":")[1] + id = row['id'].split(":")[1] handle.write("\t".join( [json.dumps(id)] + list( json.dumps(row['data'].get(k,"")) for k in headers ) ) + "\n") else: headers = list(rows[0].keys()) diff --git a/gripper/test-graph/swapi.yaml b/gripper/test-graph/swapi.yaml index 740291419..5ac9e7812 100644 --- a/gripper/test-graph/swapi.yaml +++ b/gripper/test-graph/swapi.yaml @@ -1,43 +1,43 @@ vertices: - - gid: "Character:" + - id: "Character:" label: Character data: source: tableServer collection: Character - - gid: "Planet:" + - id: "Planet:" label: Planet data: collection: Planet source: tableServer - - gid: "Film:" + - id: "Film:" label: Film data: collection: Film source: tableServer - - gid: "Species:" + - id: "Species:" label: Species data: source: tableServer collection: Species - - gid: "Starship:" + - id: "Starship:" label: Starship data: source: tableServer collection: Starship - - gid: "Vehicle:" + - id: "Vehicle:" label: Vehicle data: source: tableServer collection: Vehicle edges: - - gid: "homeworld" + - id: "homeworld" from: "Character:" to: "Planet:" label: homeworld @@ -47,7 +47,7 @@ edges: toField: homeworld fromField: id - - gid: species + - id: species from: "Character:" to: "Species:" label: species @@ -57,7 +57,7 @@ edges: toField: species fromField: id - - gid: people + - id: people from: "Species:" to: "Character:" label: people @@ -67,7 +67,7 @@ edges: fromField: from toField: to - - gid: residents + - id: residents from: "Planet:" to: "Character:" label: residents @@ -77,7 +77,7 @@ edges: fromField: from toField: to - - gid: filmVehicles + - id: filmVehicles from: "Film:" to: "Vehicle:" label: "vehicles" @@ -87,7 +87,7 @@ edges: fromField: from toField: to - - gid: vehicleFilms + - id: vehicleFilms to: "Film:" from: "Vehicle:" label: "films" @@ -97,7 +97,7 @@ edges: toField: from fromField: to - - gid: filmStarships + - id: filmStarships from: "Film:" to: "Starship:" label: "starships" @@ -107,7 +107,7 @@ edges: fromField: from toField: to - - gid: starshipFilms + - id: starshipFilms to: "Film:" from: "Starship:" label: "films" @@ -117,7 +117,7 @@ edges: toField: from fromField: to - - gid: filmPlanets + - id: filmPlanets from: "Film:" to: "Planet:" label: "planets" @@ -127,7 +127,7 @@ edges: fromField: from toField: to - - gid: planetFilms + - id: planetFilms to: "Film:" from: "Planet:" label: "films" @@ -137,7 +137,7 @@ edges: toField: from fromField: to - - gid: filmSpecies + - id: filmSpecies from: "Film:" to: "Species:" label: "species" @@ -147,7 +147,7 @@ edges: fromField: from toField: to - - gid: speciesFilms + - id: speciesFilms to: "Film:" from: "Species:" label: "films" @@ -157,7 +157,7 @@ edges: toField: from fromField: to - - gid: filmCharacters + - id: filmCharacters from: "Film:" to: "Character:" label: characters @@ -167,7 +167,7 @@ edges: fromField: from toField: to - - gid: characterFilms + - id: characterFilms from: "Character:" to: "Film:" label: films @@ -177,7 +177,7 @@ edges: toField: from fromField: to - - gid: characterStarships + - id: characterStarships from: "Character:" to: "Starship:" label: "starships" @@ -187,7 +187,7 @@ edges: fromField: from toField: to - - gid: starshipCharacters + - id: starshipCharacters to: "Character:" from: "Starship:" label: "pilots" diff --git a/gripper/test-graph/test_gripper.py b/gripper/test-graph/test_gripper.py index 6ee4e4643..40af76a12 100644 --- a/gripper/test-graph/test_gripper.py +++ b/gripper/test-graph/test_gripper.py @@ -39,7 +39,7 @@ def test_plugin_start(self): self.assertTrue(found) with open(os.path.join(BASE, "test-graph/swapi.yaml")) as handle: - mappingGraph = yaml.load(handle.read()) + mappingGraph = yaml.load(handle.read(), Loader=yaml.BaseLoader) conn = gripql.Connection(SERVER) graphName = "posted_tabledata_%s" % (''.join(random.choices(string.ascii_uppercase + string.digits, k=4))) conn.postMapping(graphName, mappingGraph['vertices'], mappingGraph['edges']) @@ -49,7 +49,7 @@ def test_plugin_start(self): G = conn.graph(graphName) count = 0 - for v in G.query().V(): + for v in G.V(): count += 1 self.assertTrue( count == 39 ) except Exception as e: diff --git a/gripql/client.go b/gripql/client.go index 7fd6c8802..9124da46a 100644 --- a/gripql/client.go +++ b/gripql/client.go @@ -32,14 +32,16 @@ func Connect(conf rpc.Config, write bool) (Client, error) { } queryOut := NewQueryClient(conn) var editOut EditClient + var jobOut JobClient if write { editOut = NewEditClient(conn) + jobOut = NewJobClient(conn) } - return Client{queryOut, editOut, nil, nil, conn}, nil + return Client{queryOut, editOut, jobOut, nil, conn}, nil } func (client Client) WithConfigureAPI() Client { - return Client{client.QueryC, client.EditC, nil, NewConfigureClient(client.conn), client.conn} + return Client{client.QueryC, client.EditC, client.JobC, NewConfigureClient(client.conn), client.conn} } // Close the connection @@ -64,6 +66,12 @@ func (client Client) AddSchema(graph *Graph) error { return err } +// AddJsonSchema adds a schema for a graph. +func (client Client) AddJsonSchema(json *RawJson) error { + _, err := client.EditC.AddJsonSchema(context.Background(), json) + return err +} + func (client Client) DeleteEdge(graph string, id string) error { _, err := client.EditC.DeleteEdge(context.Background(), &ElementID{Graph: graph, Id: id}) return err @@ -179,6 +187,26 @@ func (client Client) BulkAdd(elemChan chan *GraphElement) error { return err } +func (client Client) BulkAddRaw(elemChan chan *RawJson) (error, *BulkJsonEditResult) { + sc, err := client.EditC.BulkAddRaw(context.Background()) + if err != nil { + return err, nil + } + for elem := range elemChan { + err := sc.Send(elem) + if err != nil { + return err, nil + } + } + res, err := sc.CloseAndRecv() + return err, res +} + +func (client Client) BulkDelete(delete *DeleteData) error { + _, err := client.EditC.BulkDelete(context.Background(), delete) + return err +} + // GetVertex obtains a vertex from a graph by `id` func (client Client) GetVertex(graph string, id string) (*Vertex, error) { v, err := client.QueryC.GetVertex(context.Background(), &ElementID{Graph: graph, Id: id}) @@ -186,9 +214,9 @@ func (client Client) GetVertex(graph string, id string) (*Vertex, error) { } // Traversal runs a graph traversal query -func (client Client) Traversal(query *GraphQuery) (chan *QueryResult, error) { +func (client Client) Traversal(ctx context.Context, query *GraphQuery) (chan *QueryResult, error) { out := make(chan *QueryResult, 100) - tclient, err := client.QueryC.Traversal(context.Background(), query) + tclient, err := client.QueryC.Traversal(ctx, query) if err != nil { return nil, err } @@ -241,11 +269,9 @@ func (client Client) ListJobs(graph string) ([]*QueryJob, error) { return out, nil } -/* func (client Client) SearchJobs(in *GraphQuery, opts ...grpc.CallOption) (Job_SearchJobsClient, error) { - + return client.JobC.SearchJobs(context.Background(), in) } -*/ func (client Client) Submit(query *GraphQuery) (*QueryJob, error) { return client.JobC.Submit(context.Background(), query) @@ -259,11 +285,86 @@ func (client Client) GetJob(graph string, jobID string) (*JobStatus, error) { return client.JobC.GetJob(context.Background(), &QueryJob{Graph: graph, Id: jobID}) } -/* -func (client Client) ViewJob(in *QueryJob, opts ...grpc.CallOption) (Job_ViewJobClient, error) { +func (client Client) ResumeJob(graph string, jobID string, q *GraphQuery) (chan *QueryResult, error) { + tclient, err := client.JobC.ResumeJob(context.Background(), + &ExtendQuery{Graph: graph, + SrcId: jobID, + Query: q.Query, + }) + + out := make(chan *QueryResult, 100) + + if err != nil { + return nil, err + } + + t, err := tclient.Recv() + if err == io.EOF { + close(out) + return out, nil + } + if err != nil { + close(out) + return out, err + } + out <- t + go func() { + defer close(out) + for { + t, err := tclient.Recv() + if err == io.EOF { + return + } + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("Receiving traversal result") + return + } + out <- t + } + }() + return out, nil +} + +func (client Client) ViewJob(graph string, jobID string, opts ...grpc.CallOption) (chan *QueryResult, error) { + tclient, err := client.JobC.ViewJob(context.Background(), + &QueryJob{Graph: graph, + Id: jobID, + }) + + out := make(chan *QueryResult, 100) + + if err != nil { + return nil, err + } + + t, err := tclient.Recv() + if err == io.EOF { + close(out) + return out, nil + } + if err != nil { + close(out) + return out, err + } + out <- t + + go func() { + defer close(out) + for { + t, err := tclient.Recv() + if err == io.EOF { + return + } + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("Receiving traversal result") + return + } + out <- t + } + }() + return out, nil } -*/ // ListDrivers lists avalible drivers func (client Client) ListDrivers() (*ListDriversResponse, error) { diff --git a/gripql/custom_statements.go b/gripql/custom_statements.go index c65bcb8f1..e9cbc7929 100644 --- a/gripql/custom_statements.go +++ b/gripql/custom_statements.go @@ -7,11 +7,11 @@ package gripql //in the traversal that the optimizer may add in, but can't be coded by a //serialized user request -type GraphStatement_LookupVertsIndex struct { +type GraphStatement_LookupVertsLabelIndex struct { Labels []string `protobuf:"bytes,1,rep,name=labels" json:"labels,omitempty"` } -func (*GraphStatement_LookupVertsIndex) isGraphStatement_Statement() {} +func (*GraphStatement_LookupVertsLabelIndex) isGraphStatement_Statement() {} type GraphStatement_EngineCustom struct { Desc string `protobuf:"bytes,1,opt,name=desc" json:"desc,omitempty"` diff --git a/gripql/example/data.go b/gripql/example/data.go index 14fcb5f16..3ac3d3cf4 100644 --- a/gripql/example/data.go +++ b/gripql/example/data.go @@ -12,7 +12,7 @@ func makeStruct(m map[string]interface{}) *structpb.Struct { // SWVertices are the vertices for the test graph var SWVertices = []*gripql.Vertex{ - {Gid: "1000", Label: "Human", Data: makeStruct( + {Id: "1000", Label: "Human", Data: makeStruct( map[string]interface{}{ "name": "Luke Skywalker", "height": 1.72, @@ -20,7 +20,7 @@ var SWVertices = []*gripql.Vertex{ "homePlanet": "Tatooine", }, )}, - {Gid: "1001", Label: "Human", Data: makeStruct( + {Id: "1001", Label: "Human", Data: makeStruct( map[string]interface{}{ "name": "Darth Vader", "height": 2.02, @@ -28,14 +28,14 @@ var SWVertices = []*gripql.Vertex{ "homePlanet": "Tatooine", }, )}, - {Gid: "1002", Label: "Human", Data: makeStruct( + {Id: "1002", Label: "Human", Data: makeStruct( map[string]interface{}{ "name": "Han Solo", "height": 1.8, "mass": 80, }, )}, - {Gid: "1003", Label: "Human", Data: makeStruct( + {Id: "1003", Label: "Human", Data: makeStruct( map[string]interface{}{ "name": "Leia Organa", "height": 1.5, @@ -43,60 +43,60 @@ var SWVertices = []*gripql.Vertex{ "homePlanet": "Alderaan", }, )}, - {Gid: "1004", Label: "Human", Data: makeStruct( + {Id: "1004", Label: "Human", Data: makeStruct( map[string]interface{}{ "name": "Wilhuff Tarkin", "height": 1.8, "mass": nil, }, )}, - {Gid: "2000", Label: "Droid", Data: makeStruct( + {Id: "2000", Label: "Droid", Data: makeStruct( map[string]interface{}{ "name": "C-3PO", "primaryFunction": "Protocol", }, )}, - {Gid: "2001", Label: "Droid", Data: makeStruct( + {Id: "2001", Label: "Droid", Data: makeStruct( map[string]interface{}{ "name": "R2-D2", "primaryFunction": "Astromech", }, )}, - {Gid: "3000", Label: "Starship", Data: makeStruct( + {Id: "3000", Label: "Starship", Data: makeStruct( map[string]interface{}{ "name": "Millennium Falcon", "length": 34.37, }, )}, - {Gid: "3001", Label: "Starship", Data: makeStruct( + {Id: "3001", Label: "Starship", Data: makeStruct( map[string]interface{}{ "name": "X-Wing", "length": 34.37, }, )}, - {Gid: "3002", Label: "Starship", Data: makeStruct( + {Id: "3002", Label: "Starship", Data: makeStruct( map[string]interface{}{ "name": "TIE Advanced x1", "length": 9.2, }, )}, - {Gid: "3003", Label: "Starship", Data: makeStruct( + {Id: "3003", Label: "Starship", Data: makeStruct( map[string]interface{}{ "name": "Imperial shuttle", "length": 20, }, )}, - {Gid: "4000", Label: "Movie", Data: makeStruct( + {Id: "4000", Label: "Movie", Data: makeStruct( map[string]interface{}{ "name": "A New Hope", }, )}, - {Gid: "4001", Label: "Movie", Data: makeStruct( + {Id: "4001", Label: "Movie", Data: makeStruct( map[string]interface{}{ "name": "Empire Strikes Back", }, )}, - {Gid: "4002", Label: "Movie", Data: makeStruct( + {Id: "4002", Label: "Movie", Data: makeStruct( map[string]interface{}{ "name": "The Return of the Jedi", }, diff --git a/gripql/graph.go b/gripql/graph.go deleted file mode 100644 index 777a3f4a9..000000000 --- a/gripql/graph.go +++ /dev/null @@ -1,193 +0,0 @@ -package gripql - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "path/filepath" - - "google.golang.org/protobuf/encoding/protojson" - "sigs.k8s.io/yaml" -) - -// ParseYAMLGraph parses a YAML doc into the given Graph instance. -func ParseYAMLGraph(raw []byte) (*Graph, error) { - tmp := map[string]interface{}{} - err := yaml.Unmarshal(raw, &tmp) - if err != nil { - return nil, err - } - part, err := json.Marshal(tmp) - if err != nil { - return nil, err - } - g := &Graph{} - err = protojson.Unmarshal(part, g) - if err != nil { - return nil, err - } - return g, nil -} - -func ParseYAMLGraphPath(relpath string) (*Graph, error) { - // Try to get absolute path. If it fails, fall back to relative path. - path, err := filepath.Abs(relpath) - if err != nil { - path = relpath - } - // Read file - source, err := ioutil.ReadFile(path) - if err != nil { - return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err) - } - return ParseYAMLGraph(source) -} - -// ParseYAMLGraph parses a YAML doc into the given Graph instance. -func ParseYAMLGraphs(raw []byte) ([]*Graph, error) { - graphs := []*Graph{} - tmp := []interface{}{} - err := yaml.Unmarshal(raw, &tmp) - if err != nil { - var tmp2 interface{} - err := yaml.Unmarshal(raw, &tmp2) - if err != nil { - return nil, err - } - tmp = append(tmp, tmp2) - } - for _, s := range tmp { - part, err := json.Marshal(s) - if err != nil { - return nil, err - } - g := &Graph{} - err = protojson.Unmarshal(part, g) - if err != nil { - return nil, err - } - if g.Graph == "" { - return nil, fmt.Errorf("missing graph name") - } - graphs = append(graphs, g) - } - return graphs, nil -} - -// ParseJSONGraph parses a JSON doc into the given Graph instance. -func ParseJSONGraphs(raw []byte) ([]*Graph, error) { - graphs := []*Graph{} - tmp := []interface{}{} - err := json.Unmarshal(raw, &tmp) - if err != nil { - var tmp2 interface{} - err := json.Unmarshal(raw, &tmp2) - if err != nil { - return nil, err - } - tmp = append(tmp, tmp2) - } - for _, s := range tmp { - part, err := json.Marshal(s) - if err != nil { - return nil, err - } - g := &Graph{} - err = protojson.Unmarshal(part, g) - if err != nil { - return nil, err - } - if g.Graph == "" { - return nil, fmt.Errorf("missing graph name") - } - graphs = append(graphs, g) - } - return graphs, nil -} - -// ParseGraphYAMLFile parses a graph file, which is formatted in YAML, -// and returns a slice of graph objects. -func parseGraphFile(relpath string, format string) ([]*Graph, error) { - var graphs []*Graph - var err error - - if relpath == "" { - return nil, fmt.Errorf("path is empty") - } - - // Try to get absolute path. If it fails, fall back to relative path. - path, err := filepath.Abs(relpath) - if err != nil { - path = relpath - } - - // Read file - source, err := ioutil.ReadFile(path) - if err != nil { - return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err) - } - - // Parse file contents - switch format { - case "yaml": - graphs, err = ParseYAMLGraphs(source) - case "json": - graphs, err = ParseJSONGraphs(source) - default: - err = fmt.Errorf("unknown file format: %s", format) - } - if err != nil { - return nil, fmt.Errorf("failed to parse graph at path %s: \n%v", path, err) - } - return graphs, nil -} - -// ParseYAMLGraphFile parses a graph file, which is formatted in YAML, -// and returns a slice of graph objects. -func ParseYAMLGraphsFile(relpath string) ([]*Graph, error) { - return parseGraphFile(relpath, "yaml") -} - -// ParseJSONGraphFile parses a graph file, which is formatted in JSON, -// and returns a slice of graph objects. -func ParseJSONGraphsFile(relpath string) ([]*Graph, error) { - return parseGraphFile(relpath, "json") -} - -// GraphToYAMLString returns a graph formatted as a YAML string -func GraphToYAMLString(graph *Graph) (string, error) { - out, err := protojson.Marshal(graph) - if err != nil { - return "", fmt.Errorf("failed to marshal graph: %v", err) - } - sb, err := yaml.JSONToYAML(out) - if err != nil { - return "", fmt.Errorf("failed to marshal graph: %v", err) - } - return string(sb), nil -} - -// GraphToJSONString returns a graph formatted as a JSON string -func GraphToJSONString(graph *Graph) (string, error) { - m := protojson.MarshalOptions{ - UseEnumNumbers: false, - EmitUnpopulated: false, - Indent: " ", - UseProtoNames: false, - } - txt := m.Format(graph) - return txt, nil -} - -func GraphMapToProto(data map[string]interface{}) (*Graph, error) { - part, err := json.Marshal(data) - if err != nil { - return nil, err - } - g := &Graph{} - err = protojson.Unmarshal(part, g) - if err != nil { - return nil, err - } - return g, nil -} diff --git a/gripql/gripql.gw.client.go b/gripql/gripql.gw.client.go deleted file mode 100644 index 643d34e83..000000000 --- a/gripql/gripql.gw.client.go +++ /dev/null @@ -1,306 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway-client. DO NOT EDIT. -// source: gripql.proto - -package gripql - -import ( - context "context" - fmt "fmt" - gateway "github.com/akuity/grpc-gateway-client/pkg/grpc/gateway" -) - -// QueryGatewayClient is the interface for Query service client. -type QueryGatewayClient interface { - Traversal(context.Context, *GraphQuery) (<-chan *QueryResult, <-chan error, error) - GetVertex(context.Context, *ElementID) (*Vertex, error) - GetEdge(context.Context, *ElementID) (*Edge, error) - GetTimestamp(context.Context, *GraphID) (*Timestamp, error) - GetSchema(context.Context, *GraphID) (*Graph, error) - GetMapping(context.Context, *GraphID) (*Graph, error) - ListGraphs(context.Context, *Empty) (*ListGraphsResponse, error) - ListIndices(context.Context, *GraphID) (*ListIndicesResponse, error) - ListLabels(context.Context, *GraphID) (*ListLabelsResponse, error) - ListTables(context.Context, *Empty) (<-chan *TableInfo, <-chan error, error) -} - -func NewQueryGatewayClient(c gateway.Client) QueryGatewayClient { - return &queryGatewayClient{ - gwc: c, - } -} - -type queryGatewayClient struct { - gwc gateway.Client -} - -func (c *queryGatewayClient) Traversal(ctx context.Context, req *GraphQuery) (<-chan *QueryResult, <-chan error, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/query") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoStreamingRequest[QueryResult](ctx, c.gwc, gwReq) -} - -func (c *queryGatewayClient) GetVertex(ctx context.Context, req *ElementID) (*Vertex, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/vertex/{id}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - return gateway.DoRequest[Vertex](ctx, gwReq) -} - -func (c *queryGatewayClient) GetEdge(ctx context.Context, req *ElementID) (*Edge, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/edge/{id}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - return gateway.DoRequest[Edge](ctx, gwReq) -} - -func (c *queryGatewayClient) GetTimestamp(ctx context.Context, req *GraphID) (*Timestamp, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/timestamp") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[Timestamp](ctx, gwReq) -} - -func (c *queryGatewayClient) GetSchema(ctx context.Context, req *GraphID) (*Graph, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/schema") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[Graph](ctx, gwReq) -} - -func (c *queryGatewayClient) GetMapping(ctx context.Context, req *GraphID) (*Graph, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/mapping") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[Graph](ctx, gwReq) -} - -func (c *queryGatewayClient) ListGraphs(ctx context.Context, req *Empty) (*ListGraphsResponse, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph") - return gateway.DoRequest[ListGraphsResponse](ctx, gwReq) -} - -func (c *queryGatewayClient) ListIndices(ctx context.Context, req *GraphID) (*ListIndicesResponse, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/index") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[ListIndicesResponse](ctx, gwReq) -} - -func (c *queryGatewayClient) ListLabels(ctx context.Context, req *GraphID) (*ListLabelsResponse, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/label") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[ListLabelsResponse](ctx, gwReq) -} - -func (c *queryGatewayClient) ListTables(ctx context.Context, req *Empty) (<-chan *TableInfo, <-chan error, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/table") - return gateway.DoStreamingRequest[TableInfo](ctx, c.gwc, gwReq) -} - -// JobGatewayClient is the interface for Job service client. -type JobGatewayClient interface { - Submit(context.Context, *GraphQuery) (*QueryJob, error) - ListJobs(context.Context, *GraphID) (<-chan *QueryJob, <-chan error, error) - SearchJobs(context.Context, *GraphQuery) (<-chan *JobStatus, <-chan error, error) - DeleteJob(context.Context, *QueryJob) (*JobStatus, error) - GetJob(context.Context, *QueryJob) (*JobStatus, error) - ViewJob(context.Context, *QueryJob) (<-chan *QueryResult, <-chan error, error) - ResumeJob(context.Context, *ExtendQuery) (<-chan *QueryResult, <-chan error, error) -} - -func NewJobGatewayClient(c gateway.Client) JobGatewayClient { - return &jobGatewayClient{ - gwc: c, - } -} - -type jobGatewayClient struct { - gwc gateway.Client -} - -func (c *jobGatewayClient) Submit(ctx context.Context, req *GraphQuery) (*QueryJob, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/job") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[QueryJob](ctx, gwReq) -} - -func (c *jobGatewayClient) ListJobs(ctx context.Context, req *GraphID) (<-chan *QueryJob, <-chan error, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/job") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoStreamingRequest[QueryJob](ctx, c.gwc, gwReq) -} - -func (c *jobGatewayClient) SearchJobs(ctx context.Context, req *GraphQuery) (<-chan *JobStatus, <-chan error, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/job-search") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoStreamingRequest[JobStatus](ctx, c.gwc, gwReq) -} - -func (c *jobGatewayClient) DeleteJob(ctx context.Context, req *QueryJob) (*JobStatus, error) { - gwReq := c.gwc.NewRequest("DELETE", "/v1/graph/{graph}/job/{id}") - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[JobStatus](ctx, gwReq) -} - -func (c *jobGatewayClient) GetJob(ctx context.Context, req *QueryJob) (*JobStatus, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/job/{id}") - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[JobStatus](ctx, gwReq) -} - -func (c *jobGatewayClient) ViewJob(ctx context.Context, req *QueryJob) (<-chan *QueryResult, <-chan error, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/job/{id}") - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoStreamingRequest[QueryResult](ctx, c.gwc, gwReq) -} - -func (c *jobGatewayClient) ResumeJob(ctx context.Context, req *ExtendQuery) (<-chan *QueryResult, <-chan error, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/job-resume") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoStreamingRequest[QueryResult](ctx, c.gwc, gwReq) -} - -// EditGatewayClient is the interface for Edit service client. -type EditGatewayClient interface { - AddVertex(context.Context, *GraphElement) (*EditResult, error) - AddEdge(context.Context, *GraphElement) (*EditResult, error) - AddGraph(context.Context, *GraphID) (*EditResult, error) - DeleteGraph(context.Context, *GraphID) (*EditResult, error) - DeleteVertex(context.Context, *ElementID) (*EditResult, error) - DeleteEdge(context.Context, *ElementID) (*EditResult, error) - AddIndex(context.Context, *IndexID) (*EditResult, error) - DeleteIndex(context.Context, *IndexID) (*EditResult, error) - AddSchema(context.Context, *Graph) (*EditResult, error) - SampleSchema(context.Context, *GraphID) (*Graph, error) - AddMapping(context.Context, *Graph) (*EditResult, error) -} - -func NewEditGatewayClient(c gateway.Client) EditGatewayClient { - return &editGatewayClient{ - gwc: c, - } -} - -type editGatewayClient struct { - gwc gateway.Client -} - -func (c *editGatewayClient) AddVertex(ctx context.Context, req *GraphElement) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/vertex") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req.Vertex) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) AddEdge(ctx context.Context, req *GraphElement) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/edge") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req.Edge) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) AddGraph(ctx context.Context, req *GraphID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) DeleteGraph(ctx context.Context, req *GraphID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("DELETE", "/v1/graph/{graph}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) DeleteVertex(ctx context.Context, req *ElementID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("DELETE", "/v1/graph/{graph}/vertex/{id}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) DeleteEdge(ctx context.Context, req *ElementID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("DELETE", "/v1/graph/{graph}/edge/{id}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("id", fmt.Sprintf("%v", req.Id)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) AddIndex(ctx context.Context, req *IndexID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/index/{label}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("label", fmt.Sprintf("%v", req.Label)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) DeleteIndex(ctx context.Context, req *IndexID) (*EditResult, error) { - gwReq := c.gwc.NewRequest("DELETE", "/v1/graph/{graph}/index/{label}/{field}") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetPathParam("label", fmt.Sprintf("%v", req.Label)) - gwReq.SetPathParam("field", fmt.Sprintf("%v", req.Field)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) AddSchema(ctx context.Context, req *Graph) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/schema") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -func (c *editGatewayClient) SampleSchema(ctx context.Context, req *GraphID) (*Graph, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/schema-sample") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - return gateway.DoRequest[Graph](ctx, gwReq) -} - -func (c *editGatewayClient) AddMapping(ctx context.Context, req *Graph) (*EditResult, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/mapping") - gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph)) - gwReq.SetBody(req) - return gateway.DoRequest[EditResult](ctx, gwReq) -} - -// ConfigureGatewayClient is the interface for Configure service client. -type ConfigureGatewayClient interface { - StartPlugin(context.Context, *PluginConfig) (*PluginStatus, error) - ListPlugins(context.Context, *Empty) (*ListPluginsResponse, error) - ListDrivers(context.Context, *Empty) (*ListDriversResponse, error) -} - -func NewConfigureGatewayClient(c gateway.Client) ConfigureGatewayClient { - return &configureGatewayClient{ - gwc: c, - } -} - -type configureGatewayClient struct { - gwc gateway.Client -} - -func (c *configureGatewayClient) StartPlugin(ctx context.Context, req *PluginConfig) (*PluginStatus, error) { - gwReq := c.gwc.NewRequest("POST", "/v1/plugin/{name}") - gwReq.SetPathParam("name", fmt.Sprintf("%v", req.Name)) - gwReq.SetBody(req) - return gateway.DoRequest[PluginStatus](ctx, gwReq) -} - -func (c *configureGatewayClient) ListPlugins(ctx context.Context, req *Empty) (*ListPluginsResponse, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/plugin") - return gateway.DoRequest[ListPluginsResponse](ctx, gwReq) -} - -func (c *configureGatewayClient) ListDrivers(ctx context.Context, req *Empty) (*ListDriversResponse, error) { - gwReq := c.gwc.NewRequest("GET", "/v1/driver") - return gateway.DoRequest[ListDriversResponse](ctx, gwReq) -} diff --git a/gripql/gripql.pb.dgw.go b/gripql/gripql.pb.dgw.go index 1992394da..8d04c81ef 100644 --- a/gripql/gripql.pb.dgw.go +++ b/gripql/gripql.pb.dgw.go @@ -874,6 +874,84 @@ func (shim *EditDirectClient) BulkAdd(ctx context.Context, opts ...grpc.CallOpti } +// Streaming data 'server' shim. Provides the Send/Recv funcs expected by the +// user server code when dealing with a streaming input + +/* Start EditBulkAddRaw streaming input server */ +type directEditBulkAddRaw struct { + ctx context.Context + c chan *RawJson + out chan *BulkJsonEditResult +} + +func (dsm *directEditBulkAddRaw) Recv() (*RawJson, error) { + value, ok := <-dsm.c + if !ok { + return nil, io.EOF + } + return value, nil +} + +func (dsm *directEditBulkAddRaw) Send(a *RawJson) error { + dsm.c <- a + return nil +} + +func (dsm *directEditBulkAddRaw) Context() context.Context { + return dsm.ctx +} + +func (dsm *directEditBulkAddRaw) SendAndClose(o *BulkJsonEditResult) error { + dsm.out <- o + close(dsm.out) + return nil +} + +func (dsm *directEditBulkAddRaw) CloseAndRecv() (*BulkJsonEditResult, error) { + //close(dsm.c) + out := <- dsm.out + return out, nil +} + +func (dsm *directEditBulkAddRaw) CloseSend() error { close(dsm.c); return nil } +func (dsm *directEditBulkAddRaw) SetTrailer(metadata.MD) {} +func (dsm *directEditBulkAddRaw) SetHeader(metadata.MD) error { return nil } +func (dsm *directEditBulkAddRaw) SendHeader(metadata.MD) error { return nil } +func (dsm *directEditBulkAddRaw) SendMsg(m interface{}) error { dsm.out <- m.(*BulkJsonEditResult); return nil } + +func (dsm *directEditBulkAddRaw) RecvMsg(m interface{}) error { + t, err := dsm.Recv() + mPtr := m.(*RawJson) + if t != nil { + *mPtr = *t + } + return err +} + +func (dsm *directEditBulkAddRaw) Header() (metadata.MD, error) { return nil, nil } +func (dsm *directEditBulkAddRaw) Trailer() metadata.MD { return nil } +/* End EditBulkAddRaw streaming input server */ + + +func (shim *EditDirectClient) BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddRawClient, error) { + md, _ := metadata.FromOutgoingContext(ctx) + ictx := metadata.NewIncomingContext(ctx, md) + w := &directEditBulkAddRaw{ictx, make(chan *RawJson, 100), make(chan *BulkJsonEditResult, 3)} + if shim.streamServerInt != nil { + info := grpc.StreamServerInfo{ + FullMethod: "/gripql.Edit/BulkAddRaw", + IsClientStream: true, + } + go shim.streamServerInt(shim.server, w, &info, _Edit_BulkAddRaw_Handler) + return w, nil + } + go func() { + shim.server.BulkAddRaw(w) + }() + return w, nil +} + + //AddGraph shim func (shim *EditDirectClient) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) { md, _ := metadata.FromOutgoingContext(ctx) @@ -914,6 +992,26 @@ func (shim *EditDirectClient) DeleteGraph(ctx context.Context, in *GraphID, opts return shim.server.DeleteGraph(ictx, in) } +//BulkDelete shim +func (shim *EditDirectClient) BulkDelete(ctx context.Context, in *DeleteData, opts ...grpc.CallOption) (*EditResult, error) { + md, _ := metadata.FromOutgoingContext(ctx) + ictx := metadata.NewIncomingContext(ctx, md) + if shim.unaryServerInt != nil { + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return shim.server.BulkDelete(ctx, req.(*DeleteData)) + } + info := grpc.UnaryServerInfo{ + FullMethod: "/gripql.Edit/BulkDelete", + } + o, err := shim.unaryServerInt(ictx, in, &info, handler) + if o == nil { + return nil, err + } + return o.(*EditResult), err + } + return shim.server.BulkDelete(ictx, in) +} + //DeleteVertex shim func (shim *EditDirectClient) DeleteVertex(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*EditResult, error) { md, _ := metadata.FromOutgoingContext(ctx) @@ -1014,6 +1112,26 @@ func (shim *EditDirectClient) AddSchema(ctx context.Context, in *Graph, opts ... return shim.server.AddSchema(ictx, in) } +//AddJsonSchema shim +func (shim *EditDirectClient) AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error) { + md, _ := metadata.FromOutgoingContext(ctx) + ictx := metadata.NewIncomingContext(ctx, md) + if shim.unaryServerInt != nil { + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return shim.server.AddJsonSchema(ctx, req.(*RawJson)) + } + info := grpc.UnaryServerInfo{ + FullMethod: "/gripql.Edit/AddJsonSchema", + } + o, err := shim.unaryServerInt(ictx, in, &info, handler) + if o == nil { + return nil, err + } + return o.(*EditResult), err + } + return shim.server.AddJsonSchema(ictx, in) +} + //SampleSchema shim func (shim *EditDirectClient) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) { md, _ := metadata.FromOutgoingContext(ctx) diff --git a/gripql/gripql.pb.go b/gripql/gripql.pb.go index 2664b202a..eabd768af 100644 --- a/gripql/gripql.pb.go +++ b/gripql/gripql.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc-gen-go v1.34.2 +// protoc v5.29.3 // source: gripql.proto package gripql @@ -387,7 +387,6 @@ type GraphStatement struct { // Types that are assignable to Statement: // // *GraphStatement_V - // *GraphStatement_E // *GraphStatement_In // *GraphStatement_Out // *GraphStatement_Both @@ -408,12 +407,16 @@ type GraphStatement struct { // *GraphStatement_HasKey // *GraphStatement_HasId // *GraphStatement_Distinct + // *GraphStatement_Pivot // *GraphStatement_Fields // *GraphStatement_Unwind + // *GraphStatement_Group + // *GraphStatement_Totype // *GraphStatement_Count // *GraphStatement_Aggregate // *GraphStatement_Render // *GraphStatement_Path + // *GraphStatement_Sort // *GraphStatement_Mark // *GraphStatement_Jump // *GraphStatement_Set @@ -467,13 +470,6 @@ func (x *GraphStatement) GetV() *structpb.ListValue { return nil } -func (x *GraphStatement) GetE() *structpb.ListValue { - if x, ok := x.GetStatement().(*GraphStatement_E); ok { - return x.E - } - return nil -} - func (x *GraphStatement) GetIn() *structpb.ListValue { if x, ok := x.GetStatement().(*GraphStatement_In); ok { return x.In @@ -551,11 +547,11 @@ func (x *GraphStatement) GetAs() string { return "" } -func (x *GraphStatement) GetSelect() *SelectStatement { +func (x *GraphStatement) GetSelect() string { if x, ok := x.GetStatement().(*GraphStatement_Select); ok { return x.Select } - return nil + return "" } func (x *GraphStatement) GetLimit() uint32 { @@ -614,6 +610,13 @@ func (x *GraphStatement) GetDistinct() *structpb.ListValue { return nil } +func (x *GraphStatement) GetPivot() *PivotStep { + if x, ok := x.GetStatement().(*GraphStatement_Pivot); ok { + return x.Pivot + } + return nil +} + func (x *GraphStatement) GetFields() *structpb.ListValue { if x, ok := x.GetStatement().(*GraphStatement_Fields); ok { return x.Fields @@ -628,6 +631,20 @@ func (x *GraphStatement) GetUnwind() string { return "" } +func (x *GraphStatement) GetGroup() *Group { + if x, ok := x.GetStatement().(*GraphStatement_Group); ok { + return x.Group + } + return nil +} + +func (x *GraphStatement) GetTotype() *ToType { + if x, ok := x.GetStatement().(*GraphStatement_Totype); ok { + return x.Totype + } + return nil +} + func (x *GraphStatement) GetCount() string { if x, ok := x.GetStatement().(*GraphStatement_Count); ok { return x.Count @@ -656,6 +673,13 @@ func (x *GraphStatement) GetPath() *structpb.ListValue { return nil } +func (x *GraphStatement) GetSort() *Sorting { + if x, ok := x.GetStatement().(*GraphStatement_Sort); ok { + return x.Sort + } + return nil +} + func (x *GraphStatement) GetMark() string { if x, ok := x.GetStatement().(*GraphStatement_Mark); ok { return x.Mark @@ -692,10 +716,6 @@ type GraphStatement_V struct { V *structpb.ListValue `protobuf:"bytes,1,opt,name=v,proto3,oneof"` } -type GraphStatement_E struct { - E *structpb.ListValue `protobuf:"bytes,2,opt,name=e,proto3,oneof"` -} - type GraphStatement_In struct { In *structpb.ListValue `protobuf:"bytes,10,opt,name=in,proto3,oneof"` } @@ -741,7 +761,7 @@ type GraphStatement_As struct { } type GraphStatement_Select struct { - Select *SelectStatement `protobuf:"bytes,21,opt,name=select,proto3,oneof"` + Select string `protobuf:"bytes,21,opt,name=select,proto3,oneof"` } type GraphStatement_Limit struct { @@ -776,6 +796,10 @@ type GraphStatement_Distinct struct { Distinct *structpb.ListValue `protobuf:"bytes,40,opt,name=distinct,proto3,oneof"` } +type GraphStatement_Pivot struct { + Pivot *PivotStep `protobuf:"bytes,41,opt,name=pivot,proto3,oneof"` +} + type GraphStatement_Fields struct { Fields *structpb.ListValue `protobuf:"bytes,50,opt,name=fields,proto3,oneof"` } @@ -784,6 +808,14 @@ type GraphStatement_Unwind struct { Unwind string `protobuf:"bytes,51,opt,name=unwind,proto3,oneof"` } +type GraphStatement_Group struct { + Group *Group `protobuf:"bytes,52,opt,name=group,proto3,oneof"` +} + +type GraphStatement_Totype struct { + Totype *ToType `protobuf:"bytes,53,opt,name=totype,proto3,oneof"` +} + type GraphStatement_Count struct { Count string `protobuf:"bytes,60,opt,name=count,proto3,oneof"` } @@ -800,6 +832,10 @@ type GraphStatement_Path struct { Path *structpb.ListValue `protobuf:"bytes,63,opt,name=path,proto3,oneof"` } +type GraphStatement_Sort struct { + Sort *Sorting `protobuf:"bytes,65,opt,name=sort,proto3,oneof"` +} + type GraphStatement_Mark struct { Mark string `protobuf:"bytes,70,opt,name=mark,proto3,oneof"` } @@ -818,8 +854,6 @@ type GraphStatement_Increment struct { func (*GraphStatement_V) isGraphStatement_Statement() {} -func (*GraphStatement_E) isGraphStatement_Statement() {} - func (*GraphStatement_In) isGraphStatement_Statement() {} func (*GraphStatement_Out) isGraphStatement_Statement() {} @@ -860,10 +894,16 @@ func (*GraphStatement_HasId) isGraphStatement_Statement() {} func (*GraphStatement_Distinct) isGraphStatement_Statement() {} +func (*GraphStatement_Pivot) isGraphStatement_Statement() {} + func (*GraphStatement_Fields) isGraphStatement_Statement() {} func (*GraphStatement_Unwind) isGraphStatement_Statement() {} +func (*GraphStatement_Group) isGraphStatement_Statement() {} + +func (*GraphStatement_Totype) isGraphStatement_Statement() {} + func (*GraphStatement_Count) isGraphStatement_Statement() {} func (*GraphStatement_Aggregate) isGraphStatement_Statement() {} @@ -872,6 +912,8 @@ func (*GraphStatement_Render) isGraphStatement_Statement() {} func (*GraphStatement_Path) isGraphStatement_Statement() {} +func (*GraphStatement_Sort) isGraphStatement_Statement() {} + func (*GraphStatement_Mark) isGraphStatement_Statement() {} func (*GraphStatement_Jump) isGraphStatement_Statement() {} @@ -1479,6 +1521,171 @@ func (*CountAggregation) Descriptor() ([]byte, []int) { return file_gripql_proto_rawDescGZIP(), []int{13} } +type Group struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Fields map[string]string `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` +} + +func (x *Group) Reset() { + *x = Group{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Group) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Group) ProtoMessage() {} + +func (x *Group) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[14] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Group.ProtoReflect.Descriptor instead. +func (*Group) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{14} +} + +func (x *Group) GetFields() map[string]string { + if x != nil { + return x.Fields + } + return nil +} + +type ToType struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Field string `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"` + TypeName string `protobuf:"bytes,2,opt,name=type_name,json=typeName,proto3" json:"type_name,omitempty"` +} + +func (x *ToType) Reset() { + *x = ToType{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ToType) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ToType) ProtoMessage() {} + +func (x *ToType) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ToType.ProtoReflect.Descriptor instead. +func (*ToType) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{15} +} + +func (x *ToType) GetField() string { + if x != nil { + return x.Field + } + return "" +} + +func (x *ToType) GetTypeName() string { + if x != nil { + return x.TypeName + } + return "" +} + +type PivotStep struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Field string `protobuf:"bytes,2,opt,name=field,proto3" json:"field,omitempty"` + Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` +} + +func (x *PivotStep) Reset() { + *x = PivotStep{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PivotStep) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PivotStep) ProtoMessage() {} + +func (x *PivotStep) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PivotStep.ProtoReflect.Descriptor instead. +func (*PivotStep) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{16} +} + +func (x *PivotStep) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *PivotStep) GetField() string { + if x != nil { + return x.Field + } + return "" +} + +func (x *PivotStep) GetValue() string { + if x != nil { + return x.Value + } + return "" +} + type NamedAggregationResult struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1492,7 +1699,7 @@ type NamedAggregationResult struct { func (x *NamedAggregationResult) Reset() { *x = NamedAggregationResult{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[14] + mi := &file_gripql_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1505,7 +1712,7 @@ func (x *NamedAggregationResult) String() string { func (*NamedAggregationResult) ProtoMessage() {} func (x *NamedAggregationResult) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[14] + mi := &file_gripql_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1518,7 +1725,7 @@ func (x *NamedAggregationResult) ProtoReflect() protoreflect.Message { // Deprecated: Use NamedAggregationResult.ProtoReflect.Descriptor instead. func (*NamedAggregationResult) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{14} + return file_gripql_proto_rawDescGZIP(), []int{17} } func (x *NamedAggregationResult) GetName() string { @@ -1553,7 +1760,7 @@ type HasExpressionList struct { func (x *HasExpressionList) Reset() { *x = HasExpressionList{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[15] + mi := &file_gripql_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1566,7 +1773,7 @@ func (x *HasExpressionList) String() string { func (*HasExpressionList) ProtoMessage() {} func (x *HasExpressionList) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[15] + mi := &file_gripql_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1579,7 +1786,7 @@ func (x *HasExpressionList) ProtoReflect() protoreflect.Message { // Deprecated: Use HasExpressionList.ProtoReflect.Descriptor instead. func (*HasExpressionList) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{15} + return file_gripql_proto_rawDescGZIP(), []int{18} } func (x *HasExpressionList) GetExpressions() []*HasExpression { @@ -1606,7 +1813,7 @@ type HasExpression struct { func (x *HasExpression) Reset() { *x = HasExpression{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[16] + mi := &file_gripql_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1619,7 +1826,7 @@ func (x *HasExpression) String() string { func (*HasExpression) ProtoMessage() {} func (x *HasExpression) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[16] + mi := &file_gripql_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1632,7 +1839,7 @@ func (x *HasExpression) ProtoReflect() protoreflect.Message { // Deprecated: Use HasExpression.ProtoReflect.Descriptor instead. func (*HasExpression) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{16} + return file_gripql_proto_rawDescGZIP(), []int{19} } func (m *HasExpression) GetExpression() isHasExpression_Expression { @@ -1711,7 +1918,7 @@ type HasCondition struct { func (x *HasCondition) Reset() { *x = HasCondition{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[17] + mi := &file_gripql_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1724,7 +1931,7 @@ func (x *HasCondition) String() string { func (*HasCondition) ProtoMessage() {} func (x *HasCondition) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[17] + mi := &file_gripql_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1737,7 +1944,7 @@ func (x *HasCondition) ProtoReflect() protoreflect.Message { // Deprecated: Use HasCondition.ProtoReflect.Descriptor instead. func (*HasCondition) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{17} + return file_gripql_proto_rawDescGZIP(), []int{20} } func (x *HasCondition) GetKey() string { @@ -1761,31 +1968,31 @@ func (x *HasCondition) GetCondition() Condition { return Condition_UNKNOWN_CONDITION } -type SelectStatement struct { +type Sorting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Marks []string `protobuf:"bytes,1,rep,name=marks,proto3" json:"marks,omitempty"` + Fields []*SortField `protobuf:"bytes,1,rep,name=fields,proto3" json:"fields,omitempty"` } -func (x *SelectStatement) Reset() { - *x = SelectStatement{} +func (x *Sorting) Reset() { + *x = Sorting{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[18] + mi := &file_gripql_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } } -func (x *SelectStatement) String() string { +func (x *Sorting) String() string { return protoimpl.X.MessageStringOf(x) } -func (*SelectStatement) ProtoMessage() {} +func (*Sorting) ProtoMessage() {} -func (x *SelectStatement) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[18] +func (x *Sorting) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1796,47 +2003,44 @@ func (x *SelectStatement) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use SelectStatement.ProtoReflect.Descriptor instead. -func (*SelectStatement) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{18} +// Deprecated: Use Sorting.ProtoReflect.Descriptor instead. +func (*Sorting) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{21} } -func (x *SelectStatement) GetMarks() []string { +func (x *Sorting) GetFields() []*SortField { if x != nil { - return x.Marks + return x.Fields } return nil } -type Selection struct { +type SortField struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // Types that are assignable to Result: - // - // *Selection_Vertex - // *Selection_Edge - Result isSelection_Result `protobuf_oneof:"result"` + Field string `protobuf:"bytes,1,opt,name=field,proto3" json:"field,omitempty"` + Descending bool `protobuf:"varint,2,opt,name=descending,proto3" json:"descending,omitempty"` } -func (x *Selection) Reset() { - *x = Selection{} +func (x *SortField) Reset() { + *x = SortField{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[19] + mi := &file_gripql_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } } -func (x *Selection) String() string { +func (x *SortField) String() string { return protoimpl.X.MessageStringOf(x) } -func (*Selection) ProtoMessage() {} +func (*SortField) ProtoMessage() {} -func (x *Selection) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[19] +func (x *SortField) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1847,38 +2051,143 @@ func (x *Selection) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use Selection.ProtoReflect.Descriptor instead. -func (*Selection) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{19} +// Deprecated: Use SortField.ProtoReflect.Descriptor instead. +func (*SortField) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{22} } -func (m *Selection) GetResult() isSelection_Result { - if m != nil { - return m.Result +func (x *SortField) GetField() string { + if x != nil { + return x.Field } - return nil + return "" } -func (x *Selection) GetVertex() *Vertex { - if x, ok := x.GetResult().(*Selection_Vertex); ok { - return x.Vertex +func (x *SortField) GetDescending() bool { + if x != nil { + return x.Descending } - return nil + return false } -func (x *Selection) GetEdge() *Edge { - if x, ok := x.GetResult().(*Selection_Edge); ok { - return x.Edge - } - return nil -} +type SelectStatement struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields -type isSelection_Result interface { - isSelection_Result() + Marks []string `protobuf:"bytes,1,rep,name=marks,proto3" json:"marks,omitempty"` } -type Selection_Vertex struct { - Vertex *Vertex `protobuf:"bytes,1,opt,name=vertex,proto3,oneof"` +func (x *SelectStatement) Reset() { + *x = SelectStatement{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SelectStatement) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SelectStatement) ProtoMessage() {} + +func (x *SelectStatement) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[23] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SelectStatement.ProtoReflect.Descriptor instead. +func (*SelectStatement) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{23} +} + +func (x *SelectStatement) GetMarks() []string { + if x != nil { + return x.Marks + } + return nil +} + +type Selection struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Types that are assignable to Result: + // + // *Selection_Vertex + // *Selection_Edge + Result isSelection_Result `protobuf_oneof:"result"` +} + +func (x *Selection) Reset() { + *x = Selection{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Selection) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Selection) ProtoMessage() {} + +func (x *Selection) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[24] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Selection.ProtoReflect.Descriptor instead. +func (*Selection) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{24} +} + +func (m *Selection) GetResult() isSelection_Result { + if m != nil { + return m.Result + } + return nil +} + +func (x *Selection) GetVertex() *Vertex { + if x, ok := x.GetResult().(*Selection_Vertex); ok { + return x.Vertex + } + return nil +} + +func (x *Selection) GetEdge() *Edge { + if x, ok := x.GetResult().(*Selection_Edge); ok { + return x.Edge + } + return nil +} + +type isSelection_Result interface { + isSelection_Result() +} + +type Selection_Vertex struct { + Vertex *Vertex `protobuf:"bytes,1,opt,name=vertex,proto3,oneof"` } type Selection_Edge struct { @@ -1900,7 +2209,7 @@ type Selections struct { func (x *Selections) Reset() { *x = Selections{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[20] + mi := &file_gripql_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1913,7 +2222,7 @@ func (x *Selections) String() string { func (*Selections) ProtoMessage() {} func (x *Selections) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[20] + mi := &file_gripql_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1926,7 +2235,7 @@ func (x *Selections) ProtoReflect() protoreflect.Message { // Deprecated: Use Selections.ProtoReflect.Descriptor instead. func (*Selections) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{20} + return file_gripql_proto_rawDescGZIP(), []int{25} } func (x *Selections) GetSelections() map[string]*Selection { @@ -1949,7 +2258,7 @@ type Jump struct { func (x *Jump) Reset() { *x = Jump{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[21] + mi := &file_gripql_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1962,7 +2271,7 @@ func (x *Jump) String() string { func (*Jump) ProtoMessage() {} func (x *Jump) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[21] + mi := &file_gripql_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1975,7 +2284,7 @@ func (x *Jump) ProtoReflect() protoreflect.Message { // Deprecated: Use Jump.ProtoReflect.Descriptor instead. func (*Jump) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{21} + return file_gripql_proto_rawDescGZIP(), []int{26} } func (x *Jump) GetMark() string { @@ -2011,7 +2320,7 @@ type Set struct { func (x *Set) Reset() { *x = Set{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[22] + mi := &file_gripql_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2024,7 +2333,7 @@ func (x *Set) String() string { func (*Set) ProtoMessage() {} func (x *Set) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[22] + mi := &file_gripql_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2037,7 +2346,7 @@ func (x *Set) ProtoReflect() protoreflect.Message { // Deprecated: Use Set.ProtoReflect.Descriptor instead. func (*Set) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{22} + return file_gripql_proto_rawDescGZIP(), []int{27} } func (x *Set) GetKey() string { @@ -2066,7 +2375,7 @@ type Increment struct { func (x *Increment) Reset() { *x = Increment{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[23] + mi := &file_gripql_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2079,7 +2388,7 @@ func (x *Increment) String() string { func (*Increment) ProtoMessage() {} func (x *Increment) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[23] + mi := &file_gripql_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2092,7 +2401,7 @@ func (x *Increment) ProtoReflect() protoreflect.Message { // Deprecated: Use Increment.ProtoReflect.Descriptor instead. func (*Increment) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{23} + return file_gripql_proto_rawDescGZIP(), []int{28} } func (x *Increment) GetKey() string { @@ -2114,7 +2423,7 @@ type Vertex struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Gid string `protobuf:"bytes,1,opt,name=gid,proto3" json:"gid,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"` Data *structpb.Struct `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` } @@ -2122,7 +2431,7 @@ type Vertex struct { func (x *Vertex) Reset() { *x = Vertex{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[24] + mi := &file_gripql_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2135,7 +2444,7 @@ func (x *Vertex) String() string { func (*Vertex) ProtoMessage() {} func (x *Vertex) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[24] + mi := &file_gripql_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2148,12 +2457,12 @@ func (x *Vertex) ProtoReflect() protoreflect.Message { // Deprecated: Use Vertex.ProtoReflect.Descriptor instead. func (*Vertex) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{24} + return file_gripql_proto_rawDescGZIP(), []int{29} } -func (x *Vertex) GetGid() string { +func (x *Vertex) GetId() string { if x != nil { - return x.Gid + return x.Id } return "" } @@ -2177,7 +2486,7 @@ type Edge struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Gid string `protobuf:"bytes,1,opt,name=gid,proto3" json:"gid,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Label string `protobuf:"bytes,2,opt,name=label,proto3" json:"label,omitempty"` From string `protobuf:"bytes,3,opt,name=from,proto3" json:"from,omitempty"` To string `protobuf:"bytes,4,opt,name=to,proto3" json:"to,omitempty"` @@ -2187,7 +2496,7 @@ type Edge struct { func (x *Edge) Reset() { *x = Edge{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[25] + mi := &file_gripql_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2200,7 +2509,7 @@ func (x *Edge) String() string { func (*Edge) ProtoMessage() {} func (x *Edge) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[25] + mi := &file_gripql_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2213,12 +2522,12 @@ func (x *Edge) ProtoReflect() protoreflect.Message { // Deprecated: Use Edge.ProtoReflect.Descriptor instead. func (*Edge) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{25} + return file_gripql_proto_rawDescGZIP(), []int{30} } -func (x *Edge) GetGid() string { +func (x *Edge) GetId() string { if x != nil { - return x.Gid + return x.Id } return "" } @@ -2261,7 +2570,6 @@ type QueryResult struct { // *QueryResult_Vertex // *QueryResult_Edge // *QueryResult_Aggregations - // *QueryResult_Selections // *QueryResult_Render // *QueryResult_Count // *QueryResult_Path @@ -2271,7 +2579,7 @@ type QueryResult struct { func (x *QueryResult) Reset() { *x = QueryResult{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[26] + mi := &file_gripql_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2284,7 +2592,7 @@ func (x *QueryResult) String() string { func (*QueryResult) ProtoMessage() {} func (x *QueryResult) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[26] + mi := &file_gripql_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2297,7 +2605,7 @@ func (x *QueryResult) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryResult.ProtoReflect.Descriptor instead. func (*QueryResult) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{26} + return file_gripql_proto_rawDescGZIP(), []int{31} } func (m *QueryResult) GetResult() isQueryResult_Result { @@ -2328,13 +2636,6 @@ func (x *QueryResult) GetAggregations() *NamedAggregationResult { return nil } -func (x *QueryResult) GetSelections() *Selections { - if x, ok := x.GetResult().(*QueryResult_Selections); ok { - return x.Selections - } - return nil -} - func (x *QueryResult) GetRender() *structpb.Value { if x, ok := x.GetResult().(*QueryResult_Render); ok { return x.Render @@ -2372,10 +2673,6 @@ type QueryResult_Aggregations struct { Aggregations *NamedAggregationResult `protobuf:"bytes,3,opt,name=aggregations,proto3,oneof"` } -type QueryResult_Selections struct { - Selections *Selections `protobuf:"bytes,4,opt,name=selections,proto3,oneof"` -} - type QueryResult_Render struct { Render *structpb.Value `protobuf:"bytes,5,opt,name=render,proto3,oneof"` } @@ -2394,8 +2691,6 @@ func (*QueryResult_Edge) isQueryResult_Result() {} func (*QueryResult_Aggregations) isQueryResult_Result() {} -func (*QueryResult_Selections) isQueryResult_Result() {} - func (*QueryResult_Render) isQueryResult_Result() {} func (*QueryResult_Count) isQueryResult_Result() {} @@ -2414,7 +2709,7 @@ type QueryJob struct { func (x *QueryJob) Reset() { *x = QueryJob{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[27] + mi := &file_gripql_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2427,7 +2722,7 @@ func (x *QueryJob) String() string { func (*QueryJob) ProtoMessage() {} func (x *QueryJob) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[27] + mi := &file_gripql_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2440,7 +2735,7 @@ func (x *QueryJob) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryJob.ProtoReflect.Descriptor instead. func (*QueryJob) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{27} + return file_gripql_proto_rawDescGZIP(), []int{32} } func (x *QueryJob) GetId() string { @@ -2470,7 +2765,7 @@ type ExtendQuery struct { func (x *ExtendQuery) Reset() { *x = ExtendQuery{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[28] + mi := &file_gripql_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2483,7 +2778,7 @@ func (x *ExtendQuery) String() string { func (*ExtendQuery) ProtoMessage() {} func (x *ExtendQuery) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[28] + mi := &file_gripql_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2496,7 +2791,7 @@ func (x *ExtendQuery) ProtoReflect() protoreflect.Message { // Deprecated: Use ExtendQuery.ProtoReflect.Descriptor instead. func (*ExtendQuery) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{28} + return file_gripql_proto_rawDescGZIP(), []int{33} } func (x *ExtendQuery) GetSrcId() string { @@ -2536,7 +2831,7 @@ type JobStatus struct { func (x *JobStatus) Reset() { *x = JobStatus{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[29] + mi := &file_gripql_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2549,7 +2844,7 @@ func (x *JobStatus) String() string { func (*JobStatus) ProtoMessage() {} func (x *JobStatus) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[29] + mi := &file_gripql_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2562,7 +2857,7 @@ func (x *JobStatus) ProtoReflect() protoreflect.Message { // Deprecated: Use JobStatus.ProtoReflect.Descriptor instead. func (*JobStatus) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{29} + return file_gripql_proto_rawDescGZIP(), []int{34} } func (x *JobStatus) GetId() string { @@ -2618,7 +2913,7 @@ type EditResult struct { func (x *EditResult) Reset() { *x = EditResult{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[30] + mi := &file_gripql_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2631,7 +2926,7 @@ func (x *EditResult) String() string { func (*EditResult) ProtoMessage() {} func (x *EditResult) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[30] + mi := &file_gripql_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2644,7 +2939,7 @@ func (x *EditResult) ProtoReflect() protoreflect.Message { // Deprecated: Use EditResult.ProtoReflect.Descriptor instead. func (*EditResult) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{30} + return file_gripql_proto_rawDescGZIP(), []int{35} } func (x *EditResult) GetId() string { @@ -2666,7 +2961,7 @@ type BulkEditResult struct { func (x *BulkEditResult) Reset() { *x = BulkEditResult{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[31] + mi := &file_gripql_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2679,7 +2974,7 @@ func (x *BulkEditResult) String() string { func (*BulkEditResult) ProtoMessage() {} func (x *BulkEditResult) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[31] + mi := &file_gripql_proto_msgTypes[36] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2692,7 +2987,7 @@ func (x *BulkEditResult) ProtoReflect() protoreflect.Message { // Deprecated: Use BulkEditResult.ProtoReflect.Descriptor instead. func (*BulkEditResult) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{31} + return file_gripql_proto_rawDescGZIP(), []int{36} } func (x *BulkEditResult) GetInsertCount() int32 { @@ -2709,6 +3004,61 @@ func (x *BulkEditResult) GetErrorCount() int32 { return 0 } +type BulkJsonEditResult struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + InsertCount int32 `protobuf:"varint,1,opt,name=insert_count,json=insertCount,proto3" json:"insert_count,omitempty"` + Errors []string `protobuf:"bytes,2,rep,name=errors,proto3" json:"errors,omitempty"` +} + +func (x *BulkJsonEditResult) Reset() { + *x = BulkJsonEditResult{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[37] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *BulkJsonEditResult) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*BulkJsonEditResult) ProtoMessage() {} + +func (x *BulkJsonEditResult) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[37] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use BulkJsonEditResult.ProtoReflect.Descriptor instead. +func (*BulkJsonEditResult) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{37} +} + +func (x *BulkJsonEditResult) GetInsertCount() int32 { + if x != nil { + return x.InsertCount + } + return 0 +} + +func (x *BulkJsonEditResult) GetErrors() []string { + if x != nil { + return x.Errors + } + return nil +} + type GraphElement struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2722,7 +3072,7 @@ type GraphElement struct { func (x *GraphElement) Reset() { *x = GraphElement{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[32] + mi := &file_gripql_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2735,7 +3085,7 @@ func (x *GraphElement) String() string { func (*GraphElement) ProtoMessage() {} func (x *GraphElement) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[32] + mi := &file_gripql_proto_msgTypes[38] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2748,7 +3098,7 @@ func (x *GraphElement) ProtoReflect() protoreflect.Message { // Deprecated: Use GraphElement.ProtoReflect.Descriptor instead. func (*GraphElement) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{32} + return file_gripql_proto_rawDescGZIP(), []int{38} } func (x *GraphElement) GetGraph() string { @@ -2783,7 +3133,7 @@ type GraphID struct { func (x *GraphID) Reset() { *x = GraphID{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[33] + mi := &file_gripql_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2796,7 +3146,7 @@ func (x *GraphID) String() string { func (*GraphID) ProtoMessage() {} func (x *GraphID) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[33] + mi := &file_gripql_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2809,7 +3159,7 @@ func (x *GraphID) ProtoReflect() protoreflect.Message { // Deprecated: Use GraphID.ProtoReflect.Descriptor instead. func (*GraphID) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{33} + return file_gripql_proto_rawDescGZIP(), []int{39} } func (x *GraphID) GetGraph() string { @@ -2831,7 +3181,7 @@ type ElementID struct { func (x *ElementID) Reset() { *x = ElementID{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[34] + mi := &file_gripql_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2844,7 +3194,7 @@ func (x *ElementID) String() string { func (*ElementID) ProtoMessage() {} func (x *ElementID) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[34] + mi := &file_gripql_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2857,7 +3207,7 @@ func (x *ElementID) ProtoReflect() protoreflect.Message { // Deprecated: Use ElementID.ProtoReflect.Descriptor instead. func (*ElementID) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{34} + return file_gripql_proto_rawDescGZIP(), []int{40} } func (x *ElementID) GetGraph() string { @@ -2887,7 +3237,7 @@ type IndexID struct { func (x *IndexID) Reset() { *x = IndexID{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[35] + mi := &file_gripql_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2900,7 +3250,7 @@ func (x *IndexID) String() string { func (*IndexID) ProtoMessage() {} func (x *IndexID) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[35] + mi := &file_gripql_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2913,7 +3263,7 @@ func (x *IndexID) ProtoReflect() protoreflect.Message { // Deprecated: Use IndexID.ProtoReflect.Descriptor instead. func (*IndexID) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{35} + return file_gripql_proto_rawDescGZIP(), []int{41} } func (x *IndexID) GetGraph() string { @@ -2948,7 +3298,7 @@ type Timestamp struct { func (x *Timestamp) Reset() { *x = Timestamp{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[36] + mi := &file_gripql_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2961,7 +3311,7 @@ func (x *Timestamp) String() string { func (*Timestamp) ProtoMessage() {} func (x *Timestamp) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[36] + mi := &file_gripql_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2974,7 +3324,7 @@ func (x *Timestamp) ProtoReflect() protoreflect.Message { // Deprecated: Use Timestamp.ProtoReflect.Descriptor instead. func (*Timestamp) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{36} + return file_gripql_proto_rawDescGZIP(), []int{42} } func (x *Timestamp) GetTimestamp() string { @@ -2993,7 +3343,7 @@ type Empty struct { func (x *Empty) Reset() { *x = Empty{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[37] + mi := &file_gripql_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3006,7 +3356,7 @@ func (x *Empty) String() string { func (*Empty) ProtoMessage() {} func (x *Empty) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[37] + mi := &file_gripql_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3019,7 +3369,7 @@ func (x *Empty) ProtoReflect() protoreflect.Message { // Deprecated: Use Empty.ProtoReflect.Descriptor instead. func (*Empty) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{37} + return file_gripql_proto_rawDescGZIP(), []int{43} } type ListGraphsResponse struct { @@ -3033,7 +3383,7 @@ type ListGraphsResponse struct { func (x *ListGraphsResponse) Reset() { *x = ListGraphsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[38] + mi := &file_gripql_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3046,7 +3396,7 @@ func (x *ListGraphsResponse) String() string { func (*ListGraphsResponse) ProtoMessage() {} func (x *ListGraphsResponse) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[38] + mi := &file_gripql_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3059,7 +3409,7 @@ func (x *ListGraphsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListGraphsResponse.ProtoReflect.Descriptor instead. func (*ListGraphsResponse) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{38} + return file_gripql_proto_rawDescGZIP(), []int{44} } func (x *ListGraphsResponse) GetGraphs() []string { @@ -3080,7 +3430,7 @@ type ListIndicesResponse struct { func (x *ListIndicesResponse) Reset() { *x = ListIndicesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[39] + mi := &file_gripql_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3093,7 +3443,7 @@ func (x *ListIndicesResponse) String() string { func (*ListIndicesResponse) ProtoMessage() {} func (x *ListIndicesResponse) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[39] + mi := &file_gripql_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3106,7 +3456,7 @@ func (x *ListIndicesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListIndicesResponse.ProtoReflect.Descriptor instead. func (*ListIndicesResponse) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{39} + return file_gripql_proto_rawDescGZIP(), []int{45} } func (x *ListIndicesResponse) GetIndices() []*IndexID { @@ -3128,7 +3478,7 @@ type ListLabelsResponse struct { func (x *ListLabelsResponse) Reset() { *x = ListLabelsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[40] + mi := &file_gripql_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3141,7 +3491,7 @@ func (x *ListLabelsResponse) String() string { func (*ListLabelsResponse) ProtoMessage() {} func (x *ListLabelsResponse) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[40] + mi := &file_gripql_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3154,7 +3504,7 @@ func (x *ListLabelsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListLabelsResponse.ProtoReflect.Descriptor instead. func (*ListLabelsResponse) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{40} + return file_gripql_proto_rawDescGZIP(), []int{46} } func (x *ListLabelsResponse) GetVertexLabels() []string { @@ -3185,7 +3535,7 @@ type TableInfo struct { func (x *TableInfo) Reset() { *x = TableInfo{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[41] + mi := &file_gripql_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3198,7 +3548,7 @@ func (x *TableInfo) String() string { func (*TableInfo) ProtoMessage() {} func (x *TableInfo) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[41] + mi := &file_gripql_proto_msgTypes[47] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3211,7 +3561,7 @@ func (x *TableInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use TableInfo.ProtoReflect.Descriptor instead. func (*TableInfo) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{41} + return file_gripql_proto_rawDescGZIP(), []int{47} } func (x *TableInfo) GetSource() string { @@ -3242,6 +3592,132 @@ func (x *TableInfo) GetLinkMap() map[string]string { return nil } +type DeleteData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Graph string `protobuf:"bytes,1,opt,name=graph,proto3" json:"graph,omitempty"` + Vertices []string `protobuf:"bytes,2,rep,name=vertices,proto3" json:"vertices,omitempty"` + Edges []string `protobuf:"bytes,3,rep,name=edges,proto3" json:"edges,omitempty"` +} + +func (x *DeleteData) Reset() { + *x = DeleteData{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[48] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeleteData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeleteData) ProtoMessage() {} + +func (x *DeleteData) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[48] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeleteData.ProtoReflect.Descriptor instead. +func (*DeleteData) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{48} +} + +func (x *DeleteData) GetGraph() string { + if x != nil { + return x.Graph + } + return "" +} + +func (x *DeleteData) GetVertices() []string { + if x != nil { + return x.Vertices + } + return nil +} + +func (x *DeleteData) GetEdges() []string { + if x != nil { + return x.Edges + } + return nil +} + +type RawJson struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Graph string `protobuf:"bytes,1,opt,name=graph,proto3" json:"graph,omitempty"` + ExtraArgs *structpb.Struct `protobuf:"bytes,2,opt,name=extra_args,json=extraArgs,proto3" json:"extra_args,omitempty"` + Data *structpb.Struct `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (x *RawJson) Reset() { + *x = RawJson{} + if protoimpl.UnsafeEnabled { + mi := &file_gripql_proto_msgTypes[49] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RawJson) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RawJson) ProtoMessage() {} + +func (x *RawJson) ProtoReflect() protoreflect.Message { + mi := &file_gripql_proto_msgTypes[49] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RawJson.ProtoReflect.Descriptor instead. +func (*RawJson) Descriptor() ([]byte, []int) { + return file_gripql_proto_rawDescGZIP(), []int{49} +} + +func (x *RawJson) GetGraph() string { + if x != nil { + return x.Graph + } + return "" +} + +func (x *RawJson) GetExtraArgs() *structpb.Struct { + if x != nil { + return x.ExtraArgs + } + return nil +} + +func (x *RawJson) GetData() *structpb.Struct { + if x != nil { + return x.Data + } + return nil +} + type PluginConfig struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3255,7 +3731,7 @@ type PluginConfig struct { func (x *PluginConfig) Reset() { *x = PluginConfig{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[42] + mi := &file_gripql_proto_msgTypes[50] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3268,7 +3744,7 @@ func (x *PluginConfig) String() string { func (*PluginConfig) ProtoMessage() {} func (x *PluginConfig) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[42] + mi := &file_gripql_proto_msgTypes[50] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3281,7 +3757,7 @@ func (x *PluginConfig) ProtoReflect() protoreflect.Message { // Deprecated: Use PluginConfig.ProtoReflect.Descriptor instead. func (*PluginConfig) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{42} + return file_gripql_proto_rawDescGZIP(), []int{50} } func (x *PluginConfig) GetName() string { @@ -3317,7 +3793,7 @@ type PluginStatus struct { func (x *PluginStatus) Reset() { *x = PluginStatus{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[43] + mi := &file_gripql_proto_msgTypes[51] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3330,7 +3806,7 @@ func (x *PluginStatus) String() string { func (*PluginStatus) ProtoMessage() {} func (x *PluginStatus) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[43] + mi := &file_gripql_proto_msgTypes[51] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3343,7 +3819,7 @@ func (x *PluginStatus) ProtoReflect() protoreflect.Message { // Deprecated: Use PluginStatus.ProtoReflect.Descriptor instead. func (*PluginStatus) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{43} + return file_gripql_proto_rawDescGZIP(), []int{51} } func (x *PluginStatus) GetName() string { @@ -3371,7 +3847,7 @@ type ListDriversResponse struct { func (x *ListDriversResponse) Reset() { *x = ListDriversResponse{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[44] + mi := &file_gripql_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3384,7 +3860,7 @@ func (x *ListDriversResponse) String() string { func (*ListDriversResponse) ProtoMessage() {} func (x *ListDriversResponse) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[44] + mi := &file_gripql_proto_msgTypes[52] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3397,7 +3873,7 @@ func (x *ListDriversResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListDriversResponse.ProtoReflect.Descriptor instead. func (*ListDriversResponse) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{44} + return file_gripql_proto_rawDescGZIP(), []int{52} } func (x *ListDriversResponse) GetDrivers() []string { @@ -3418,7 +3894,7 @@ type ListPluginsResponse struct { func (x *ListPluginsResponse) Reset() { *x = ListPluginsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_gripql_proto_msgTypes[45] + mi := &file_gripql_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3431,7 +3907,7 @@ func (x *ListPluginsResponse) String() string { func (*ListPluginsResponse) ProtoMessage() {} func (x *ListPluginsResponse) ProtoReflect() protoreflect.Message { - mi := &file_gripql_proto_msgTypes[45] + mi := &file_gripql_proto_msgTypes[53] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3444,7 +3920,7 @@ func (x *ListPluginsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListPluginsResponse.ProtoReflect.Descriptor instead. func (*ListPluginsResponse) Descriptor() ([]byte, []int) { - return file_gripql_proto_rawDescGZIP(), []int{45} + return file_gripql_proto_rawDescGZIP(), []int{53} } func (x *ListPluginsResponse) GetPlugins() []string { @@ -3477,237 +3953,266 @@ var file_gripql_proto_rawDesc = []byte{ 0x65, 0x72, 0x79, 0x22, 0x38, 0x0a, 0x08, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x74, 0x12, 0x2c, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x22, 0xba, 0x0b, + 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x22, 0x98, 0x0c, 0x0a, 0x0e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x2a, 0x0a, 0x01, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x01, 0x76, 0x12, 0x2a, 0x0a, 0x01, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x01, 0x76, 0x12, 0x2c, 0x0a, 0x02, + 0x69, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x2e, 0x0a, 0x03, 0x6f, 0x75, + 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x01, 0x65, 0x12, 0x2c, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x48, 0x00, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x2e, 0x0a, 0x03, 0x6f, 0x75, 0x74, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, - 0x00, 0x52, 0x03, 0x6f, 0x75, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x62, 0x6f, 0x74, 0x68, 0x18, 0x0e, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x48, 0x00, 0x52, 0x04, 0x62, 0x6f, 0x74, 0x68, 0x12, 0x2f, 0x0a, 0x04, 0x69, 0x6e, 0x5f, 0x65, - 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, - 0x75, 0x65, 0x48, 0x00, 0x52, 0x03, 0x69, 0x6e, 0x45, 0x12, 0x31, 0x0a, 0x05, 0x6f, 0x75, 0x74, - 0x5f, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x03, 0x6f, 0x75, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x62, 0x6f, + 0x74, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x04, 0x6f, 0x75, 0x74, 0x45, 0x12, 0x33, 0x0a, 0x06, - 0x62, 0x6f, 0x74, 0x68, 0x5f, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, + 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x04, 0x62, 0x6f, 0x74, 0x68, 0x12, 0x2f, 0x0a, 0x04, + 0x69, 0x6e, 0x5f, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x03, 0x69, 0x6e, 0x45, 0x12, 0x31, 0x0a, + 0x05, 0x6f, 0x75, 0x74, 0x5f, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x05, 0x62, 0x6f, 0x74, 0x68, - 0x45, 0x12, 0x35, 0x0a, 0x07, 0x69, 0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x10, 0x20, 0x01, + 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x04, 0x6f, 0x75, 0x74, 0x45, + 0x12, 0x33, 0x0a, 0x06, 0x62, 0x6f, 0x74, 0x68, 0x5f, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x05, + 0x62, 0x6f, 0x74, 0x68, 0x45, 0x12, 0x35, 0x0a, 0x07, 0x69, 0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, + 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, + 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x69, 0x6e, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x37, 0x0a, 0x08, + 0x6f, 0x75, 0x74, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x75, + 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x69, 0x6e, 0x5f, 0x65, 0x5f, 0x6e, 0x75, + 0x6c, 0x6c, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x07, 0x69, 0x6e, 0x45, 0x4e, 0x75, 0x6c, 0x6c, 0x12, + 0x3a, 0x0a, 0x0a, 0x6f, 0x75, 0x74, 0x5f, 0x65, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x13, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, + 0x00, 0x52, 0x08, 0x6f, 0x75, 0x74, 0x45, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x10, 0x0a, 0x02, 0x61, + 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x02, 0x61, 0x73, 0x12, 0x18, 0x0a, + 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, + 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x18, 0x18, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x12, + 0x14, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, + 0x04, 0x73, 0x6b, 0x69, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x1a, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x52, 0x61, + 0x6e, 0x67, 0x65, 0x48, 0x00, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x29, 0x0a, 0x03, + 0x68, 0x61, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, 0x70, + 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x48, 0x00, 0x52, 0x03, 0x68, 0x61, 0x73, 0x12, 0x39, 0x0a, 0x09, 0x68, 0x61, 0x73, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, 0x68, 0x61, 0x73, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x12, 0x35, 0x0a, 0x07, 0x68, 0x61, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x20, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, + 0x00, 0x52, 0x06, 0x68, 0x61, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x33, 0x0a, 0x06, 0x68, 0x61, 0x73, + 0x5f, 0x69, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x05, 0x68, 0x61, 0x73, 0x49, 0x64, 0x12, 0x38, + 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, + 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x29, 0x0a, 0x05, 0x70, 0x69, 0x76, 0x6f, + 0x74, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x50, 0x69, 0x76, 0x6f, 0x74, 0x53, 0x74, 0x65, 0x70, 0x48, 0x00, 0x52, 0x05, 0x70, 0x69, + 0x76, 0x6f, 0x74, 0x12, 0x34, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x32, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, + 0x00, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, 0x75, 0x6e, 0x77, + 0x69, 0x6e, 0x64, 0x18, 0x33, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x75, 0x6e, 0x77, + 0x69, 0x6e, 0x64, 0x12, 0x25, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x34, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x48, 0x00, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x28, 0x0a, 0x06, 0x74, 0x6f, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x35, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x06, 0x74, 0x6f, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x3c, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x09, + 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x09, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, + 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x3e, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x12, 0x30, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x3f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, - 0x52, 0x06, 0x69, 0x6e, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x37, 0x0a, 0x08, 0x6f, 0x75, 0x74, 0x5f, - 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x4e, 0x75, 0x6c, - 0x6c, 0x12, 0x38, 0x0a, 0x09, 0x69, 0x6e, 0x5f, 0x65, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x12, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, - 0x48, 0x00, 0x52, 0x07, 0x69, 0x6e, 0x45, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x3a, 0x0a, 0x0a, 0x6f, - 0x75, 0x74, 0x5f, 0x65, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, 0x6f, - 0x75, 0x74, 0x45, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x10, 0x0a, 0x02, 0x61, 0x73, 0x18, 0x14, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x02, 0x61, 0x73, 0x12, 0x31, 0x0a, 0x06, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x48, 0x00, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x05, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x05, 0x6c, - 0x69, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x18, 0x19, 0x20, 0x01, - 0x28, 0x0d, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, - 0x6e, 0x67, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x48, 0x00, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, - 0x65, 0x12, 0x29, 0x0a, 0x03, 0x68, 0x61, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x68, 0x61, 0x73, 0x12, 0x39, 0x0a, 0x09, - 0x68, 0x61, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x08, 0x68, - 0x61, 0x73, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x35, 0x0a, 0x07, 0x68, 0x61, 0x73, 0x5f, 0x6b, - 0x65, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x68, 0x61, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x33, - 0x0a, 0x06, 0x68, 0x61, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x05, 0x68, 0x61, - 0x73, 0x49, 0x64, 0x12, 0x38, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x18, - 0x28, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x48, 0x00, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x34, 0x0a, - 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x32, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x06, 0x75, 0x6e, 0x77, 0x69, 0x6e, 0x64, 0x18, 0x33, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x75, 0x6e, 0x77, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x34, 0x0a, 0x09, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, - 0x74, 0x65, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, 0x00, - 0x52, 0x09, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x06, 0x72, - 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x3e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, - 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x30, 0x0a, - 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x3f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, - 0x14, 0x0a, 0x04, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x46, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, - 0x04, 0x6d, 0x61, 0x72, 0x6b, 0x12, 0x22, 0x0a, 0x04, 0x6a, 0x75, 0x6d, 0x70, 0x18, 0x47, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x75, 0x6d, - 0x70, 0x48, 0x00, 0x52, 0x04, 0x6a, 0x75, 0x6d, 0x70, 0x12, 0x1f, 0x0a, 0x03, 0x73, 0x65, 0x74, - 0x18, 0x48, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, - 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x03, 0x73, 0x65, 0x74, 0x12, 0x31, 0x0a, 0x09, 0x69, 0x6e, - 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x49, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x48, 0x00, 0x52, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x0b, 0x0a, - 0x09, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x31, 0x0a, 0x05, 0x52, 0x61, - 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x6f, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x6f, 0x70, 0x22, 0x62, 0x0a, - 0x13, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x35, 0x0a, 0x0c, 0x61, 0x67, - 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, - 0x61, 0x74, 0x65, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x45, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x12, 0x35, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, - 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, - 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xef, 0x02, 0x0a, 0x09, 0x41, 0x67, 0x67, - 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x65, - 0x72, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x48, 0x00, 0x52, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x12, 0x3f, 0x0a, 0x0a, 0x70, 0x65, 0x72, - 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, - 0x65, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0a, - 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x3c, 0x0a, 0x09, 0x68, 0x69, - 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, - 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x09, 0x68, - 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x30, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, - 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, - 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x48, 0x00, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x48, 0x00, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x61, - 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3b, 0x0a, 0x0f, 0x54, 0x65, - 0x72, 0x6d, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, - 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x49, 0x0a, 0x15, 0x50, 0x65, 0x72, 0x63, 0x65, - 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, - 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x01, 0x52, 0x08, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, - 0x74, 0x73, 0x22, 0x48, 0x0a, 0x14, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x41, - 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, - 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x28, 0x0a, 0x10, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x27, 0x0a, 0x0f, 0x54, 0x79, 0x70, 0x65, 0x41, 0x67, - 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, - 0x12, 0x0a, 0x10, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x16, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x41, 0x67, 0x67, 0x72, - 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x28, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x4c, 0x0a, 0x11, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x37, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0xda, 0x01, 0x0a, 0x0d, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x12, 0x2d, 0x0a, 0x03, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x03, 0x61, 0x6e, 0x64, - 0x12, 0x2b, 0x0a, 0x02, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x02, 0x6f, 0x72, 0x12, 0x29, 0x0a, - 0x03, 0x6e, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x6f, 0x74, 0x12, 0x34, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x48, 0x00, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, - 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x7f, 0x0a, 0x0c, - 0x48, 0x61, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2c, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2f, 0x0a, 0x09, - 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x27, 0x0a, - 0x0f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x05, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x22, 0x63, 0x0a, 0x09, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, - 0x74, 0x65, 0x78, 0x48, 0x00, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x22, 0x0a, - 0x04, 0x65, 0x64, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x48, 0x00, 0x52, 0x04, 0x65, 0x64, 0x67, - 0x65, 0x42, 0x08, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0xa2, 0x01, 0x0a, 0x0a, - 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x42, 0x0a, 0x0a, 0x73, 0x65, - 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x50, - 0x0a, 0x0f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x22, 0x65, 0x0a, 0x04, 0x4a, 0x75, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x61, 0x72, 0x6b, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x61, 0x72, 0x6b, 0x12, 0x35, 0x0a, 0x0a, - 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, - 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x65, 0x6d, 0x69, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x65, 0x6d, 0x69, 0x74, 0x22, 0x45, 0x0a, 0x03, 0x53, 0x65, 0x74, 0x12, 0x10, - 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, - 0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x33, - 0x0a, 0x09, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, - 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x22, 0x5d, 0x0a, 0x06, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x10, 0x0a, - 0x03, 0x67, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x7f, 0x0a, 0x04, 0x45, 0x64, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, + 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x25, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x41, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x6f, + 0x72, 0x74, 0x69, 0x6e, 0x67, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, + 0x04, 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x46, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6d, + 0x61, 0x72, 0x6b, 0x12, 0x22, 0x0a, 0x04, 0x6a, 0x75, 0x6d, 0x70, 0x18, 0x47, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x75, 0x6d, 0x70, 0x48, + 0x00, 0x52, 0x04, 0x6a, 0x75, 0x6d, 0x70, 0x12, 0x1f, 0x0a, 0x03, 0x73, 0x65, 0x74, 0x18, 0x48, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x65, + 0x74, 0x48, 0x00, 0x52, 0x03, 0x73, 0x65, 0x74, 0x12, 0x31, 0x0a, 0x09, 0x69, 0x6e, 0x63, 0x72, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x49, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x00, + 0x52, 0x09, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x31, 0x0a, 0x05, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x6f, 0x70, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x6f, 0x70, 0x22, 0x62, 0x0a, 0x13, 0x41, + 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x35, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, + 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, + 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, + 0x65, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x45, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, + 0x35, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x41, + 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xef, 0x02, 0x0a, 0x09, 0x41, 0x67, 0x67, 0x72, 0x65, + 0x67, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x65, 0x72, 0x6d, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x54, 0x65, 0x72, 0x6d, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, + 0x00, 0x52, 0x04, 0x74, 0x65, 0x72, 0x6d, 0x12, 0x3f, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, + 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x41, + 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x70, 0x65, + 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x3c, 0x0a, 0x09, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x41, 0x67, + 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x09, 0x68, 0x69, 0x73, + 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x12, 0x30, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x46, + 0x69, 0x65, 0x6c, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, + 0x00, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x2d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x54, 0x79, 0x70, 0x65, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, + 0x00, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x48, 0x00, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x61, 0x67, 0x67, + 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3b, 0x0a, 0x0f, 0x54, 0x65, 0x72, 0x6d, + 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, + 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x49, 0x0a, 0x15, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, + 0x69, 0x6c, 0x65, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, + 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x01, 0x52, 0x08, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x73, + 0x22, 0x48, 0x0a, 0x14, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x41, 0x67, 0x67, + 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1a, + 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x22, 0x28, 0x0a, 0x10, 0x46, 0x69, + 0x65, 0x6c, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, + 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x22, 0x27, 0x0a, 0x0f, 0x54, 0x79, 0x70, 0x65, 0x41, 0x67, 0x67, 0x72, + 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x12, 0x0a, + 0x10, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x75, 0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x31, 0x0a, 0x06, 0x66, 0x69, + 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x1a, 0x39, 0x0a, + 0x0b, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3b, 0x0a, 0x06, 0x54, 0x6f, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x79, 0x70, 0x65, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x79, 0x70, + 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x47, 0x0a, 0x09, 0x50, 0x69, 0x76, 0x6f, 0x74, 0x53, 0x74, + 0x65, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x6c, + 0x0a, 0x16, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4c, 0x0a, 0x11, + 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4c, 0x69, 0x73, + 0x74, 0x12, 0x37, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x65, + 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xda, 0x01, 0x0a, 0x0d, 0x48, + 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x03, + 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x72, 0x69, 0x70, + 0x71, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x03, 0x61, 0x6e, 0x64, 0x12, 0x2b, 0x0a, 0x02, 0x6f, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4c, 0x69, + 0x73, 0x74, 0x48, 0x00, 0x52, 0x02, 0x6f, 0x72, 0x12, 0x29, 0x0a, 0x03, 0x6e, 0x6f, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, + 0x61, 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, + 0x6e, 0x6f, 0x74, 0x12, 0x34, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x48, 0x61, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x09, + 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0x0a, 0x0a, 0x65, 0x78, 0x70, + 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x7f, 0x0a, 0x0c, 0x48, 0x61, 0x73, 0x43, 0x6f, + 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x63, + 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x34, 0x0a, 0x07, 0x53, 0x6f, 0x72, 0x74, + 0x69, 0x6e, 0x67, 0x12, 0x29, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x6f, 0x72, + 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x22, 0x41, + 0x0a, 0x09, 0x53, 0x6f, 0x72, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x66, + 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, + 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x73, 0x63, 0x65, 0x6e, 0x64, 0x69, 0x6e, + 0x67, 0x22, 0x27, 0x0a, 0x0f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x22, 0x63, 0x0a, 0x09, 0x53, 0x65, + 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, + 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x48, 0x00, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, + 0x78, 0x12, 0x22, 0x0a, 0x04, 0x65, 0x64, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x48, 0x00, 0x52, + 0x04, 0x65, 0x64, 0x67, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, + 0xa2, 0x01, 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x42, + 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x1a, 0x50, 0x0a, 0x0f, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0x65, 0x0a, 0x04, 0x4a, 0x75, 0x6d, 0x70, 0x12, 0x12, 0x0a, 0x04, + 0x6d, 0x61, 0x72, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x61, 0x72, 0x6b, + 0x12, 0x35, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x48, 0x61, + 0x73, 0x45, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x65, 0x78, 0x70, + 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x65, 0x6d, 0x69, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x65, 0x6d, 0x69, 0x74, 0x22, 0x45, 0x0a, 0x03, 0x53, + 0x65, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x22, 0x33, 0x0a, 0x09, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x5b, 0x0a, 0x06, 0x56, 0x65, 0x72, 0x74, 0x65, + 0x78, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x22, 0x7d, 0x0a, 0x04, 0x45, 0x64, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0xdd, 0x02, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, + 0x61, 0x74, 0x61, 0x22, 0xa7, 0x02, 0x0a, 0x0b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x48, 0x00, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x22, 0x0a, @@ -3717,312 +4222,343 @@ var file_gripql_proto_rawDesc = []byte{ 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, - 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48, - 0x00, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, - 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, - 0x16, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, - 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x42, 0x08, 0x0a, 0x06, 0x72, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x30, 0x0a, 0x08, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x22, 0x68, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x72, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x72, 0x63, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x12, 0x2c, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x22, - 0xbb, 0x01, 0x0a, 0x09, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, - 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x12, 0x26, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x2c, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x16, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x1c, 0x0a, - 0x0a, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x0e, 0x42, - 0x75, 0x6c, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, - 0x0c, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x22, 0x6e, 0x0a, 0x0c, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x26, 0x0a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, - 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, - 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, - 0x20, 0x0a, 0x04, 0x65, 0x64, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x52, 0x04, 0x65, 0x64, 0x67, - 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, + 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, + 0x00, 0x52, 0x06, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x30, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x42, 0x08, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x30, 0x0a, + 0x08, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, + 0x70, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x22, + 0x68, 0x0a, 0x0b, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x15, + 0x0a, 0x06, 0x73, 0x72, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x73, 0x72, 0x63, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x2c, 0x0a, 0x05, 0x71, + 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x22, 0xbb, 0x01, 0x0a, 0x09, 0x4a, 0x6f, + 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x26, 0x0a, + 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x67, + 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x05, 0x71, + 0x75, 0x65, 0x72, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x1c, 0x0a, 0x0a, 0x45, 0x64, 0x69, 0x74, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x0e, 0x42, 0x75, 0x6c, 0x6b, 0x45, 0x64, 0x69, + 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x73, 0x65, 0x72, + 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, + 0x6e, 0x73, 0x65, 0x72, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x72, + 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x4f, 0x0a, 0x12, 0x42, + 0x75, 0x6c, 0x6b, 0x4a, 0x73, 0x6f, 0x6e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, + 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x22, 0x6e, 0x0a, 0x0c, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, - 0x70, 0x68, 0x22, 0x31, 0x0a, 0x09, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, - 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x07, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, - 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, - 0x6c, 0x64, 0x22, 0x29, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x07, 0x0a, - 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, - 0x61, 0x70, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x73, 0x22, 0x40, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, - 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x0a, 0x07, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x52, 0x07, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, - 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x0c, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x64, 0x67, 0x65, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x09, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, - 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, - 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x73, 0x12, 0x39, 0x0a, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x6d, 0x61, 0x70, - 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, - 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, - 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x1a, - 0x3a, 0x0a, 0x0c, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xaf, 0x01, 0x0a, 0x0c, - 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x38, 0x0a, - 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, - 0x0a, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, - 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x18, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2a, 0xa2, 0x01, 0x0a, 0x09, 0x43, 0x6f, - 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, 0x11, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, - 0x57, 0x4e, 0x5f, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x06, - 0x0a, 0x02, 0x45, 0x51, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x45, 0x51, 0x10, 0x02, 0x12, - 0x06, 0x0a, 0x02, 0x47, 0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x54, 0x45, 0x10, 0x04, - 0x12, 0x06, 0x0a, 0x02, 0x4c, 0x54, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x54, 0x45, 0x10, - 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53, 0x49, 0x44, 0x45, 0x10, 0x07, 0x12, 0x0b, 0x0a, - 0x07, 0x4f, 0x55, 0x54, 0x53, 0x49, 0x44, 0x45, 0x10, 0x08, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x45, - 0x54, 0x57, 0x45, 0x45, 0x4e, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x49, 0x54, 0x48, 0x49, - 0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x49, 0x54, 0x48, 0x4f, 0x55, 0x54, 0x10, 0x0b, - 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x53, 0x10, 0x0c, 0x2a, 0x49, - 0x0a, 0x08, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, - 0x45, 0x55, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, - 0x47, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10, - 0x02, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, - 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x04, 0x2a, 0x4f, 0x0a, 0x09, 0x46, 0x69, 0x65, - 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, - 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, - 0x0b, 0x0a, 0x07, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, - 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x50, 0x10, 0x04, 0x12, - 0x09, 0x0a, 0x05, 0x41, 0x52, 0x52, 0x41, 0x59, 0x10, 0x05, 0x32, 0xcf, 0x06, 0x0a, 0x05, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x12, 0x5a, 0x0a, 0x09, 0x54, 0x72, 0x61, 0x76, 0x65, 0x72, 0x73, 0x61, - 0x6c, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, - 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x1c, 0x22, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x3a, 0x01, 0x2a, 0x30, 0x01, - 0x12, 0x55, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, - 0x1a, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, - 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, - 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x4f, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x45, 0x64, - 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, - 0x64, 0x67, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, - 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, - 0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x23, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, - 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x12, 0x4d, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, - 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x20, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x12, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, - 0x12, 0x4f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0f, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, - 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x21, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, - 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, - 0x67, 0x12, 0x4a, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x12, - 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, - 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c, 0x0a, - 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x12, 0x0f, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1b, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, - 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5a, 0x0a, 0x0a, 0x4c, - 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, - 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, - 0x7d, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x43, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x54, - 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12, - 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x30, 0x01, 0x32, 0xed, 0x04, 0x0a, - 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x50, 0x0a, 0x06, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x12, 0x12, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x76, - 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, - 0x6a, 0x6f, 0x62, 0x3a, 0x01, 0x2a, 0x12, 0x4e, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, - 0x62, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, - 0x68, 0x49, 0x44, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, + 0x70, 0x68, 0x12, 0x26, 0x0a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, + 0x65, 0x78, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x04, 0x65, 0x64, + 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, + 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x52, 0x04, 0x65, 0x64, 0x67, 0x65, 0x22, 0x1f, 0x0a, 0x07, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x22, 0x31, 0x0a, + 0x09, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x4b, 0x0a, 0x07, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, + 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, + 0x68, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x29, 0x0a, + 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, + 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x22, 0x2c, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x22, + 0x40, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, + 0x73, 0x22, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x76, 0x65, 0x72, 0x74, 0x65, + 0x78, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, + 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b, + 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x0a, 0x65, 0x64, 0x67, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0xc6, 0x01, + 0x0a, 0x09, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, + 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, + 0x39, 0x0a, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, + 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x07, 0x6c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x69, + 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x54, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x22, 0x84, 0x01, 0x0a, + 0x07, 0x52, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, + 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x36, + 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x65, 0x78, 0x74, + 0x72, 0x61, 0x41, 0x72, 0x67, 0x73, 0x12, 0x2b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x22, 0xaf, 0x01, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x12, 0x38, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x20, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, + 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x38, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, + 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, + 0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, + 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, + 0x73, 0x2a, 0xa2, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x15, 0x0a, 0x11, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x43, 0x4f, 0x4e, 0x44, 0x49, + 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x45, 0x51, 0x10, 0x01, 0x12, 0x07, + 0x0a, 0x03, 0x4e, 0x45, 0x51, 0x10, 0x02, 0x12, 0x06, 0x0a, 0x02, 0x47, 0x54, 0x10, 0x03, 0x12, + 0x07, 0x0a, 0x03, 0x47, 0x54, 0x45, 0x10, 0x04, 0x12, 0x06, 0x0a, 0x02, 0x4c, 0x54, 0x10, 0x05, + 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x54, 0x45, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53, + 0x49, 0x44, 0x45, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x55, 0x54, 0x53, 0x49, 0x44, 0x45, + 0x10, 0x08, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x45, 0x54, 0x57, 0x45, 0x45, 0x4e, 0x10, 0x09, 0x12, + 0x0a, 0x0a, 0x06, 0x57, 0x49, 0x54, 0x48, 0x49, 0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x57, + 0x49, 0x54, 0x48, 0x4f, 0x55, 0x54, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4e, 0x54, + 0x41, 0x49, 0x4e, 0x53, 0x10, 0x0c, 0x2a, 0x49, 0x0a, 0x08, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, 0x55, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, + 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x43, + 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, + 0x4f, 0x52, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, + 0x04, 0x2a, 0x4f, 0x0a, 0x09, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, + 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, + 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x55, 0x4d, 0x45, 0x52, + 0x49, 0x43, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x03, 0x12, 0x07, + 0x0a, 0x03, 0x4d, 0x41, 0x50, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x52, 0x52, 0x41, 0x59, + 0x10, 0x05, 0x32, 0xcf, 0x06, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x5a, 0x0a, 0x09, + 0x54, 0x72, 0x61, 0x76, 0x65, 0x72, 0x73, 0x61, 0x6c, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, + 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, + 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, - 0x2f, 0x6a, 0x6f, 0x62, 0x30, 0x01, 0x12, 0x5e, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, - 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, - 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x27, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x73, 0x65, 0x61, 0x72, 0x63, - 0x68, 0x3a, 0x01, 0x2a, 0x30, 0x01, 0x12, 0x54, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, - 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, - 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, - 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x51, 0x0a, 0x06, - 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, - 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, - 0x59, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x22, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, - 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x3a, 0x01, 0x2a, 0x30, 0x01, 0x12, 0x60, 0x0a, 0x09, 0x52, 0x65, - 0x73, 0x75, 0x6d, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, - 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, - 0x2d, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x3a, 0x01, 0x2a, 0x30, 0x01, 0x32, 0xaa, 0x08, 0x0a, - 0x04, 0x45, 0x64, 0x69, 0x74, 0x12, 0x5f, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x74, - 0x65, 0x78, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, - 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, - 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x28, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x22, 0x22, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, - 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x3a, 0x06, - 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x59, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x45, 0x64, 0x67, - 0x65, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, - 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x1e, 0x22, 0x16, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x3a, 0x04, 0x65, 0x64, 0x67, - 0x65, 0x12, 0x4c, 0x0a, 0x07, 0x42, 0x75, 0x6c, 0x6b, 0x41, 0x64, 0x64, 0x12, 0x14, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x42, 0x75, 0x6c, 0x6b, - 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x0b, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x28, 0x01, 0x12, - 0x4a, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x47, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, - 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x12, 0x4d, 0x0a, 0x0b, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, - 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, - 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x2a, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, - 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x12, 0x5c, 0x0a, 0x0c, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, - 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, - 0x74, 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x58, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, - 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x2a, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, - 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x5b, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, - 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x22, 0x1f, 0x2f, 0x76, 0x31, - 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x7d, 0x3a, 0x01, 0x2a, 0x12, - 0x63, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, - 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, - 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x7d, 0x2f, 0x7b, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x7d, 0x12, 0x53, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, - 0x61, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, - 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, - 0x73, 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x76, + 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x30, 0x01, 0x12, 0x55, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x56, + 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, + 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, + 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, + 0x12, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, + 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, + 0x4f, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0c, 0x2e, + 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d, + 0x12, 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, + 0x44, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, - 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x3a, 0x01, 0x2a, 0x12, 0x57, 0x0a, 0x0c, 0x53, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, - 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d, 0x2e, 0x67, 0x72, 0x69, - 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x21, 0x12, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, - 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2d, 0x73, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x12, 0x55, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, - 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x1a, + 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x4d, 0x0a, 0x09, 0x47, 0x65, 0x74, + 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x12, 0x18, + 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x4f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d, + 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, + 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x4a, 0x0a, 0x0a, 0x4c, 0x69, 0x73, + 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, + 0x69, 0x63, 0x65, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, + 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x12, 0x5a, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, + 0x49, 0x44, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, + 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, + 0x43, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x0d, 0x2e, + 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0x2e, 0x67, + 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, + 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x30, 0x01, 0x32, 0xed, 0x04, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x50, 0x0a, 0x06, + 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x20, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, + 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x12, 0x4e, + 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x10, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x1d, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x30, 0x01, 0x12, 0x5e, + 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x12, 0x2e, 0x67, + 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, + 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, + 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x30, 0x01, 0x12, 0x54, + 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, + 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, + 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x51, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x12, 0x10, + 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, + 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, + 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, + 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x59, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x4a, + 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, + 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, + 0x30, 0x01, 0x12, 0x60, 0x0a, 0x09, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x4a, 0x6f, 0x62, 0x12, + 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, + 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x72, 0x65, 0x73, 0x75, + 0x6d, 0x65, 0x30, 0x01, 0x32, 0xa7, 0x0a, 0x0a, 0x04, 0x45, 0x64, 0x69, 0x74, 0x12, 0x5f, 0x0a, + 0x09, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, + 0x73, 0x75, 0x6c, 0x74, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x06, 0x76, 0x65, + 0x72, 0x74, 0x65, 0x78, 0x22, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, + 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x59, + 0x0a, 0x07, 0x41, 0x64, 0x64, 0x45, 0x64, 0x67, 0x65, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, + 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, - 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x76, 0x31, - 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d, - 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x3a, 0x01, 0x2a, 0x32, 0x82, 0x02, 0x0a, 0x09, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x57, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x72, 0x74, - 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, - 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x14, 0x2e, 0x67, - 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, - 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x3a, 0x01, 0x2a, - 0x12, 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x12, - 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, - 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, - 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x0d, - 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, - 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, - 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x42, 0x1d, - 0x5a, 0x1b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x6d, 0x65, - 0x67, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x04, 0x65, 0x64, 0x67, + 0x65, 0x22, 0x16, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x12, 0x4c, 0x0a, 0x07, 0x42, 0x75, 0x6c, + 0x6b, 0x41, 0x64, 0x64, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, + 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x72, 0x69, + 0x70, 0x71, 0x6c, 0x2e, 0x42, 0x75, 0x6c, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x28, 0x01, 0x12, 0x50, 0x0a, 0x0a, 0x42, 0x75, 0x6c, 0x6b, 0x41, + 0x64, 0x64, 0x52, 0x61, 0x77, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x52, + 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x42, 0x75, 0x6c, 0x6b, 0x4a, 0x73, 0x6f, 0x6e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x22, 0x13, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0d, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, + 0x72, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x28, 0x01, 0x12, 0x4a, 0x0a, 0x08, 0x41, 0x64, 0x64, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, + 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x13, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, + 0x72, 0x61, 0x70, 0x68, 0x7d, 0x12, 0x4d, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, + 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, + 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, + 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x13, 0x2a, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x7d, 0x12, 0x4a, 0x0a, 0x0a, 0x42, 0x75, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x0e, 0x3a, 0x01, 0x2a, 0x2a, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x12, 0x5c, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, + 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, + 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, + 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, + 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x58, + 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, + 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, + 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x2a, 0x1b, 0x2f, 0x76, 0x31, + 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, + 0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x5b, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x49, + 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, + 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, + 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x24, 0x3a, 0x01, 0x2a, 0x22, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, + 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x7d, 0x12, 0x63, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, + 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, + 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, + 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x7d, 0x2f, 0x7b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x7d, 0x12, 0x53, 0x0a, 0x09, 0x41, 0x64, + 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, + 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, + 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x1d, 0x3a, 0x01, 0x2a, 0x22, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, + 0x5d, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x4a, 0x73, 0x6f, 0x6e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, + 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x52, 0x61, 0x77, 0x4a, 0x73, 0x6f, + 0x6e, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, + 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, + 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, + 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x57, + 0x0a, 0x0c, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, + 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, + 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x27, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, + 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, + 0x2d, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x55, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, + 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, + 0x72, 0x61, 0x70, 0x68, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, + 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, + 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x32, 0x82, + 0x02, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x57, 0x0a, 0x0b, + 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x14, 0x2e, 0x67, 0x72, + 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x1a, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, + 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, + 0x01, 0x2a, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x7b, + 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, + 0x67, 0x69, 0x6e, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, + 0x75, 0x67, 0x69, 0x6e, 0x12, 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x72, 0x69, + 0x76, 0x65, 0x72, 0x42, 0x1d, 0x5a, 0x1b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x62, 0x6d, 0x65, 0x67, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x2f, 0x67, 0x72, 0x69, 0x70, + 0x71, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -4038,8 +4574,8 @@ func file_gripql_proto_rawDescGZIP() []byte { } var file_gripql_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_gripql_proto_msgTypes = make([]protoimpl.MessageInfo, 49) -var file_gripql_proto_goTypes = []interface{}{ +var file_gripql_proto_msgTypes = make([]protoimpl.MessageInfo, 58) +var file_gripql_proto_goTypes = []any{ (Condition)(0), // 0: gripql.Condition (JobState)(0), // 1: gripql.JobState (FieldType)(0), // 2: gripql.FieldType @@ -4057,183 +4593,203 @@ var file_gripql_proto_goTypes = []interface{}{ (*FieldAggregation)(nil), // 14: gripql.FieldAggregation (*TypeAggregation)(nil), // 15: gripql.TypeAggregation (*CountAggregation)(nil), // 16: gripql.CountAggregation - (*NamedAggregationResult)(nil), // 17: gripql.NamedAggregationResult - (*HasExpressionList)(nil), // 18: gripql.HasExpressionList - (*HasExpression)(nil), // 19: gripql.HasExpression - (*HasCondition)(nil), // 20: gripql.HasCondition - (*SelectStatement)(nil), // 21: gripql.SelectStatement - (*Selection)(nil), // 22: gripql.Selection - (*Selections)(nil), // 23: gripql.Selections - (*Jump)(nil), // 24: gripql.Jump - (*Set)(nil), // 25: gripql.Set - (*Increment)(nil), // 26: gripql.Increment - (*Vertex)(nil), // 27: gripql.Vertex - (*Edge)(nil), // 28: gripql.Edge - (*QueryResult)(nil), // 29: gripql.QueryResult - (*QueryJob)(nil), // 30: gripql.QueryJob - (*ExtendQuery)(nil), // 31: gripql.ExtendQuery - (*JobStatus)(nil), // 32: gripql.JobStatus - (*EditResult)(nil), // 33: gripql.EditResult - (*BulkEditResult)(nil), // 34: gripql.BulkEditResult - (*GraphElement)(nil), // 35: gripql.GraphElement - (*GraphID)(nil), // 36: gripql.GraphID - (*ElementID)(nil), // 37: gripql.ElementID - (*IndexID)(nil), // 38: gripql.IndexID - (*Timestamp)(nil), // 39: gripql.Timestamp - (*Empty)(nil), // 40: gripql.Empty - (*ListGraphsResponse)(nil), // 41: gripql.ListGraphsResponse - (*ListIndicesResponse)(nil), // 42: gripql.ListIndicesResponse - (*ListLabelsResponse)(nil), // 43: gripql.ListLabelsResponse - (*TableInfo)(nil), // 44: gripql.TableInfo - (*PluginConfig)(nil), // 45: gripql.PluginConfig - (*PluginStatus)(nil), // 46: gripql.PluginStatus - (*ListDriversResponse)(nil), // 47: gripql.ListDriversResponse - (*ListPluginsResponse)(nil), // 48: gripql.ListPluginsResponse - nil, // 49: gripql.Selections.SelectionsEntry - nil, // 50: gripql.TableInfo.LinkMapEntry - nil, // 51: gripql.PluginConfig.ConfigEntry - (*structpb.ListValue)(nil), // 52: google.protobuf.ListValue - (*structpb.Value)(nil), // 53: google.protobuf.Value - (*structpb.Struct)(nil), // 54: google.protobuf.Struct + (*Group)(nil), // 17: gripql.Group + (*ToType)(nil), // 18: gripql.ToType + (*PivotStep)(nil), // 19: gripql.PivotStep + (*NamedAggregationResult)(nil), // 20: gripql.NamedAggregationResult + (*HasExpressionList)(nil), // 21: gripql.HasExpressionList + (*HasExpression)(nil), // 22: gripql.HasExpression + (*HasCondition)(nil), // 23: gripql.HasCondition + (*Sorting)(nil), // 24: gripql.Sorting + (*SortField)(nil), // 25: gripql.SortField + (*SelectStatement)(nil), // 26: gripql.SelectStatement + (*Selection)(nil), // 27: gripql.Selection + (*Selections)(nil), // 28: gripql.Selections + (*Jump)(nil), // 29: gripql.Jump + (*Set)(nil), // 30: gripql.Set + (*Increment)(nil), // 31: gripql.Increment + (*Vertex)(nil), // 32: gripql.Vertex + (*Edge)(nil), // 33: gripql.Edge + (*QueryResult)(nil), // 34: gripql.QueryResult + (*QueryJob)(nil), // 35: gripql.QueryJob + (*ExtendQuery)(nil), // 36: gripql.ExtendQuery + (*JobStatus)(nil), // 37: gripql.JobStatus + (*EditResult)(nil), // 38: gripql.EditResult + (*BulkEditResult)(nil), // 39: gripql.BulkEditResult + (*BulkJsonEditResult)(nil), // 40: gripql.BulkJsonEditResult + (*GraphElement)(nil), // 41: gripql.GraphElement + (*GraphID)(nil), // 42: gripql.GraphID + (*ElementID)(nil), // 43: gripql.ElementID + (*IndexID)(nil), // 44: gripql.IndexID + (*Timestamp)(nil), // 45: gripql.Timestamp + (*Empty)(nil), // 46: gripql.Empty + (*ListGraphsResponse)(nil), // 47: gripql.ListGraphsResponse + (*ListIndicesResponse)(nil), // 48: gripql.ListIndicesResponse + (*ListLabelsResponse)(nil), // 49: gripql.ListLabelsResponse + (*TableInfo)(nil), // 50: gripql.TableInfo + (*DeleteData)(nil), // 51: gripql.DeleteData + (*RawJson)(nil), // 52: gripql.RawJson + (*PluginConfig)(nil), // 53: gripql.PluginConfig + (*PluginStatus)(nil), // 54: gripql.PluginStatus + (*ListDriversResponse)(nil), // 55: gripql.ListDriversResponse + (*ListPluginsResponse)(nil), // 56: gripql.ListPluginsResponse + nil, // 57: gripql.Group.FieldsEntry + nil, // 58: gripql.Selections.SelectionsEntry + nil, // 59: gripql.TableInfo.LinkMapEntry + nil, // 60: gripql.PluginConfig.ConfigEntry + (*structpb.ListValue)(nil), // 61: google.protobuf.ListValue + (*structpb.Value)(nil), // 62: google.protobuf.Value + (*structpb.Struct)(nil), // 63: google.protobuf.Struct } var file_gripql_proto_depIdxs = []int32{ - 27, // 0: gripql.Graph.vertices:type_name -> gripql.Vertex - 28, // 1: gripql.Graph.edges:type_name -> gripql.Edge + 32, // 0: gripql.Graph.vertices:type_name -> gripql.Vertex + 33, // 1: gripql.Graph.edges:type_name -> gripql.Edge 6, // 2: gripql.GraphQuery.query:type_name -> gripql.GraphStatement 6, // 3: gripql.QuerySet.query:type_name -> gripql.GraphStatement - 52, // 4: gripql.GraphStatement.v:type_name -> google.protobuf.ListValue - 52, // 5: gripql.GraphStatement.e:type_name -> google.protobuf.ListValue - 52, // 6: gripql.GraphStatement.in:type_name -> google.protobuf.ListValue - 52, // 7: gripql.GraphStatement.out:type_name -> google.protobuf.ListValue - 52, // 8: gripql.GraphStatement.both:type_name -> google.protobuf.ListValue - 52, // 9: gripql.GraphStatement.in_e:type_name -> google.protobuf.ListValue - 52, // 10: gripql.GraphStatement.out_e:type_name -> google.protobuf.ListValue - 52, // 11: gripql.GraphStatement.both_e:type_name -> google.protobuf.ListValue - 52, // 12: gripql.GraphStatement.in_null:type_name -> google.protobuf.ListValue - 52, // 13: gripql.GraphStatement.out_null:type_name -> google.protobuf.ListValue - 52, // 14: gripql.GraphStatement.in_e_null:type_name -> google.protobuf.ListValue - 52, // 15: gripql.GraphStatement.out_e_null:type_name -> google.protobuf.ListValue - 21, // 16: gripql.GraphStatement.select:type_name -> gripql.SelectStatement - 7, // 17: gripql.GraphStatement.range:type_name -> gripql.Range - 19, // 18: gripql.GraphStatement.has:type_name -> gripql.HasExpression - 52, // 19: gripql.GraphStatement.has_label:type_name -> google.protobuf.ListValue - 52, // 20: gripql.GraphStatement.has_key:type_name -> google.protobuf.ListValue - 52, // 21: gripql.GraphStatement.has_id:type_name -> google.protobuf.ListValue - 52, // 22: gripql.GraphStatement.distinct:type_name -> google.protobuf.ListValue - 52, // 23: gripql.GraphStatement.fields:type_name -> google.protobuf.ListValue - 9, // 24: gripql.GraphStatement.aggregate:type_name -> gripql.Aggregations - 53, // 25: gripql.GraphStatement.render:type_name -> google.protobuf.Value - 52, // 26: gripql.GraphStatement.path:type_name -> google.protobuf.ListValue - 24, // 27: gripql.GraphStatement.jump:type_name -> gripql.Jump - 25, // 28: gripql.GraphStatement.set:type_name -> gripql.Set - 26, // 29: gripql.GraphStatement.increment:type_name -> gripql.Increment - 10, // 30: gripql.AggregationsRequest.aggregations:type_name -> gripql.Aggregate - 10, // 31: gripql.Aggregations.aggregations:type_name -> gripql.Aggregate - 11, // 32: gripql.Aggregate.term:type_name -> gripql.TermAggregation - 12, // 33: gripql.Aggregate.percentile:type_name -> gripql.PercentileAggregation - 13, // 34: gripql.Aggregate.histogram:type_name -> gripql.HistogramAggregation - 14, // 35: gripql.Aggregate.field:type_name -> gripql.FieldAggregation - 15, // 36: gripql.Aggregate.type:type_name -> gripql.TypeAggregation - 16, // 37: gripql.Aggregate.count:type_name -> gripql.CountAggregation - 53, // 38: gripql.NamedAggregationResult.key:type_name -> google.protobuf.Value - 19, // 39: gripql.HasExpressionList.expressions:type_name -> gripql.HasExpression - 18, // 40: gripql.HasExpression.and:type_name -> gripql.HasExpressionList - 18, // 41: gripql.HasExpression.or:type_name -> gripql.HasExpressionList - 19, // 42: gripql.HasExpression.not:type_name -> gripql.HasExpression - 20, // 43: gripql.HasExpression.condition:type_name -> gripql.HasCondition - 53, // 44: gripql.HasCondition.value:type_name -> google.protobuf.Value - 0, // 45: gripql.HasCondition.condition:type_name -> gripql.Condition - 27, // 46: gripql.Selection.vertex:type_name -> gripql.Vertex - 28, // 47: gripql.Selection.edge:type_name -> gripql.Edge - 49, // 48: gripql.Selections.selections:type_name -> gripql.Selections.SelectionsEntry - 19, // 49: gripql.Jump.expression:type_name -> gripql.HasExpression - 53, // 50: gripql.Set.value:type_name -> google.protobuf.Value - 54, // 51: gripql.Vertex.data:type_name -> google.protobuf.Struct - 54, // 52: gripql.Edge.data:type_name -> google.protobuf.Struct - 27, // 53: gripql.QueryResult.vertex:type_name -> gripql.Vertex - 28, // 54: gripql.QueryResult.edge:type_name -> gripql.Edge - 17, // 55: gripql.QueryResult.aggregations:type_name -> gripql.NamedAggregationResult - 23, // 56: gripql.QueryResult.selections:type_name -> gripql.Selections - 53, // 57: gripql.QueryResult.render:type_name -> google.protobuf.Value - 52, // 58: gripql.QueryResult.path:type_name -> google.protobuf.ListValue - 6, // 59: gripql.ExtendQuery.query:type_name -> gripql.GraphStatement - 1, // 60: gripql.JobStatus.state:type_name -> gripql.JobState - 6, // 61: gripql.JobStatus.query:type_name -> gripql.GraphStatement - 27, // 62: gripql.GraphElement.vertex:type_name -> gripql.Vertex - 28, // 63: gripql.GraphElement.edge:type_name -> gripql.Edge - 38, // 64: gripql.ListIndicesResponse.indices:type_name -> gripql.IndexID - 50, // 65: gripql.TableInfo.link_map:type_name -> gripql.TableInfo.LinkMapEntry - 51, // 66: gripql.PluginConfig.config:type_name -> gripql.PluginConfig.ConfigEntry - 22, // 67: gripql.Selections.SelectionsEntry.value:type_name -> gripql.Selection - 4, // 68: gripql.Query.Traversal:input_type -> gripql.GraphQuery - 37, // 69: gripql.Query.GetVertex:input_type -> gripql.ElementID - 37, // 70: gripql.Query.GetEdge:input_type -> gripql.ElementID - 36, // 71: gripql.Query.GetTimestamp:input_type -> gripql.GraphID - 36, // 72: gripql.Query.GetSchema:input_type -> gripql.GraphID - 36, // 73: gripql.Query.GetMapping:input_type -> gripql.GraphID - 40, // 74: gripql.Query.ListGraphs:input_type -> gripql.Empty - 36, // 75: gripql.Query.ListIndices:input_type -> gripql.GraphID - 36, // 76: gripql.Query.ListLabels:input_type -> gripql.GraphID - 40, // 77: gripql.Query.ListTables:input_type -> gripql.Empty - 4, // 78: gripql.Job.Submit:input_type -> gripql.GraphQuery - 36, // 79: gripql.Job.ListJobs:input_type -> gripql.GraphID - 4, // 80: gripql.Job.SearchJobs:input_type -> gripql.GraphQuery - 30, // 81: gripql.Job.DeleteJob:input_type -> gripql.QueryJob - 30, // 82: gripql.Job.GetJob:input_type -> gripql.QueryJob - 30, // 83: gripql.Job.ViewJob:input_type -> gripql.QueryJob - 31, // 84: gripql.Job.ResumeJob:input_type -> gripql.ExtendQuery - 35, // 85: gripql.Edit.AddVertex:input_type -> gripql.GraphElement - 35, // 86: gripql.Edit.AddEdge:input_type -> gripql.GraphElement - 35, // 87: gripql.Edit.BulkAdd:input_type -> gripql.GraphElement - 36, // 88: gripql.Edit.AddGraph:input_type -> gripql.GraphID - 36, // 89: gripql.Edit.DeleteGraph:input_type -> gripql.GraphID - 37, // 90: gripql.Edit.DeleteVertex:input_type -> gripql.ElementID - 37, // 91: gripql.Edit.DeleteEdge:input_type -> gripql.ElementID - 38, // 92: gripql.Edit.AddIndex:input_type -> gripql.IndexID - 38, // 93: gripql.Edit.DeleteIndex:input_type -> gripql.IndexID - 3, // 94: gripql.Edit.AddSchema:input_type -> gripql.Graph - 36, // 95: gripql.Edit.SampleSchema:input_type -> gripql.GraphID - 3, // 96: gripql.Edit.AddMapping:input_type -> gripql.Graph - 45, // 97: gripql.Configure.StartPlugin:input_type -> gripql.PluginConfig - 40, // 98: gripql.Configure.ListPlugins:input_type -> gripql.Empty - 40, // 99: gripql.Configure.ListDrivers:input_type -> gripql.Empty - 29, // 100: gripql.Query.Traversal:output_type -> gripql.QueryResult - 27, // 101: gripql.Query.GetVertex:output_type -> gripql.Vertex - 28, // 102: gripql.Query.GetEdge:output_type -> gripql.Edge - 39, // 103: gripql.Query.GetTimestamp:output_type -> gripql.Timestamp - 3, // 104: gripql.Query.GetSchema:output_type -> gripql.Graph - 3, // 105: gripql.Query.GetMapping:output_type -> gripql.Graph - 41, // 106: gripql.Query.ListGraphs:output_type -> gripql.ListGraphsResponse - 42, // 107: gripql.Query.ListIndices:output_type -> gripql.ListIndicesResponse - 43, // 108: gripql.Query.ListLabels:output_type -> gripql.ListLabelsResponse - 44, // 109: gripql.Query.ListTables:output_type -> gripql.TableInfo - 30, // 110: gripql.Job.Submit:output_type -> gripql.QueryJob - 30, // 111: gripql.Job.ListJobs:output_type -> gripql.QueryJob - 32, // 112: gripql.Job.SearchJobs:output_type -> gripql.JobStatus - 32, // 113: gripql.Job.DeleteJob:output_type -> gripql.JobStatus - 32, // 114: gripql.Job.GetJob:output_type -> gripql.JobStatus - 29, // 115: gripql.Job.ViewJob:output_type -> gripql.QueryResult - 29, // 116: gripql.Job.ResumeJob:output_type -> gripql.QueryResult - 33, // 117: gripql.Edit.AddVertex:output_type -> gripql.EditResult - 33, // 118: gripql.Edit.AddEdge:output_type -> gripql.EditResult - 34, // 119: gripql.Edit.BulkAdd:output_type -> gripql.BulkEditResult - 33, // 120: gripql.Edit.AddGraph:output_type -> gripql.EditResult - 33, // 121: gripql.Edit.DeleteGraph:output_type -> gripql.EditResult - 33, // 122: gripql.Edit.DeleteVertex:output_type -> gripql.EditResult - 33, // 123: gripql.Edit.DeleteEdge:output_type -> gripql.EditResult - 33, // 124: gripql.Edit.AddIndex:output_type -> gripql.EditResult - 33, // 125: gripql.Edit.DeleteIndex:output_type -> gripql.EditResult - 33, // 126: gripql.Edit.AddSchema:output_type -> gripql.EditResult - 3, // 127: gripql.Edit.SampleSchema:output_type -> gripql.Graph - 33, // 128: gripql.Edit.AddMapping:output_type -> gripql.EditResult - 46, // 129: gripql.Configure.StartPlugin:output_type -> gripql.PluginStatus - 48, // 130: gripql.Configure.ListPlugins:output_type -> gripql.ListPluginsResponse - 47, // 131: gripql.Configure.ListDrivers:output_type -> gripql.ListDriversResponse - 100, // [100:132] is the sub-list for method output_type - 68, // [68:100] is the sub-list for method input_type - 68, // [68:68] is the sub-list for extension type_name - 68, // [68:68] is the sub-list for extension extendee - 0, // [0:68] is the sub-list for field type_name + 61, // 4: gripql.GraphStatement.v:type_name -> google.protobuf.ListValue + 61, // 5: gripql.GraphStatement.in:type_name -> google.protobuf.ListValue + 61, // 6: gripql.GraphStatement.out:type_name -> google.protobuf.ListValue + 61, // 7: gripql.GraphStatement.both:type_name -> google.protobuf.ListValue + 61, // 8: gripql.GraphStatement.in_e:type_name -> google.protobuf.ListValue + 61, // 9: gripql.GraphStatement.out_e:type_name -> google.protobuf.ListValue + 61, // 10: gripql.GraphStatement.both_e:type_name -> google.protobuf.ListValue + 61, // 11: gripql.GraphStatement.in_null:type_name -> google.protobuf.ListValue + 61, // 12: gripql.GraphStatement.out_null:type_name -> google.protobuf.ListValue + 61, // 13: gripql.GraphStatement.in_e_null:type_name -> google.protobuf.ListValue + 61, // 14: gripql.GraphStatement.out_e_null:type_name -> google.protobuf.ListValue + 7, // 15: gripql.GraphStatement.range:type_name -> gripql.Range + 22, // 16: gripql.GraphStatement.has:type_name -> gripql.HasExpression + 61, // 17: gripql.GraphStatement.has_label:type_name -> google.protobuf.ListValue + 61, // 18: gripql.GraphStatement.has_key:type_name -> google.protobuf.ListValue + 61, // 19: gripql.GraphStatement.has_id:type_name -> google.protobuf.ListValue + 61, // 20: gripql.GraphStatement.distinct:type_name -> google.protobuf.ListValue + 19, // 21: gripql.GraphStatement.pivot:type_name -> gripql.PivotStep + 61, // 22: gripql.GraphStatement.fields:type_name -> google.protobuf.ListValue + 17, // 23: gripql.GraphStatement.group:type_name -> gripql.Group + 18, // 24: gripql.GraphStatement.totype:type_name -> gripql.ToType + 9, // 25: gripql.GraphStatement.aggregate:type_name -> gripql.Aggregations + 62, // 26: gripql.GraphStatement.render:type_name -> google.protobuf.Value + 61, // 27: gripql.GraphStatement.path:type_name -> google.protobuf.ListValue + 24, // 28: gripql.GraphStatement.sort:type_name -> gripql.Sorting + 29, // 29: gripql.GraphStatement.jump:type_name -> gripql.Jump + 30, // 30: gripql.GraphStatement.set:type_name -> gripql.Set + 31, // 31: gripql.GraphStatement.increment:type_name -> gripql.Increment + 10, // 32: gripql.AggregationsRequest.aggregations:type_name -> gripql.Aggregate + 10, // 33: gripql.Aggregations.aggregations:type_name -> gripql.Aggregate + 11, // 34: gripql.Aggregate.term:type_name -> gripql.TermAggregation + 12, // 35: gripql.Aggregate.percentile:type_name -> gripql.PercentileAggregation + 13, // 36: gripql.Aggregate.histogram:type_name -> gripql.HistogramAggregation + 14, // 37: gripql.Aggregate.field:type_name -> gripql.FieldAggregation + 15, // 38: gripql.Aggregate.type:type_name -> gripql.TypeAggregation + 16, // 39: gripql.Aggregate.count:type_name -> gripql.CountAggregation + 57, // 40: gripql.Group.fields:type_name -> gripql.Group.FieldsEntry + 62, // 41: gripql.NamedAggregationResult.key:type_name -> google.protobuf.Value + 22, // 42: gripql.HasExpressionList.expressions:type_name -> gripql.HasExpression + 21, // 43: gripql.HasExpression.and:type_name -> gripql.HasExpressionList + 21, // 44: gripql.HasExpression.or:type_name -> gripql.HasExpressionList + 22, // 45: gripql.HasExpression.not:type_name -> gripql.HasExpression + 23, // 46: gripql.HasExpression.condition:type_name -> gripql.HasCondition + 62, // 47: gripql.HasCondition.value:type_name -> google.protobuf.Value + 0, // 48: gripql.HasCondition.condition:type_name -> gripql.Condition + 25, // 49: gripql.Sorting.fields:type_name -> gripql.SortField + 32, // 50: gripql.Selection.vertex:type_name -> gripql.Vertex + 33, // 51: gripql.Selection.edge:type_name -> gripql.Edge + 58, // 52: gripql.Selections.selections:type_name -> gripql.Selections.SelectionsEntry + 22, // 53: gripql.Jump.expression:type_name -> gripql.HasExpression + 62, // 54: gripql.Set.value:type_name -> google.protobuf.Value + 63, // 55: gripql.Vertex.data:type_name -> google.protobuf.Struct + 63, // 56: gripql.Edge.data:type_name -> google.protobuf.Struct + 32, // 57: gripql.QueryResult.vertex:type_name -> gripql.Vertex + 33, // 58: gripql.QueryResult.edge:type_name -> gripql.Edge + 20, // 59: gripql.QueryResult.aggregations:type_name -> gripql.NamedAggregationResult + 62, // 60: gripql.QueryResult.render:type_name -> google.protobuf.Value + 61, // 61: gripql.QueryResult.path:type_name -> google.protobuf.ListValue + 6, // 62: gripql.ExtendQuery.query:type_name -> gripql.GraphStatement + 1, // 63: gripql.JobStatus.state:type_name -> gripql.JobState + 6, // 64: gripql.JobStatus.query:type_name -> gripql.GraphStatement + 32, // 65: gripql.GraphElement.vertex:type_name -> gripql.Vertex + 33, // 66: gripql.GraphElement.edge:type_name -> gripql.Edge + 44, // 67: gripql.ListIndicesResponse.indices:type_name -> gripql.IndexID + 59, // 68: gripql.TableInfo.link_map:type_name -> gripql.TableInfo.LinkMapEntry + 63, // 69: gripql.RawJson.extra_args:type_name -> google.protobuf.Struct + 63, // 70: gripql.RawJson.data:type_name -> google.protobuf.Struct + 60, // 71: gripql.PluginConfig.config:type_name -> gripql.PluginConfig.ConfigEntry + 27, // 72: gripql.Selections.SelectionsEntry.value:type_name -> gripql.Selection + 4, // 73: gripql.Query.Traversal:input_type -> gripql.GraphQuery + 43, // 74: gripql.Query.GetVertex:input_type -> gripql.ElementID + 43, // 75: gripql.Query.GetEdge:input_type -> gripql.ElementID + 42, // 76: gripql.Query.GetTimestamp:input_type -> gripql.GraphID + 42, // 77: gripql.Query.GetSchema:input_type -> gripql.GraphID + 42, // 78: gripql.Query.GetMapping:input_type -> gripql.GraphID + 46, // 79: gripql.Query.ListGraphs:input_type -> gripql.Empty + 42, // 80: gripql.Query.ListIndices:input_type -> gripql.GraphID + 42, // 81: gripql.Query.ListLabels:input_type -> gripql.GraphID + 46, // 82: gripql.Query.ListTables:input_type -> gripql.Empty + 4, // 83: gripql.Job.Submit:input_type -> gripql.GraphQuery + 42, // 84: gripql.Job.ListJobs:input_type -> gripql.GraphID + 4, // 85: gripql.Job.SearchJobs:input_type -> gripql.GraphQuery + 35, // 86: gripql.Job.DeleteJob:input_type -> gripql.QueryJob + 35, // 87: gripql.Job.GetJob:input_type -> gripql.QueryJob + 35, // 88: gripql.Job.ViewJob:input_type -> gripql.QueryJob + 36, // 89: gripql.Job.ResumeJob:input_type -> gripql.ExtendQuery + 41, // 90: gripql.Edit.AddVertex:input_type -> gripql.GraphElement + 41, // 91: gripql.Edit.AddEdge:input_type -> gripql.GraphElement + 41, // 92: gripql.Edit.BulkAdd:input_type -> gripql.GraphElement + 52, // 93: gripql.Edit.BulkAddRaw:input_type -> gripql.RawJson + 42, // 94: gripql.Edit.AddGraph:input_type -> gripql.GraphID + 42, // 95: gripql.Edit.DeleteGraph:input_type -> gripql.GraphID + 51, // 96: gripql.Edit.BulkDelete:input_type -> gripql.DeleteData + 43, // 97: gripql.Edit.DeleteVertex:input_type -> gripql.ElementID + 43, // 98: gripql.Edit.DeleteEdge:input_type -> gripql.ElementID + 44, // 99: gripql.Edit.AddIndex:input_type -> gripql.IndexID + 44, // 100: gripql.Edit.DeleteIndex:input_type -> gripql.IndexID + 3, // 101: gripql.Edit.AddSchema:input_type -> gripql.Graph + 52, // 102: gripql.Edit.AddJsonSchema:input_type -> gripql.RawJson + 42, // 103: gripql.Edit.SampleSchema:input_type -> gripql.GraphID + 3, // 104: gripql.Edit.AddMapping:input_type -> gripql.Graph + 53, // 105: gripql.Configure.StartPlugin:input_type -> gripql.PluginConfig + 46, // 106: gripql.Configure.ListPlugins:input_type -> gripql.Empty + 46, // 107: gripql.Configure.ListDrivers:input_type -> gripql.Empty + 34, // 108: gripql.Query.Traversal:output_type -> gripql.QueryResult + 32, // 109: gripql.Query.GetVertex:output_type -> gripql.Vertex + 33, // 110: gripql.Query.GetEdge:output_type -> gripql.Edge + 45, // 111: gripql.Query.GetTimestamp:output_type -> gripql.Timestamp + 3, // 112: gripql.Query.GetSchema:output_type -> gripql.Graph + 3, // 113: gripql.Query.GetMapping:output_type -> gripql.Graph + 47, // 114: gripql.Query.ListGraphs:output_type -> gripql.ListGraphsResponse + 48, // 115: gripql.Query.ListIndices:output_type -> gripql.ListIndicesResponse + 49, // 116: gripql.Query.ListLabels:output_type -> gripql.ListLabelsResponse + 50, // 117: gripql.Query.ListTables:output_type -> gripql.TableInfo + 35, // 118: gripql.Job.Submit:output_type -> gripql.QueryJob + 35, // 119: gripql.Job.ListJobs:output_type -> gripql.QueryJob + 37, // 120: gripql.Job.SearchJobs:output_type -> gripql.JobStatus + 37, // 121: gripql.Job.DeleteJob:output_type -> gripql.JobStatus + 37, // 122: gripql.Job.GetJob:output_type -> gripql.JobStatus + 34, // 123: gripql.Job.ViewJob:output_type -> gripql.QueryResult + 34, // 124: gripql.Job.ResumeJob:output_type -> gripql.QueryResult + 38, // 125: gripql.Edit.AddVertex:output_type -> gripql.EditResult + 38, // 126: gripql.Edit.AddEdge:output_type -> gripql.EditResult + 39, // 127: gripql.Edit.BulkAdd:output_type -> gripql.BulkEditResult + 40, // 128: gripql.Edit.BulkAddRaw:output_type -> gripql.BulkJsonEditResult + 38, // 129: gripql.Edit.AddGraph:output_type -> gripql.EditResult + 38, // 130: gripql.Edit.DeleteGraph:output_type -> gripql.EditResult + 38, // 131: gripql.Edit.BulkDelete:output_type -> gripql.EditResult + 38, // 132: gripql.Edit.DeleteVertex:output_type -> gripql.EditResult + 38, // 133: gripql.Edit.DeleteEdge:output_type -> gripql.EditResult + 38, // 134: gripql.Edit.AddIndex:output_type -> gripql.EditResult + 38, // 135: gripql.Edit.DeleteIndex:output_type -> gripql.EditResult + 38, // 136: gripql.Edit.AddSchema:output_type -> gripql.EditResult + 38, // 137: gripql.Edit.AddJsonSchema:output_type -> gripql.EditResult + 3, // 138: gripql.Edit.SampleSchema:output_type -> gripql.Graph + 38, // 139: gripql.Edit.AddMapping:output_type -> gripql.EditResult + 54, // 140: gripql.Configure.StartPlugin:output_type -> gripql.PluginStatus + 56, // 141: gripql.Configure.ListPlugins:output_type -> gripql.ListPluginsResponse + 55, // 142: gripql.Configure.ListDrivers:output_type -> gripql.ListDriversResponse + 108, // [108:143] is the sub-list for method output_type + 73, // [73:108] is the sub-list for method input_type + 73, // [73:73] is the sub-list for extension type_name + 73, // [73:73] is the sub-list for extension extendee + 0, // [0:73] is the sub-list for field type_name } func init() { file_gripql_proto_init() } @@ -4242,7 +4798,7 @@ func file_gripql_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_gripql_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Graph); i { case 0: return &v.state @@ -4254,7 +4810,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*GraphQuery); i { case 0: return &v.state @@ -4266,7 +4822,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*QuerySet); i { case 0: return &v.state @@ -4278,7 +4834,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*GraphStatement); i { case 0: return &v.state @@ -4290,7 +4846,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*Range); i { case 0: return &v.state @@ -4302,7 +4858,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*AggregationsRequest); i { case 0: return &v.state @@ -4314,7 +4870,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*Aggregations); i { case 0: return &v.state @@ -4326,7 +4882,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*Aggregate); i { case 0: return &v.state @@ -4338,7 +4894,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*TermAggregation); i { case 0: return &v.state @@ -4350,7 +4906,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*PercentileAggregation); i { case 0: return &v.state @@ -4362,7 +4918,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*HistogramAggregation); i { case 0: return &v.state @@ -4374,7 +4930,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*FieldAggregation); i { case 0: return &v.state @@ -4386,7 +4942,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*TypeAggregation); i { case 0: return &v.state @@ -4398,7 +4954,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*CountAggregation); i { case 0: return &v.state @@ -4410,7 +4966,43 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[14].Exporter = func(v any, i int) any { + switch v := v.(*Group); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[15].Exporter = func(v any, i int) any { + switch v := v.(*ToType); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[16].Exporter = func(v any, i int) any { + switch v := v.(*PivotStep); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[17].Exporter = func(v any, i int) any { switch v := v.(*NamedAggregationResult); i { case 0: return &v.state @@ -4422,7 +5014,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[18].Exporter = func(v any, i int) any { switch v := v.(*HasExpressionList); i { case 0: return &v.state @@ -4434,7 +5026,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[19].Exporter = func(v any, i int) any { switch v := v.(*HasExpression); i { case 0: return &v.state @@ -4446,7 +5038,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[20].Exporter = func(v any, i int) any { switch v := v.(*HasCondition); i { case 0: return &v.state @@ -4458,7 +5050,31 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[21].Exporter = func(v any, i int) any { + switch v := v.(*Sorting); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[22].Exporter = func(v any, i int) any { + switch v := v.(*SortField); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[23].Exporter = func(v any, i int) any { switch v := v.(*SelectStatement); i { case 0: return &v.state @@ -4470,7 +5086,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[24].Exporter = func(v any, i int) any { switch v := v.(*Selection); i { case 0: return &v.state @@ -4482,7 +5098,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[25].Exporter = func(v any, i int) any { switch v := v.(*Selections); i { case 0: return &v.state @@ -4494,7 +5110,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[26].Exporter = func(v any, i int) any { switch v := v.(*Jump); i { case 0: return &v.state @@ -4506,7 +5122,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[27].Exporter = func(v any, i int) any { switch v := v.(*Set); i { case 0: return &v.state @@ -4518,7 +5134,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[28].Exporter = func(v any, i int) any { switch v := v.(*Increment); i { case 0: return &v.state @@ -4530,7 +5146,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[29].Exporter = func(v any, i int) any { switch v := v.(*Vertex); i { case 0: return &v.state @@ -4542,7 +5158,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[30].Exporter = func(v any, i int) any { switch v := v.(*Edge); i { case 0: return &v.state @@ -4554,7 +5170,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[31].Exporter = func(v any, i int) any { switch v := v.(*QueryResult); i { case 0: return &v.state @@ -4566,7 +5182,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[32].Exporter = func(v any, i int) any { switch v := v.(*QueryJob); i { case 0: return &v.state @@ -4578,7 +5194,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[33].Exporter = func(v any, i int) any { switch v := v.(*ExtendQuery); i { case 0: return &v.state @@ -4590,7 +5206,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[34].Exporter = func(v any, i int) any { switch v := v.(*JobStatus); i { case 0: return &v.state @@ -4602,7 +5218,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[35].Exporter = func(v any, i int) any { switch v := v.(*EditResult); i { case 0: return &v.state @@ -4614,7 +5230,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[36].Exporter = func(v any, i int) any { switch v := v.(*BulkEditResult); i { case 0: return &v.state @@ -4626,7 +5242,19 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[37].Exporter = func(v any, i int) any { + switch v := v.(*BulkJsonEditResult); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[38].Exporter = func(v any, i int) any { switch v := v.(*GraphElement); i { case 0: return &v.state @@ -4638,7 +5266,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[39].Exporter = func(v any, i int) any { switch v := v.(*GraphID); i { case 0: return &v.state @@ -4650,7 +5278,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[40].Exporter = func(v any, i int) any { switch v := v.(*ElementID); i { case 0: return &v.state @@ -4662,7 +5290,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[41].Exporter = func(v any, i int) any { switch v := v.(*IndexID); i { case 0: return &v.state @@ -4674,7 +5302,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[42].Exporter = func(v any, i int) any { switch v := v.(*Timestamp); i { case 0: return &v.state @@ -4686,7 +5314,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[43].Exporter = func(v any, i int) any { switch v := v.(*Empty); i { case 0: return &v.state @@ -4698,7 +5326,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[44].Exporter = func(v any, i int) any { switch v := v.(*ListGraphsResponse); i { case 0: return &v.state @@ -4710,7 +5338,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[45].Exporter = func(v any, i int) any { switch v := v.(*ListIndicesResponse); i { case 0: return &v.state @@ -4722,7 +5350,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[46].Exporter = func(v any, i int) any { switch v := v.(*ListLabelsResponse); i { case 0: return &v.state @@ -4734,7 +5362,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[47].Exporter = func(v any, i int) any { switch v := v.(*TableInfo); i { case 0: return &v.state @@ -4746,7 +5374,31 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[48].Exporter = func(v any, i int) any { + switch v := v.(*DeleteData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[49].Exporter = func(v any, i int) any { + switch v := v.(*RawJson); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_gripql_proto_msgTypes[50].Exporter = func(v any, i int) any { switch v := v.(*PluginConfig); i { case 0: return &v.state @@ -4758,7 +5410,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[51].Exporter = func(v any, i int) any { switch v := v.(*PluginStatus); i { case 0: return &v.state @@ -4770,7 +5422,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[52].Exporter = func(v any, i int) any { switch v := v.(*ListDriversResponse); i { case 0: return &v.state @@ -4782,7 +5434,7 @@ func file_gripql_proto_init() { return nil } } - file_gripql_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { + file_gripql_proto_msgTypes[53].Exporter = func(v any, i int) any { switch v := v.(*ListPluginsResponse); i { case 0: return &v.state @@ -4795,9 +5447,8 @@ func file_gripql_proto_init() { } } } - file_gripql_proto_msgTypes[3].OneofWrappers = []interface{}{ + file_gripql_proto_msgTypes[3].OneofWrappers = []any{ (*GraphStatement_V)(nil), - (*GraphStatement_E)(nil), (*GraphStatement_In)(nil), (*GraphStatement_Out)(nil), (*GraphStatement_Both)(nil), @@ -4818,18 +5469,22 @@ func file_gripql_proto_init() { (*GraphStatement_HasKey)(nil), (*GraphStatement_HasId)(nil), (*GraphStatement_Distinct)(nil), + (*GraphStatement_Pivot)(nil), (*GraphStatement_Fields)(nil), (*GraphStatement_Unwind)(nil), + (*GraphStatement_Group)(nil), + (*GraphStatement_Totype)(nil), (*GraphStatement_Count)(nil), (*GraphStatement_Aggregate)(nil), (*GraphStatement_Render)(nil), (*GraphStatement_Path)(nil), + (*GraphStatement_Sort)(nil), (*GraphStatement_Mark)(nil), (*GraphStatement_Jump)(nil), (*GraphStatement_Set)(nil), (*GraphStatement_Increment)(nil), } - file_gripql_proto_msgTypes[7].OneofWrappers = []interface{}{ + file_gripql_proto_msgTypes[7].OneofWrappers = []any{ (*Aggregate_Term)(nil), (*Aggregate_Percentile)(nil), (*Aggregate_Histogram)(nil), @@ -4837,21 +5492,20 @@ func file_gripql_proto_init() { (*Aggregate_Type)(nil), (*Aggregate_Count)(nil), } - file_gripql_proto_msgTypes[16].OneofWrappers = []interface{}{ + file_gripql_proto_msgTypes[19].OneofWrappers = []any{ (*HasExpression_And)(nil), (*HasExpression_Or)(nil), (*HasExpression_Not)(nil), (*HasExpression_Condition)(nil), } - file_gripql_proto_msgTypes[19].OneofWrappers = []interface{}{ + file_gripql_proto_msgTypes[24].OneofWrappers = []any{ (*Selection_Vertex)(nil), (*Selection_Edge)(nil), } - file_gripql_proto_msgTypes[26].OneofWrappers = []interface{}{ + file_gripql_proto_msgTypes[31].OneofWrappers = []any{ (*QueryResult_Vertex)(nil), (*QueryResult_Edge)(nil), (*QueryResult_Aggregations)(nil), - (*QueryResult_Selections)(nil), (*QueryResult_Render)(nil), (*QueryResult_Count)(nil), (*QueryResult_Path)(nil), @@ -4862,7 +5516,7 @@ func file_gripql_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_gripql_proto_rawDesc, NumEnums: 3, - NumMessages: 49, + NumMessages: 58, NumExtensions: 0, NumServices: 4, }, diff --git a/gripql/gripql.pb.gw.go b/gripql/gripql.pb.gw.go index b9750e271..4ce6f9ea8 100644 --- a/gripql/gripql.pb.gw.go +++ b/gripql/gripql.pb.gw.go @@ -10,6 +10,7 @@ package gripql import ( "context" + "errors" "io" "net/http" @@ -24,42 +25,36 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_Query_Traversal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (Query_TraversalClient, runtime.ServerMetadata, error) { - var protoReq GraphQuery - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphQuery + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - stream, err := client.Traversal(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -70,435 +65,342 @@ func request_Query_Traversal_0(ctx context.Context, marshaler runtime.Marshaler, } metadata.HeaderMD = header return stream, metadata, nil - } func request_Query_GetVertex_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.GetVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetVertex_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.GetVertex(ctx, &protoReq) return msg, metadata, err - } func request_Query_GetEdge_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.GetEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetEdge_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.GetEdge(ctx, &protoReq) return msg, metadata, err - } func request_Query_GetTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.GetTimestamp(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.GetTimestamp(ctx, &protoReq) return msg, metadata, err - } func request_Query_GetSchema_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.GetSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetSchema_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.GetSchema(ctx, &protoReq) return msg, metadata, err - } func request_Query_GetMapping_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.GetMapping(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_GetMapping_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.GetMapping(ctx, &protoReq) return msg, metadata, err - } func request_Query_ListGraphs_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListGraphs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_ListGraphs_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) msg, err := server.ListGraphs(ctx, &protoReq) return msg, metadata, err - } func request_Query_ListIndices_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.ListIndices(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_ListIndices_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.ListIndices(ctx, &protoReq) return msg, metadata, err - } func request_Query_ListLabels_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.ListLabels(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Query_ListLabels_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.ListLabels(ctx, &protoReq) return msg, metadata, err - } func request_Query_ListTables_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (Query_ListTablesClient, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } stream, err := client.ListTables(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -509,98 +411,70 @@ func request_Query_ListTables_0(ctx context.Context, marshaler runtime.Marshaler } metadata.HeaderMD = header return stream, metadata, nil - } func request_Job_Submit_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphQuery - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphQuery + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.Submit(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Job_Submit_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphQuery - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphQuery + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.Submit(ctx, &protoReq) return msg, metadata, err - } func request_Job_ListJobs_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ListJobsClient, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - stream, err := client.ListJobs(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -611,38 +485,28 @@ func request_Job_ListJobs_0(ctx context.Context, marshaler runtime.Marshaler, cl } metadata.HeaderMD = header return stream, metadata, nil - } func request_Job_SearchJobs_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_SearchJobsClient, runtime.ServerMetadata, error) { - var protoReq GraphQuery - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphQuery + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - stream, err := client.SearchJobs(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -653,192 +517,146 @@ func request_Job_SearchJobs_0(ctx context.Context, marshaler runtime.Marshaler, } metadata.HeaderMD = header return stream, metadata, nil - } func request_Job_DeleteJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryJob - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq QueryJob + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.DeleteJob(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Job_DeleteJob_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryJob - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq QueryJob + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.DeleteJob(ctx, &protoReq) return msg, metadata, err - } func request_Job_GetJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryJob - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq QueryJob + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.GetJob(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Job_GetJob_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryJob - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq QueryJob + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.GetJob(ctx, &protoReq) return msg, metadata, err - } func request_Job_ViewJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ViewJobClient, runtime.ServerMetadata, error) { - var protoReq QueryJob - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq QueryJob + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - stream, err := client.ViewJob(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -849,38 +667,28 @@ func request_Job_ViewJob_0(ctx context.Context, marshaler runtime.Marshaler, cli } metadata.HeaderMD = header return stream, metadata, nil - } func request_Job_ResumeJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ResumeJobClient, runtime.ServerMetadata, error) { - var protoReq ExtendQuery - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq ExtendQuery + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - stream, err := client.ResumeJob(ctx, &protoReq) if err != nil { return nil, metadata, err @@ -891,967 +699,835 @@ func request_Job_ResumeJob_0(ctx context.Context, marshaler runtime.Marshaler, c } metadata.HeaderMD = header return stream, metadata, nil - } -var ( - filter_Edit_AddVertex_0 = &utilities.DoubleArray{Encoding: map[string]int{"vertex": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} -) +var filter_Edit_AddVertex_0 = &utilities.DoubleArray{Encoding: map[string]int{"vertex": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} func request_Edit_AddVertex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphElement - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Vertex); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphElement + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddVertex_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.AddVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddVertex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphElement - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Vertex); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphElement + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddVertex_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.AddVertex(ctx, &protoReq) return msg, metadata, err - } -var ( - filter_Edit_AddEdge_0 = &utilities.DoubleArray{Encoding: map[string]int{"edge": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} -) +var filter_Edit_AddEdge_0 = &utilities.DoubleArray{Encoding: map[string]int{"edge": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} func request_Edit_AddEdge_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphElement - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Edge); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphElement + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddEdge_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.AddEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddEdge_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphElement - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Edge); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq GraphElement + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddEdge_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.AddEdge(ctx, &protoReq) return msg, metadata, err - } func request_Edit_BulkAdd_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var metadata runtime.ServerMetadata stream, err := client.BulkAdd(ctx) if err != nil { - grpclog.Infof("Failed to start streaming: %v", err) + grpclog.Errorf("Failed to start streaming: %v", err) return nil, metadata, err } dec := marshaler.NewDecoder(req.Body) for { var protoReq GraphElement err = dec.Decode(&protoReq) - if err == io.EOF { + if errors.Is(err, io.EOF) { break } if err != nil { - grpclog.Infof("Failed to decode request: %v", err) + grpclog.Errorf("Failed to decode request: %v", err) return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } if err = stream.Send(&protoReq); err != nil { - if err == io.EOF { + if errors.Is(err, io.EOF) { break } - grpclog.Infof("Failed to send request: %v", err) + grpclog.Errorf("Failed to send request: %v", err) return nil, metadata, err } } - if err := stream.CloseSend(); err != nil { - grpclog.Infof("Failed to terminate client stream: %v", err) + grpclog.Errorf("Failed to terminate client stream: %v", err) return nil, metadata, err } header, err := stream.Header() if err != nil { - grpclog.Infof("Failed to get header from client: %v", err) + grpclog.Errorf("Failed to get header from client: %v", err) return nil, metadata, err } metadata.HeaderMD = header - msg, err := stream.CloseAndRecv() metadata.TrailerMD = stream.Trailer() return msg, metadata, err - } -func request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID +func request_Edit_BulkAddRaw_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var metadata runtime.ServerMetadata + stream, err := client.BulkAddRaw(ctx) + if err != nil { + grpclog.Errorf("Failed to start streaming: %v", err) + return nil, metadata, err + } + dec := marshaler.NewDecoder(req.Body) + for { + var protoReq RawJson + err = dec.Decode(&protoReq) + if errors.Is(err, io.EOF) { + break + } + if err != nil { + grpclog.Errorf("Failed to decode request: %v", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err = stream.Send(&protoReq); err != nil { + if errors.Is(err, io.EOF) { + break + } + grpclog.Errorf("Failed to send request: %v", err) + return nil, metadata, err + } + } + if err := stream.CloseSend(); err != nil { + grpclog.Errorf("Failed to terminate client stream: %v", err) + return nil, metadata, err + } + header, err := stream.Header() + if err != nil { + grpclog.Errorf("Failed to get header from client: %v", err) + return nil, metadata, err + } + metadata.HeaderMD = header + msg, err := stream.CloseAndRecv() + metadata.TrailerMD = stream.Trailer() + return msg, metadata, err +} +func request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.AddGraph(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.AddGraph(ctx, &protoReq) return msg, metadata, err - } func request_Edit_DeleteGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.DeleteGraph(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_DeleteGraph_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.DeleteGraph(ctx, &protoReq) return msg, metadata, err - } -func request_Edit_DeleteVertex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata +func request_Edit_BulkDelete_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq DeleteData + metadata runtime.ServerMetadata + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + msg, err := client.BulkDelete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err +} +func local_request_Edit_BulkDelete_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - val string - ok bool - err error - _ = err + protoReq DeleteData + metadata runtime.ServerMetadata ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := server.BulkDelete(ctx, &protoReq) + return msg, metadata, err +} - val, ok = pathParams["graph"] +func request_Edit_DeleteVertex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq ElementID + metadata runtime.ServerMetadata + err error + ) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.DeleteVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_DeleteVertex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.DeleteVertex(ctx, &protoReq) return msg, metadata, err - } func request_Edit_DeleteEdge_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := client.DeleteEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_DeleteEdge_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq ElementID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq ElementID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["id"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id") } - protoReq.Id, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } - msg, err := server.DeleteEdge(ctx, &protoReq) return msg, metadata, err - } func request_Edit_AddIndex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq IndexID - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq IndexID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["label"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label") } - protoReq.Label, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err) } - msg, err := client.AddIndex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddIndex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq IndexID - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq IndexID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["label"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label") } - protoReq.Label, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err) } - msg, err := server.AddIndex(ctx, &protoReq) return msg, metadata, err - } func request_Edit_DeleteIndex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq IndexID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq IndexID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["label"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label") } - protoReq.Label, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err) } - val, ok = pathParams["field"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "field") } - protoReq.Field, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "field", err) } - msg, err := client.DeleteIndex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_DeleteIndex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq IndexID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq IndexID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - val, ok = pathParams["label"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label") } - protoReq.Label, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err) } - val, ok = pathParams["field"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "field") } - protoReq.Field, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "field", err) } - msg, err := server.DeleteIndex(ctx, &protoReq) return msg, metadata, err - } func request_Edit_AddSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Graph - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq Graph + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.AddSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Graph - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + var ( + protoReq Graph + metadata runtime.ServerMetadata + err error + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } + val, ok := pathParams["graph"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") + } + protoReq.Graph, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) + } + msg, err := server.AddSchema(ctx, &protoReq) + return msg, metadata, err +} +func request_Edit_AddJsonSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var ( - val string - ok bool - err error - _ = err + protoReq RawJson + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - - msg, err := server.AddSchema(ctx, &protoReq) + msg, err := client.AddJsonSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err +} +func local_request_Edit_AddJsonSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var ( + protoReq RawJson + metadata runtime.ServerMetadata + err error + ) + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") + } + protoReq.Graph, err = runtime.String(val) + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) + } + msg, err := server.AddJsonSchema(ctx, &protoReq) + return msg, metadata, err } func request_Edit_SampleSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.SampleSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_SampleSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GraphID - var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err + protoReq GraphID + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.SampleSchema(ctx, &protoReq) return msg, metadata, err - } func request_Edit_AddMapping_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Graph - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq Graph + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := client.AddMapping(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Edit_AddMapping_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Graph - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq Graph + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["graph"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["graph"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph") } - protoReq.Graph, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err) } - msg, err := server.AddMapping(ctx, &protoReq) return msg, metadata, err - } func request_Configure_StartPlugin_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq PluginConfig - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq PluginConfig + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["name"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } + val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Name, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := client.StartPlugin(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Configure_StartPlugin_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq PluginConfig - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - var ( - val string - ok bool - err error - _ = err + protoReq PluginConfig + metadata runtime.ServerMetadata + err error ) - - val, ok = pathParams["name"] + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + val, ok := pathParams["name"] if !ok { return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name") } - protoReq.Name, err = runtime.String(val) if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err) } - msg, err := server.StartPlugin(ctx, &protoReq) return msg, metadata, err - } func request_Configure_ListPlugins_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListPlugins(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Configure_ListPlugins_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) msg, err := server.ListPlugins(ctx, &protoReq) return msg, metadata, err - } func request_Configure_ListDrivers_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) + if req.Body != nil { + _, _ = io.Copy(io.Discard, req.Body) + } msg, err := client.ListDrivers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err - } func local_request_Configure_ListDrivers_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq Empty - var metadata runtime.ServerMetadata - + var ( + protoReq Empty + metadata runtime.ServerMetadata + ) msg, err := server.ListDrivers(ctx, &protoReq) return msg, metadata, err - } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { - - mux.Handle("POST", pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return }) - - mux.Handle("GET", pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1863,20 +1539,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1888,20 +1559,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1913,20 +1579,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetTimestamp_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1938,20 +1599,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1963,20 +1619,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -1988,20 +1639,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListGraphs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2013,20 +1659,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListIndices_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2038,12 +1679,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListLabels_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - mux.Handle("GET", pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -2057,17 +1696,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv // UnaryRPC :call JobServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterJobHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server JobServer) error { - - mux.Handle("POST", pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2079,34 +1716,29 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_Submit_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - mux.Handle("GET", pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return }) - mux.Handle("POST", pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return }) - - mux.Handle("DELETE", pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2118,20 +1750,15 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_DeleteJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2143,19 +1770,17 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_GetJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - mux.Handle("POST", pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return }) - mux.Handle("POST", pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -2169,17 +1794,15 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server // UnaryRPC :call EditServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterEditHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, server EditServer) error { - - mux.Handle("POST", pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2191,20 +1814,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2216,77 +1834,89 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - mux.Handle("POST", pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return }) - mux.Handle("POST", pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_BulkAddRaw_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport") + _, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + }) + mux.Handle(http.MethodPost, pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Edit_AddGraph_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Edit_AddGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + mux.Handle(http.MethodDelete, pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Edit_AddGraph_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Edit_DeleteGraph_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Edit_AddGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Edit_DeleteGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - - mux.Handle("DELETE", pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Edit_DeleteGraph_0(annotatedContext, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Edit_BulkDelete_0(annotatedContext, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) if err != nil { runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - - forward_Edit_DeleteGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - + forward_Edit_BulkDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - - mux.Handle("DELETE", pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2298,20 +1928,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2323,20 +1948,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2348,20 +1968,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2373,20 +1988,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2398,20 +2008,35 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddJsonSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddJsonSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/jsonschema")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Edit_AddJsonSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Edit_AddJsonSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + mux.Handle(http.MethodGet, pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2423,20 +2048,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_SampleSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2448,9 +2068,7 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -2460,17 +2078,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve // UnaryRPC :call ConfigureServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterConfigureHandlerFromEndpoint instead. +// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call. func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ConfigureServer) error { - - mux.Handle("POST", pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2482,20 +2098,15 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_StartPlugin_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2507,20 +2118,15 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_ListPlugins_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2532,9 +2138,7 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_ListDrivers_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) return nil @@ -2543,25 +2147,24 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterQueryHandlerFromEndpoint is same as RegisterQueryHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterQueryHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterQueryHandler(ctx, mux, conn) } @@ -2575,16 +2178,13 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "QueryClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "QueryClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "QueryClient" to call the correct interceptors. +// "QueryClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { - - mux.Handle("POST", pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/Traversal", runtime.WithHTTPPathPattern("/v1/graph/{graph}/query")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/Traversal", runtime.WithHTTPPathPattern("/v1/graph/{graph}/query")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2595,18 +2195,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_Traversal_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2617,18 +2212,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2639,18 +2229,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2661,18 +2246,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetTimestamp_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2683,18 +2263,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2705,18 +2280,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_GetMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2727,18 +2297,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListGraphs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2749,18 +2314,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListIndices_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2771,18 +2331,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListLabels_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListTables", runtime.WithHTTPPathPattern("/v1/table")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListTables", runtime.WithHTTPPathPattern("/v1/table")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2793,80 +2348,58 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Query_ListTables_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Query_Traversal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "query"}, "")) - - pattern_Query_GetVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, "")) - - pattern_Query_GetEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, "")) - + pattern_Query_Traversal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "query"}, "")) + pattern_Query_GetVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, "")) + pattern_Query_GetEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, "")) pattern_Query_GetTimestamp_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "timestamp"}, "")) - - pattern_Query_GetSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, "")) - - pattern_Query_GetMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, "")) - - pattern_Query_ListGraphs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, "")) - - pattern_Query_ListIndices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "index"}, "")) - - pattern_Query_ListLabels_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "label"}, "")) - - pattern_Query_ListTables_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "table"}, "")) + pattern_Query_GetSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, "")) + pattern_Query_GetMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, "")) + pattern_Query_ListGraphs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, "")) + pattern_Query_ListIndices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "index"}, "")) + pattern_Query_ListLabels_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "label"}, "")) + pattern_Query_ListTables_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "table"}, "")) ) var ( - forward_Query_Traversal_0 = runtime.ForwardResponseStream - - forward_Query_GetVertex_0 = runtime.ForwardResponseMessage - - forward_Query_GetEdge_0 = runtime.ForwardResponseMessage - + forward_Query_Traversal_0 = runtime.ForwardResponseStream + forward_Query_GetVertex_0 = runtime.ForwardResponseMessage + forward_Query_GetEdge_0 = runtime.ForwardResponseMessage forward_Query_GetTimestamp_0 = runtime.ForwardResponseMessage - - forward_Query_GetSchema_0 = runtime.ForwardResponseMessage - - forward_Query_GetMapping_0 = runtime.ForwardResponseMessage - - forward_Query_ListGraphs_0 = runtime.ForwardResponseMessage - - forward_Query_ListIndices_0 = runtime.ForwardResponseMessage - - forward_Query_ListLabels_0 = runtime.ForwardResponseMessage - - forward_Query_ListTables_0 = runtime.ForwardResponseStream + forward_Query_GetSchema_0 = runtime.ForwardResponseMessage + forward_Query_GetMapping_0 = runtime.ForwardResponseMessage + forward_Query_ListGraphs_0 = runtime.ForwardResponseMessage + forward_Query_ListIndices_0 = runtime.ForwardResponseMessage + forward_Query_ListLabels_0 = runtime.ForwardResponseMessage + forward_Query_ListTables_0 = runtime.ForwardResponseStream ) // RegisterJobHandlerFromEndpoint is same as RegisterJobHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterJobHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterJobHandler(ctx, mux, conn) } @@ -2880,16 +2413,13 @@ func RegisterJobHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.C // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "JobClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "JobClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "JobClient" to call the correct interceptors. +// "JobClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client JobClient) error { - - mux.Handle("POST", pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2900,18 +2430,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_Submit_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ListJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ListJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2922,18 +2447,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_ListJobs_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/SearchJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-search")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/SearchJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-search")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2944,18 +2464,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_SearchJobs_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2966,18 +2481,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_DeleteJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -2988,18 +2498,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_GetJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ViewJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ViewJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3010,18 +2515,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_ViewJob_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ResumeJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-resume")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ResumeJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-resume")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3032,68 +2532,52 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Job_ResumeJob_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Job_Submit_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, "")) - - pattern_Job_ListJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, "")) - + pattern_Job_Submit_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, "")) + pattern_Job_ListJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, "")) pattern_Job_SearchJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-search"}, "")) - - pattern_Job_DeleteJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) - - pattern_Job_GetJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) - - pattern_Job_ViewJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) - - pattern_Job_ResumeJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-resume"}, "")) + pattern_Job_DeleteJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) + pattern_Job_GetJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) + pattern_Job_ViewJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, "")) + pattern_Job_ResumeJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-resume"}, "")) ) var ( - forward_Job_Submit_0 = runtime.ForwardResponseMessage - - forward_Job_ListJobs_0 = runtime.ForwardResponseStream - + forward_Job_Submit_0 = runtime.ForwardResponseMessage + forward_Job_ListJobs_0 = runtime.ForwardResponseStream forward_Job_SearchJobs_0 = runtime.ForwardResponseStream - - forward_Job_DeleteJob_0 = runtime.ForwardResponseMessage - - forward_Job_GetJob_0 = runtime.ForwardResponseMessage - - forward_Job_ViewJob_0 = runtime.ForwardResponseStream - - forward_Job_ResumeJob_0 = runtime.ForwardResponseStream + forward_Job_DeleteJob_0 = runtime.ForwardResponseMessage + forward_Job_GetJob_0 = runtime.ForwardResponseMessage + forward_Job_ViewJob_0 = runtime.ForwardResponseStream + forward_Job_ResumeJob_0 = runtime.ForwardResponseStream ) // RegisterEditHandlerFromEndpoint is same as RegisterEditHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterEditHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterEditHandler(ctx, mux, conn) } @@ -3107,16 +2591,13 @@ func RegisterEditHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc. // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "EditClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "EditClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "EditClient" to call the correct interceptors. +// "EditClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, client EditClient) error { - - mux.Handle("POST", pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3127,18 +2608,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3149,18 +2625,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAdd", runtime.WithHTTPPathPattern("/v1/graph")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAdd", runtime.WithHTTPPathPattern("/v1/graph")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3171,18 +2642,30 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_BulkAdd_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_BulkAddRaw_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAddRaw", runtime.WithHTTPPathPattern("/v1/rawJson")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Edit_BulkAddRaw_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Edit_BulkAddRaw_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + mux.Handle(http.MethodPost, pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3193,18 +2676,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3215,18 +2693,30 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Edit_BulkDelete_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Edit_BulkDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + mux.Handle(http.MethodDelete, pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3237,18 +2727,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3259,18 +2744,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3281,18 +2761,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("DELETE", pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodDelete, pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3303,18 +2778,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_DeleteIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3325,18 +2795,30 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddJsonSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddJsonSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/jsonschema")) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Edit_AddJsonSchema_0(annotatedContext, inboundMarshaler, client, req, pathParams) + annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md) + if err != nil { + runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) + return + } + forward_Edit_AddJsonSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) + mux.Handle(http.MethodGet, pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3347,18 +2829,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_SampleSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("POST", pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3369,88 +2846,68 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Edit_AddMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( - pattern_Edit_AddVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "vertex"}, "")) - - pattern_Edit_AddEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "edge"}, "")) - - pattern_Edit_BulkAdd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, "")) - - pattern_Edit_AddGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, "")) - - pattern_Edit_DeleteGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, "")) - - pattern_Edit_DeleteVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, "")) - - pattern_Edit_DeleteEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, "")) - - pattern_Edit_AddIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "index", "label"}, "")) - - pattern_Edit_DeleteIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"v1", "graph", "index", "label", "field"}, "")) - - pattern_Edit_AddSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, "")) - - pattern_Edit_SampleSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema-sample"}, "")) - - pattern_Edit_AddMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, "")) + pattern_Edit_AddVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "vertex"}, "")) + pattern_Edit_AddEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "edge"}, "")) + pattern_Edit_BulkAdd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, "")) + pattern_Edit_BulkAddRaw_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "rawJson"}, "")) + pattern_Edit_AddGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, "")) + pattern_Edit_DeleteGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, "")) + pattern_Edit_BulkDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, "")) + pattern_Edit_DeleteVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, "")) + pattern_Edit_DeleteEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, "")) + pattern_Edit_AddIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "index", "label"}, "")) + pattern_Edit_DeleteIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"v1", "graph", "index", "label", "field"}, "")) + pattern_Edit_AddSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, "")) + pattern_Edit_AddJsonSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "jsonschema"}, "")) + pattern_Edit_SampleSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema-sample"}, "")) + pattern_Edit_AddMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, "")) ) var ( - forward_Edit_AddVertex_0 = runtime.ForwardResponseMessage - - forward_Edit_AddEdge_0 = runtime.ForwardResponseMessage - - forward_Edit_BulkAdd_0 = runtime.ForwardResponseMessage - - forward_Edit_AddGraph_0 = runtime.ForwardResponseMessage - - forward_Edit_DeleteGraph_0 = runtime.ForwardResponseMessage - - forward_Edit_DeleteVertex_0 = runtime.ForwardResponseMessage - - forward_Edit_DeleteEdge_0 = runtime.ForwardResponseMessage - - forward_Edit_AddIndex_0 = runtime.ForwardResponseMessage - - forward_Edit_DeleteIndex_0 = runtime.ForwardResponseMessage - - forward_Edit_AddSchema_0 = runtime.ForwardResponseMessage - - forward_Edit_SampleSchema_0 = runtime.ForwardResponseMessage - - forward_Edit_AddMapping_0 = runtime.ForwardResponseMessage + forward_Edit_AddVertex_0 = runtime.ForwardResponseMessage + forward_Edit_AddEdge_0 = runtime.ForwardResponseMessage + forward_Edit_BulkAdd_0 = runtime.ForwardResponseMessage + forward_Edit_BulkAddRaw_0 = runtime.ForwardResponseMessage + forward_Edit_AddGraph_0 = runtime.ForwardResponseMessage + forward_Edit_DeleteGraph_0 = runtime.ForwardResponseMessage + forward_Edit_BulkDelete_0 = runtime.ForwardResponseMessage + forward_Edit_DeleteVertex_0 = runtime.ForwardResponseMessage + forward_Edit_DeleteEdge_0 = runtime.ForwardResponseMessage + forward_Edit_AddIndex_0 = runtime.ForwardResponseMessage + forward_Edit_DeleteIndex_0 = runtime.ForwardResponseMessage + forward_Edit_AddSchema_0 = runtime.ForwardResponseMessage + forward_Edit_AddJsonSchema_0 = runtime.ForwardResponseMessage + forward_Edit_SampleSchema_0 = runtime.ForwardResponseMessage + forward_Edit_AddMapping_0 = runtime.ForwardResponseMessage ) // RegisterConfigureHandlerFromEndpoint is same as RegisterConfigureHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterConfigureHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() - return RegisterConfigureHandler(ctx, mux, conn) } @@ -3464,16 +2921,13 @@ func RegisterConfigureHandler(ctx context.Context, mux *runtime.ServeMux, conn * // to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ConfigureClient". // Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ConfigureClient" // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ConfigureClient" to call the correct interceptors. +// "ConfigureClient" to call the correct interceptors. This client ignores the HTTP middlewares. func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ConfigureClient) error { - - mux.Handle("POST", pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodPost, pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3484,18 +2938,13 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_StartPlugin_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3506,18 +2955,13 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_ListPlugins_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - - mux.Handle("GET", pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle(http.MethodGet, pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - var err error - var annotatedContext context.Context - annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -3528,26 +2972,19 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux, runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err) return } - forward_Configure_ListDrivers_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - }) - return nil } var ( pattern_Configure_StartPlugin_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "plugin", "name"}, "")) - pattern_Configure_ListPlugins_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "plugin"}, "")) - pattern_Configure_ListDrivers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "driver"}, "")) ) var ( forward_Configure_StartPlugin_0 = runtime.ForwardResponseMessage - forward_Configure_ListPlugins_0 = runtime.ForwardResponseMessage - forward_Configure_ListDrivers_0 = runtime.ForwardResponseMessage ) diff --git a/gripql/gripql.proto b/gripql/gripql.proto index 0e990fe98..6fea7c489 100644 --- a/gripql/gripql.proto +++ b/gripql/gripql.proto @@ -25,7 +25,6 @@ message QuerySet { message GraphStatement { oneof statement { google.protobuf.ListValue v = 1; - google.protobuf.ListValue e = 2; google.protobuf.ListValue in = 10; google.protobuf.ListValue out = 11; @@ -40,7 +39,7 @@ message GraphStatement { google.protobuf.ListValue out_e_null = 19; string as = 20; - SelectStatement select = 21; + string select = 21; uint32 limit = 24; uint32 skip = 25; Range range = 26; @@ -50,15 +49,20 @@ message GraphStatement { google.protobuf.ListValue has_id = 33; google.protobuf.ListValue distinct = 40; + PivotStep pivot = 41; google.protobuf.ListValue fields = 50; string unwind = 51; + Group group = 52; + ToType totype = 53; string count = 60; Aggregations aggregate = 61; google.protobuf.Value render = 62; google.protobuf.ListValue path = 63; + Sorting sort = 65; + string mark = 70; Jump jump = 71; Set set = 72; @@ -119,6 +123,21 @@ message CountAggregation { } +message Group { + map fields = 1; +} + +message ToType { + string field = 1; + string type_name = 2; +} + +message PivotStep { + string id = 1; + string field = 2; + string value = 3; +} + message NamedAggregationResult { string name = 1; google.protobuf.Value key = 2; @@ -160,6 +179,15 @@ enum Condition { CONTAINS = 12; } +message Sorting { + repeated SortField fields = 1; +} + +message SortField { + string field = 1; + bool descending = 2; +} + message SelectStatement { repeated string marks = 1; } @@ -192,13 +220,13 @@ message Increment { } message Vertex { - string gid = 1; + string id = 1; string label = 2; google.protobuf.Struct data = 3; } message Edge { - string gid = 1; + string id = 1; string label = 2; string from = 3; string to = 4; @@ -210,7 +238,6 @@ message QueryResult { Vertex vertex = 1; Edge edge = 2; NamedAggregationResult aggregations = 3; - Selections selections = 4; google.protobuf.Value render = 5; uint32 count = 6; google.protobuf.ListValue path = 7; @@ -254,6 +281,11 @@ message BulkEditResult { int32 error_count = 2; } +message BulkJsonEditResult{ + int32 insert_count = 1; + repeated string errors = 2; +} + message GraphElement { string graph = 1; Vertex vertex = 2; @@ -310,6 +342,18 @@ message TableInfo { map link_map = 4; } +message DeleteData { + string graph = 1; + repeated string vertices = 2; + repeated string edges = 3; +} + +message RawJson { + string graph = 1; + google.protobuf.Struct extra_args = 2; + google.protobuf.Struct data = 3; +} + service Query { rpc Traversal(GraphQuery) returns (stream QueryResult) { option (google.api.http) = { @@ -443,6 +487,12 @@ service Edit { }; } + rpc BulkAddRaw (stream RawJson) returns (BulkJsonEditResult) { + option (google.api.http) = { + post: "/v1/rawJson" + }; + } + rpc AddGraph(GraphID) returns (EditResult) { option (google.api.http) = { post: "/v1/graph/{graph}" @@ -455,6 +505,13 @@ service Edit { }; } + rpc BulkDelete(DeleteData) returns (EditResult) { + option (google.api.http) = { + delete: "/v1/graph" + body: "*" + }; + } + rpc DeleteVertex(ElementID) returns (EditResult) { option (google.api.http) = { delete: "/v1/graph/{graph}/vertex/{id}" @@ -487,13 +544,20 @@ service Edit { }; } - rpc SampleSchema(GraphID) returns (Graph) { + rpc AddJsonSchema(RawJson) returns (EditResult) { + option (google.api.http) = { + post: "/v1/graph/{graph}/jsonschema" + body: "*" + }; + } + + rpc SampleSchema(GraphID) returns (Graph) { option (google.api.http) = { get: "/v1/graph/{graph}/schema-sample" }; } - rpc AddMapping(Graph) returns (EditResult) { + rpc AddMapping(Graph) returns (EditResult) { option (google.api.http) = { post: "/v1/graph/{graph}/mapping" body: "*" diff --git a/gripql/gripql_grpc.pb.go b/gripql/gripql_grpc.pb.go index a19e8ed2a..107553012 100644 --- a/gripql/gripql_grpc.pb.go +++ b/gripql/gripql_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.20.1 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.29.3 // source: gripql.proto package gripql @@ -15,14 +15,27 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + Query_Traversal_FullMethodName = "/gripql.Query/Traversal" + Query_GetVertex_FullMethodName = "/gripql.Query/GetVertex" + Query_GetEdge_FullMethodName = "/gripql.Query/GetEdge" + Query_GetTimestamp_FullMethodName = "/gripql.Query/GetTimestamp" + Query_GetSchema_FullMethodName = "/gripql.Query/GetSchema" + Query_GetMapping_FullMethodName = "/gripql.Query/GetMapping" + Query_ListGraphs_FullMethodName = "/gripql.Query/ListGraphs" + Query_ListIndices_FullMethodName = "/gripql.Query/ListIndices" + Query_ListLabels_FullMethodName = "/gripql.Query/ListLabels" + Query_ListTables_FullMethodName = "/gripql.Query/ListTables" +) // QueryClient is the client API for Query service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type QueryClient interface { - Traversal(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (Query_TraversalClient, error) + Traversal(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) GetVertex(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*Vertex, error) GetEdge(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*Edge, error) GetTimestamp(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Timestamp, error) @@ -31,7 +44,7 @@ type QueryClient interface { ListGraphs(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ListGraphsResponse, error) ListIndices(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*ListIndicesResponse, error) ListLabels(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*ListLabelsResponse, error) - ListTables(ctx context.Context, in *Empty, opts ...grpc.CallOption) (Query_ListTablesClient, error) + ListTables(ctx context.Context, in *Empty, opts ...grpc.CallOption) (grpc.ServerStreamingClient[TableInfo], error) } type queryClient struct { @@ -42,12 +55,13 @@ func NewQueryClient(cc grpc.ClientConnInterface) QueryClient { return &queryClient{cc} } -func (c *queryClient) Traversal(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (Query_TraversalClient, error) { - stream, err := c.cc.NewStream(ctx, &Query_ServiceDesc.Streams[0], "/gripql.Query/Traversal", opts...) +func (c *queryClient) Traversal(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Query_ServiceDesc.Streams[0], Query_Traversal_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &queryTraversalClient{stream} + x := &grpc.GenericClientStream[GraphQuery, QueryResult]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -57,26 +71,13 @@ func (c *queryClient) Traversal(ctx context.Context, in *GraphQuery, opts ...grp return x, nil } -type Query_TraversalClient interface { - Recv() (*QueryResult, error) - grpc.ClientStream -} - -type queryTraversalClient struct { - grpc.ClientStream -} - -func (x *queryTraversalClient) Recv() (*QueryResult, error) { - m := new(QueryResult) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Query_TraversalClient = grpc.ServerStreamingClient[QueryResult] func (c *queryClient) GetVertex(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*Vertex, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Vertex) - err := c.cc.Invoke(ctx, "/gripql.Query/GetVertex", in, out, opts...) + err := c.cc.Invoke(ctx, Query_GetVertex_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -84,8 +85,9 @@ func (c *queryClient) GetVertex(ctx context.Context, in *ElementID, opts ...grpc } func (c *queryClient) GetEdge(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*Edge, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Edge) - err := c.cc.Invoke(ctx, "/gripql.Query/GetEdge", in, out, opts...) + err := c.cc.Invoke(ctx, Query_GetEdge_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -93,8 +95,9 @@ func (c *queryClient) GetEdge(ctx context.Context, in *ElementID, opts ...grpc.C } func (c *queryClient) GetTimestamp(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Timestamp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Timestamp) - err := c.cc.Invoke(ctx, "/gripql.Query/GetTimestamp", in, out, opts...) + err := c.cc.Invoke(ctx, Query_GetTimestamp_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -102,8 +105,9 @@ func (c *queryClient) GetTimestamp(ctx context.Context, in *GraphID, opts ...grp } func (c *queryClient) GetSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Graph) - err := c.cc.Invoke(ctx, "/gripql.Query/GetSchema", in, out, opts...) + err := c.cc.Invoke(ctx, Query_GetSchema_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -111,8 +115,9 @@ func (c *queryClient) GetSchema(ctx context.Context, in *GraphID, opts ...grpc.C } func (c *queryClient) GetMapping(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Graph) - err := c.cc.Invoke(ctx, "/gripql.Query/GetMapping", in, out, opts...) + err := c.cc.Invoke(ctx, Query_GetMapping_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -120,8 +125,9 @@ func (c *queryClient) GetMapping(ctx context.Context, in *GraphID, opts ...grpc. } func (c *queryClient) ListGraphs(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ListGraphsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListGraphsResponse) - err := c.cc.Invoke(ctx, "/gripql.Query/ListGraphs", in, out, opts...) + err := c.cc.Invoke(ctx, Query_ListGraphs_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -129,8 +135,9 @@ func (c *queryClient) ListGraphs(ctx context.Context, in *Empty, opts ...grpc.Ca } func (c *queryClient) ListIndices(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*ListIndicesResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListIndicesResponse) - err := c.cc.Invoke(ctx, "/gripql.Query/ListIndices", in, out, opts...) + err := c.cc.Invoke(ctx, Query_ListIndices_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -138,20 +145,22 @@ func (c *queryClient) ListIndices(ctx context.Context, in *GraphID, opts ...grpc } func (c *queryClient) ListLabels(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*ListLabelsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListLabelsResponse) - err := c.cc.Invoke(ctx, "/gripql.Query/ListLabels", in, out, opts...) + err := c.cc.Invoke(ctx, Query_ListLabels_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) ListTables(ctx context.Context, in *Empty, opts ...grpc.CallOption) (Query_ListTablesClient, error) { - stream, err := c.cc.NewStream(ctx, &Query_ServiceDesc.Streams[1], "/gripql.Query/ListTables", opts...) +func (c *queryClient) ListTables(ctx context.Context, in *Empty, opts ...grpc.CallOption) (grpc.ServerStreamingClient[TableInfo], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Query_ServiceDesc.Streams[1], Query_ListTables_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &queryListTablesClient{stream} + x := &grpc.GenericClientStream[Empty, TableInfo]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -161,28 +170,14 @@ func (c *queryClient) ListTables(ctx context.Context, in *Empty, opts ...grpc.Ca return x, nil } -type Query_ListTablesClient interface { - Recv() (*TableInfo, error) - grpc.ClientStream -} - -type queryListTablesClient struct { - grpc.ClientStream -} - -func (x *queryListTablesClient) Recv() (*TableInfo, error) { - m := new(TableInfo) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Query_ListTablesClient = grpc.ServerStreamingClient[TableInfo] // QueryServer is the server API for Query service. // All implementations must embed UnimplementedQueryServer -// for forward compatibility +// for forward compatibility. type QueryServer interface { - Traversal(*GraphQuery, Query_TraversalServer) error + Traversal(*GraphQuery, grpc.ServerStreamingServer[QueryResult]) error GetVertex(context.Context, *ElementID) (*Vertex, error) GetEdge(context.Context, *ElementID) (*Edge, error) GetTimestamp(context.Context, *GraphID) (*Timestamp, error) @@ -191,15 +186,18 @@ type QueryServer interface { ListGraphs(context.Context, *Empty) (*ListGraphsResponse, error) ListIndices(context.Context, *GraphID) (*ListIndicesResponse, error) ListLabels(context.Context, *GraphID) (*ListLabelsResponse, error) - ListTables(*Empty, Query_ListTablesServer) error + ListTables(*Empty, grpc.ServerStreamingServer[TableInfo]) error mustEmbedUnimplementedQueryServer() } -// UnimplementedQueryServer must be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { -} +// UnimplementedQueryServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedQueryServer struct{} -func (UnimplementedQueryServer) Traversal(*GraphQuery, Query_TraversalServer) error { +func (UnimplementedQueryServer) Traversal(*GraphQuery, grpc.ServerStreamingServer[QueryResult]) error { return status.Errorf(codes.Unimplemented, "method Traversal not implemented") } func (UnimplementedQueryServer) GetVertex(context.Context, *ElementID) (*Vertex, error) { @@ -226,10 +224,11 @@ func (UnimplementedQueryServer) ListIndices(context.Context, *GraphID) (*ListInd func (UnimplementedQueryServer) ListLabels(context.Context, *GraphID) (*ListLabelsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLabels not implemented") } -func (UnimplementedQueryServer) ListTables(*Empty, Query_ListTablesServer) error { +func (UnimplementedQueryServer) ListTables(*Empty, grpc.ServerStreamingServer[TableInfo]) error { return status.Errorf(codes.Unimplemented, "method ListTables not implemented") } func (UnimplementedQueryServer) mustEmbedUnimplementedQueryServer() {} +func (UnimplementedQueryServer) testEmbeddedByValue() {} // UnsafeQueryServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to QueryServer will @@ -239,6 +238,13 @@ type UnsafeQueryServer interface { } func RegisterQueryServer(s grpc.ServiceRegistrar, srv QueryServer) { + // If the following call pancis, it indicates UnimplementedQueryServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Query_ServiceDesc, srv) } @@ -247,21 +253,11 @@ func _Query_Traversal_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(QueryServer).Traversal(m, &queryTraversalServer{stream}) -} - -type Query_TraversalServer interface { - Send(*QueryResult) error - grpc.ServerStream + return srv.(QueryServer).Traversal(m, &grpc.GenericServerStream[GraphQuery, QueryResult]{ServerStream: stream}) } -type queryTraversalServer struct { - grpc.ServerStream -} - -func (x *queryTraversalServer) Send(m *QueryResult) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Query_TraversalServer = grpc.ServerStreamingServer[QueryResult] func _Query_GetVertex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ElementID) @@ -273,7 +269,7 @@ func _Query_GetVertex_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/GetVertex", + FullMethod: Query_GetVertex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetVertex(ctx, req.(*ElementID)) @@ -291,7 +287,7 @@ func _Query_GetEdge_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/GetEdge", + FullMethod: Query_GetEdge_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetEdge(ctx, req.(*ElementID)) @@ -309,7 +305,7 @@ func _Query_GetTimestamp_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/GetTimestamp", + FullMethod: Query_GetTimestamp_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetTimestamp(ctx, req.(*GraphID)) @@ -327,7 +323,7 @@ func _Query_GetSchema_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/GetSchema", + FullMethod: Query_GetSchema_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetSchema(ctx, req.(*GraphID)) @@ -345,7 +341,7 @@ func _Query_GetMapping_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/GetMapping", + FullMethod: Query_GetMapping_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).GetMapping(ctx, req.(*GraphID)) @@ -363,7 +359,7 @@ func _Query_ListGraphs_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/ListGraphs", + FullMethod: Query_ListGraphs_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ListGraphs(ctx, req.(*Empty)) @@ -381,7 +377,7 @@ func _Query_ListIndices_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/ListIndices", + FullMethod: Query_ListIndices_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ListIndices(ctx, req.(*GraphID)) @@ -399,7 +395,7 @@ func _Query_ListLabels_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Query/ListLabels", + FullMethod: Query_ListLabels_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).ListLabels(ctx, req.(*GraphID)) @@ -412,21 +408,11 @@ func _Query_ListTables_Handler(srv interface{}, stream grpc.ServerStream) error if err := stream.RecvMsg(m); err != nil { return err } - return srv.(QueryServer).ListTables(m, &queryListTablesServer{stream}) -} - -type Query_ListTablesServer interface { - Send(*TableInfo) error - grpc.ServerStream + return srv.(QueryServer).ListTables(m, &grpc.GenericServerStream[Empty, TableInfo]{ServerStream: stream}) } -type queryListTablesServer struct { - grpc.ServerStream -} - -func (x *queryListTablesServer) Send(m *TableInfo) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Query_ListTablesServer = grpc.ServerStreamingServer[TableInfo] // Query_ServiceDesc is the grpc.ServiceDesc for Query service. // It's only intended for direct use with grpc.RegisterService, @@ -483,17 +469,27 @@ var Query_ServiceDesc = grpc.ServiceDesc{ Metadata: "gripql.proto", } +const ( + Job_Submit_FullMethodName = "/gripql.Job/Submit" + Job_ListJobs_FullMethodName = "/gripql.Job/ListJobs" + Job_SearchJobs_FullMethodName = "/gripql.Job/SearchJobs" + Job_DeleteJob_FullMethodName = "/gripql.Job/DeleteJob" + Job_GetJob_FullMethodName = "/gripql.Job/GetJob" + Job_ViewJob_FullMethodName = "/gripql.Job/ViewJob" + Job_ResumeJob_FullMethodName = "/gripql.Job/ResumeJob" +) + // JobClient is the client API for Job service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type JobClient interface { Submit(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (*QueryJob, error) - ListJobs(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (Job_ListJobsClient, error) - SearchJobs(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (Job_SearchJobsClient, error) + ListJobs(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryJob], error) + SearchJobs(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[JobStatus], error) DeleteJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (*JobStatus, error) GetJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (*JobStatus, error) - ViewJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (Job_ViewJobClient, error) - ResumeJob(ctx context.Context, in *ExtendQuery, opts ...grpc.CallOption) (Job_ResumeJobClient, error) + ViewJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) + ResumeJob(ctx context.Context, in *ExtendQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) } type jobClient struct { @@ -505,20 +501,22 @@ func NewJobClient(cc grpc.ClientConnInterface) JobClient { } func (c *jobClient) Submit(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (*QueryJob, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(QueryJob) - err := c.cc.Invoke(ctx, "/gripql.Job/Submit", in, out, opts...) + err := c.cc.Invoke(ctx, Job_Submit_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *jobClient) ListJobs(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (Job_ListJobsClient, error) { - stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[0], "/gripql.Job/ListJobs", opts...) +func (c *jobClient) ListJobs(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryJob], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[0], Job_ListJobs_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &jobListJobsClient{stream} + x := &grpc.GenericClientStream[GraphID, QueryJob]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -528,29 +526,16 @@ func (c *jobClient) ListJobs(ctx context.Context, in *GraphID, opts ...grpc.Call return x, nil } -type Job_ListJobsClient interface { - Recv() (*QueryJob, error) - grpc.ClientStream -} - -type jobListJobsClient struct { - grpc.ClientStream -} - -func (x *jobListJobsClient) Recv() (*QueryJob, error) { - m := new(QueryJob) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ListJobsClient = grpc.ServerStreamingClient[QueryJob] -func (c *jobClient) SearchJobs(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (Job_SearchJobsClient, error) { - stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[1], "/gripql.Job/SearchJobs", opts...) +func (c *jobClient) SearchJobs(ctx context.Context, in *GraphQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[JobStatus], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[1], Job_SearchJobs_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &jobSearchJobsClient{stream} + x := &grpc.GenericClientStream[GraphQuery, JobStatus]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -560,26 +545,13 @@ func (c *jobClient) SearchJobs(ctx context.Context, in *GraphQuery, opts ...grpc return x, nil } -type Job_SearchJobsClient interface { - Recv() (*JobStatus, error) - grpc.ClientStream -} - -type jobSearchJobsClient struct { - grpc.ClientStream -} - -func (x *jobSearchJobsClient) Recv() (*JobStatus, error) { - m := new(JobStatus) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_SearchJobsClient = grpc.ServerStreamingClient[JobStatus] func (c *jobClient) DeleteJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (*JobStatus, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(JobStatus) - err := c.cc.Invoke(ctx, "/gripql.Job/DeleteJob", in, out, opts...) + err := c.cc.Invoke(ctx, Job_DeleteJob_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -587,20 +559,22 @@ func (c *jobClient) DeleteJob(ctx context.Context, in *QueryJob, opts ...grpc.Ca } func (c *jobClient) GetJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (*JobStatus, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(JobStatus) - err := c.cc.Invoke(ctx, "/gripql.Job/GetJob", in, out, opts...) + err := c.cc.Invoke(ctx, Job_GetJob_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *jobClient) ViewJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (Job_ViewJobClient, error) { - stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[2], "/gripql.Job/ViewJob", opts...) +func (c *jobClient) ViewJob(ctx context.Context, in *QueryJob, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[2], Job_ViewJob_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &jobViewJobClient{stream} + x := &grpc.GenericClientStream[QueryJob, QueryResult]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -610,29 +584,16 @@ func (c *jobClient) ViewJob(ctx context.Context, in *QueryJob, opts ...grpc.Call return x, nil } -type Job_ViewJobClient interface { - Recv() (*QueryResult, error) - grpc.ClientStream -} - -type jobViewJobClient struct { - grpc.ClientStream -} - -func (x *jobViewJobClient) Recv() (*QueryResult, error) { - m := new(QueryResult) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ViewJobClient = grpc.ServerStreamingClient[QueryResult] -func (c *jobClient) ResumeJob(ctx context.Context, in *ExtendQuery, opts ...grpc.CallOption) (Job_ResumeJobClient, error) { - stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[3], "/gripql.Job/ResumeJob", opts...) +func (c *jobClient) ResumeJob(ctx context.Context, in *ExtendQuery, opts ...grpc.CallOption) (grpc.ServerStreamingClient[QueryResult], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Job_ServiceDesc.Streams[3], Job_ResumeJob_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &jobResumeJobClient{stream} + x := &grpc.GenericClientStream[ExtendQuery, QueryResult]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -642,48 +603,37 @@ func (c *jobClient) ResumeJob(ctx context.Context, in *ExtendQuery, opts ...grpc return x, nil } -type Job_ResumeJobClient interface { - Recv() (*QueryResult, error) - grpc.ClientStream -} - -type jobResumeJobClient struct { - grpc.ClientStream -} - -func (x *jobResumeJobClient) Recv() (*QueryResult, error) { - m := new(QueryResult) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ResumeJobClient = grpc.ServerStreamingClient[QueryResult] // JobServer is the server API for Job service. // All implementations must embed UnimplementedJobServer -// for forward compatibility +// for forward compatibility. type JobServer interface { Submit(context.Context, *GraphQuery) (*QueryJob, error) - ListJobs(*GraphID, Job_ListJobsServer) error - SearchJobs(*GraphQuery, Job_SearchJobsServer) error + ListJobs(*GraphID, grpc.ServerStreamingServer[QueryJob]) error + SearchJobs(*GraphQuery, grpc.ServerStreamingServer[JobStatus]) error DeleteJob(context.Context, *QueryJob) (*JobStatus, error) GetJob(context.Context, *QueryJob) (*JobStatus, error) - ViewJob(*QueryJob, Job_ViewJobServer) error - ResumeJob(*ExtendQuery, Job_ResumeJobServer) error + ViewJob(*QueryJob, grpc.ServerStreamingServer[QueryResult]) error + ResumeJob(*ExtendQuery, grpc.ServerStreamingServer[QueryResult]) error mustEmbedUnimplementedJobServer() } -// UnimplementedJobServer must be embedded to have forward compatible implementations. -type UnimplementedJobServer struct { -} +// UnimplementedJobServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedJobServer struct{} func (UnimplementedJobServer) Submit(context.Context, *GraphQuery) (*QueryJob, error) { return nil, status.Errorf(codes.Unimplemented, "method Submit not implemented") } -func (UnimplementedJobServer) ListJobs(*GraphID, Job_ListJobsServer) error { +func (UnimplementedJobServer) ListJobs(*GraphID, grpc.ServerStreamingServer[QueryJob]) error { return status.Errorf(codes.Unimplemented, "method ListJobs not implemented") } -func (UnimplementedJobServer) SearchJobs(*GraphQuery, Job_SearchJobsServer) error { +func (UnimplementedJobServer) SearchJobs(*GraphQuery, grpc.ServerStreamingServer[JobStatus]) error { return status.Errorf(codes.Unimplemented, "method SearchJobs not implemented") } func (UnimplementedJobServer) DeleteJob(context.Context, *QueryJob) (*JobStatus, error) { @@ -692,13 +642,14 @@ func (UnimplementedJobServer) DeleteJob(context.Context, *QueryJob) (*JobStatus, func (UnimplementedJobServer) GetJob(context.Context, *QueryJob) (*JobStatus, error) { return nil, status.Errorf(codes.Unimplemented, "method GetJob not implemented") } -func (UnimplementedJobServer) ViewJob(*QueryJob, Job_ViewJobServer) error { +func (UnimplementedJobServer) ViewJob(*QueryJob, grpc.ServerStreamingServer[QueryResult]) error { return status.Errorf(codes.Unimplemented, "method ViewJob not implemented") } -func (UnimplementedJobServer) ResumeJob(*ExtendQuery, Job_ResumeJobServer) error { +func (UnimplementedJobServer) ResumeJob(*ExtendQuery, grpc.ServerStreamingServer[QueryResult]) error { return status.Errorf(codes.Unimplemented, "method ResumeJob not implemented") } func (UnimplementedJobServer) mustEmbedUnimplementedJobServer() {} +func (UnimplementedJobServer) testEmbeddedByValue() {} // UnsafeJobServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to JobServer will @@ -708,6 +659,13 @@ type UnsafeJobServer interface { } func RegisterJobServer(s grpc.ServiceRegistrar, srv JobServer) { + // If the following call pancis, it indicates UnimplementedJobServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Job_ServiceDesc, srv) } @@ -721,7 +679,7 @@ func _Job_Submit_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Job/Submit", + FullMethod: Job_Submit_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(JobServer).Submit(ctx, req.(*GraphQuery)) @@ -734,42 +692,22 @@ func _Job_ListJobs_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(JobServer).ListJobs(m, &jobListJobsServer{stream}) -} - -type Job_ListJobsServer interface { - Send(*QueryJob) error - grpc.ServerStream -} - -type jobListJobsServer struct { - grpc.ServerStream + return srv.(JobServer).ListJobs(m, &grpc.GenericServerStream[GraphID, QueryJob]{ServerStream: stream}) } -func (x *jobListJobsServer) Send(m *QueryJob) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ListJobsServer = grpc.ServerStreamingServer[QueryJob] func _Job_SearchJobs_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(GraphQuery) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(JobServer).SearchJobs(m, &jobSearchJobsServer{stream}) + return srv.(JobServer).SearchJobs(m, &grpc.GenericServerStream[GraphQuery, JobStatus]{ServerStream: stream}) } -type Job_SearchJobsServer interface { - Send(*JobStatus) error - grpc.ServerStream -} - -type jobSearchJobsServer struct { - grpc.ServerStream -} - -func (x *jobSearchJobsServer) Send(m *JobStatus) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_SearchJobsServer = grpc.ServerStreamingServer[JobStatus] func _Job_DeleteJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryJob) @@ -781,7 +719,7 @@ func _Job_DeleteJob_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Job/DeleteJob", + FullMethod: Job_DeleteJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(JobServer).DeleteJob(ctx, req.(*QueryJob)) @@ -799,7 +737,7 @@ func _Job_GetJob_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Job/GetJob", + FullMethod: Job_GetJob_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(JobServer).GetJob(ctx, req.(*QueryJob)) @@ -812,42 +750,22 @@ func _Job_ViewJob_Handler(srv interface{}, stream grpc.ServerStream) error { if err := stream.RecvMsg(m); err != nil { return err } - return srv.(JobServer).ViewJob(m, &jobViewJobServer{stream}) + return srv.(JobServer).ViewJob(m, &grpc.GenericServerStream[QueryJob, QueryResult]{ServerStream: stream}) } -type Job_ViewJobServer interface { - Send(*QueryResult) error - grpc.ServerStream -} - -type jobViewJobServer struct { - grpc.ServerStream -} - -func (x *jobViewJobServer) Send(m *QueryResult) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ViewJobServer = grpc.ServerStreamingServer[QueryResult] func _Job_ResumeJob_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(ExtendQuery) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(JobServer).ResumeJob(m, &jobResumeJobServer{stream}) + return srv.(JobServer).ResumeJob(m, &grpc.GenericServerStream[ExtendQuery, QueryResult]{ServerStream: stream}) } -type Job_ResumeJobServer interface { - Send(*QueryResult) error - grpc.ServerStream -} - -type jobResumeJobServer struct { - grpc.ServerStream -} - -func (x *jobResumeJobServer) Send(m *QueryResult) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Job_ResumeJobServer = grpc.ServerStreamingServer[QueryResult] // Job_ServiceDesc is the grpc.ServiceDesc for Job service. // It's only intended for direct use with grpc.RegisterService, @@ -894,20 +812,41 @@ var Job_ServiceDesc = grpc.ServiceDesc{ Metadata: "gripql.proto", } +const ( + Edit_AddVertex_FullMethodName = "/gripql.Edit/AddVertex" + Edit_AddEdge_FullMethodName = "/gripql.Edit/AddEdge" + Edit_BulkAdd_FullMethodName = "/gripql.Edit/BulkAdd" + Edit_BulkAddRaw_FullMethodName = "/gripql.Edit/BulkAddRaw" + Edit_AddGraph_FullMethodName = "/gripql.Edit/AddGraph" + Edit_DeleteGraph_FullMethodName = "/gripql.Edit/DeleteGraph" + Edit_BulkDelete_FullMethodName = "/gripql.Edit/BulkDelete" + Edit_DeleteVertex_FullMethodName = "/gripql.Edit/DeleteVertex" + Edit_DeleteEdge_FullMethodName = "/gripql.Edit/DeleteEdge" + Edit_AddIndex_FullMethodName = "/gripql.Edit/AddIndex" + Edit_DeleteIndex_FullMethodName = "/gripql.Edit/DeleteIndex" + Edit_AddSchema_FullMethodName = "/gripql.Edit/AddSchema" + Edit_AddJsonSchema_FullMethodName = "/gripql.Edit/AddJsonSchema" + Edit_SampleSchema_FullMethodName = "/gripql.Edit/SampleSchema" + Edit_AddMapping_FullMethodName = "/gripql.Edit/AddMapping" +) + // EditClient is the client API for Edit service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type EditClient interface { AddVertex(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error) AddEdge(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error) - BulkAdd(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddClient, error) + BulkAdd(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[GraphElement, BulkEditResult], error) + BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[RawJson, BulkJsonEditResult], error) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) DeleteGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) + BulkDelete(ctx context.Context, in *DeleteData, opts ...grpc.CallOption) (*EditResult, error) DeleteVertex(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*EditResult, error) DeleteEdge(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*EditResult, error) AddIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error) DeleteIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error) AddSchema(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error) + AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) AddMapping(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error) } @@ -921,8 +860,9 @@ func NewEditClient(cc grpc.ClientConnInterface) EditClient { } func (c *editClient) AddVertex(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddVertex", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_AddVertex_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -930,60 +870,65 @@ func (c *editClient) AddVertex(ctx context.Context, in *GraphElement, opts ...gr } func (c *editClient) AddEdge(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddEdge", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_AddEdge_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *editClient) BulkAdd(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddClient, error) { - stream, err := c.cc.NewStream(ctx, &Edit_ServiceDesc.Streams[0], "/gripql.Edit/BulkAdd", opts...) +func (c *editClient) BulkAdd(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[GraphElement, BulkEditResult], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Edit_ServiceDesc.Streams[0], Edit_BulkAdd_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &editBulkAddClient{stream} + x := &grpc.GenericClientStream[GraphElement, BulkEditResult]{ClientStream: stream} return x, nil } -type Edit_BulkAddClient interface { - Send(*GraphElement) error - CloseAndRecv() (*BulkEditResult, error) - grpc.ClientStream -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Edit_BulkAddClient = grpc.ClientStreamingClient[GraphElement, BulkEditResult] -type editBulkAddClient struct { - grpc.ClientStream +func (c *editClient) BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[RawJson, BulkJsonEditResult], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &Edit_ServiceDesc.Streams[1], Edit_BulkAddRaw_FullMethodName, cOpts...) + if err != nil { + return nil, err + } + x := &grpc.GenericClientStream[RawJson, BulkJsonEditResult]{ClientStream: stream} + return x, nil } -func (x *editBulkAddClient) Send(m *GraphElement) error { - return x.ClientStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Edit_BulkAddRawClient = grpc.ClientStreamingClient[RawJson, BulkJsonEditResult] -func (x *editBulkAddClient) CloseAndRecv() (*BulkEditResult, error) { - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - m := new(BulkEditResult) - if err := x.ClientStream.RecvMsg(m); err != nil { +func (c *editClient) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(EditResult) + err := c.cc.Invoke(ctx, Edit_AddGraph_FullMethodName, in, out, cOpts...) + if err != nil { return nil, err } - return m, nil + return out, nil } -func (c *editClient) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) { +func (c *editClient) DeleteGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddGraph", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_DeleteGraph_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *editClient) DeleteGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) { +func (c *editClient) BulkDelete(ctx context.Context, in *DeleteData, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/DeleteGraph", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_BulkDelete_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -991,8 +936,9 @@ func (c *editClient) DeleteGraph(ctx context.Context, in *GraphID, opts ...grpc. } func (c *editClient) DeleteVertex(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/DeleteVertex", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_DeleteVertex_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1000,8 +946,9 @@ func (c *editClient) DeleteVertex(ctx context.Context, in *ElementID, opts ...gr } func (c *editClient) DeleteEdge(ctx context.Context, in *ElementID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/DeleteEdge", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_DeleteEdge_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1009,8 +956,9 @@ func (c *editClient) DeleteEdge(ctx context.Context, in *ElementID, opts ...grpc } func (c *editClient) AddIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddIndex", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_AddIndex_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1018,8 +966,9 @@ func (c *editClient) AddIndex(ctx context.Context, in *IndexID, opts ...grpc.Cal } func (c *editClient) DeleteIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/DeleteIndex", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_DeleteIndex_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1027,8 +976,19 @@ func (c *editClient) DeleteIndex(ctx context.Context, in *IndexID, opts ...grpc. } func (c *editClient) AddSchema(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(EditResult) + err := c.cc.Invoke(ctx, Edit_AddSchema_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *editClient) AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddSchema", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_AddJsonSchema_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1036,8 +996,9 @@ func (c *editClient) AddSchema(ctx context.Context, in *Graph, opts ...grpc.Call } func (c *editClient) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Graph) - err := c.cc.Invoke(ctx, "/gripql.Edit/SampleSchema", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_SampleSchema_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1045,8 +1006,9 @@ func (c *editClient) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc } func (c *editClient) AddMapping(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EditResult) - err := c.cc.Invoke(ctx, "/gripql.Edit/AddMapping", in, out, opts...) + err := c.cc.Invoke(ctx, Edit_AddMapping_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1055,26 +1017,32 @@ func (c *editClient) AddMapping(ctx context.Context, in *Graph, opts ...grpc.Cal // EditServer is the server API for Edit service. // All implementations must embed UnimplementedEditServer -// for forward compatibility +// for forward compatibility. type EditServer interface { AddVertex(context.Context, *GraphElement) (*EditResult, error) AddEdge(context.Context, *GraphElement) (*EditResult, error) - BulkAdd(Edit_BulkAddServer) error + BulkAdd(grpc.ClientStreamingServer[GraphElement, BulkEditResult]) error + BulkAddRaw(grpc.ClientStreamingServer[RawJson, BulkJsonEditResult]) error AddGraph(context.Context, *GraphID) (*EditResult, error) DeleteGraph(context.Context, *GraphID) (*EditResult, error) + BulkDelete(context.Context, *DeleteData) (*EditResult, error) DeleteVertex(context.Context, *ElementID) (*EditResult, error) DeleteEdge(context.Context, *ElementID) (*EditResult, error) AddIndex(context.Context, *IndexID) (*EditResult, error) DeleteIndex(context.Context, *IndexID) (*EditResult, error) AddSchema(context.Context, *Graph) (*EditResult, error) + AddJsonSchema(context.Context, *RawJson) (*EditResult, error) SampleSchema(context.Context, *GraphID) (*Graph, error) AddMapping(context.Context, *Graph) (*EditResult, error) mustEmbedUnimplementedEditServer() } -// UnimplementedEditServer must be embedded to have forward compatible implementations. -type UnimplementedEditServer struct { -} +// UnimplementedEditServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedEditServer struct{} func (UnimplementedEditServer) AddVertex(context.Context, *GraphElement) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method AddVertex not implemented") @@ -1082,15 +1050,21 @@ func (UnimplementedEditServer) AddVertex(context.Context, *GraphElement) (*EditR func (UnimplementedEditServer) AddEdge(context.Context, *GraphElement) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method AddEdge not implemented") } -func (UnimplementedEditServer) BulkAdd(Edit_BulkAddServer) error { +func (UnimplementedEditServer) BulkAdd(grpc.ClientStreamingServer[GraphElement, BulkEditResult]) error { return status.Errorf(codes.Unimplemented, "method BulkAdd not implemented") } +func (UnimplementedEditServer) BulkAddRaw(grpc.ClientStreamingServer[RawJson, BulkJsonEditResult]) error { + return status.Errorf(codes.Unimplemented, "method BulkAddRaw not implemented") +} func (UnimplementedEditServer) AddGraph(context.Context, *GraphID) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method AddGraph not implemented") } func (UnimplementedEditServer) DeleteGraph(context.Context, *GraphID) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteGraph not implemented") } +func (UnimplementedEditServer) BulkDelete(context.Context, *DeleteData) (*EditResult, error) { + return nil, status.Errorf(codes.Unimplemented, "method BulkDelete not implemented") +} func (UnimplementedEditServer) DeleteVertex(context.Context, *ElementID) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteVertex not implemented") } @@ -1106,6 +1080,9 @@ func (UnimplementedEditServer) DeleteIndex(context.Context, *IndexID) (*EditResu func (UnimplementedEditServer) AddSchema(context.Context, *Graph) (*EditResult, error) { return nil, status.Errorf(codes.Unimplemented, "method AddSchema not implemented") } +func (UnimplementedEditServer) AddJsonSchema(context.Context, *RawJson) (*EditResult, error) { + return nil, status.Errorf(codes.Unimplemented, "method AddJsonSchema not implemented") +} func (UnimplementedEditServer) SampleSchema(context.Context, *GraphID) (*Graph, error) { return nil, status.Errorf(codes.Unimplemented, "method SampleSchema not implemented") } @@ -1113,6 +1090,7 @@ func (UnimplementedEditServer) AddMapping(context.Context, *Graph) (*EditResult, return nil, status.Errorf(codes.Unimplemented, "method AddMapping not implemented") } func (UnimplementedEditServer) mustEmbedUnimplementedEditServer() {} +func (UnimplementedEditServer) testEmbeddedByValue() {} // UnsafeEditServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to EditServer will @@ -1122,6 +1100,13 @@ type UnsafeEditServer interface { } func RegisterEditServer(s grpc.ServiceRegistrar, srv EditServer) { + // If the following call pancis, it indicates UnimplementedEditServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Edit_ServiceDesc, srv) } @@ -1135,7 +1120,7 @@ func _Edit_AddVertex_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddVertex", + FullMethod: Edit_AddVertex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddVertex(ctx, req.(*GraphElement)) @@ -1153,7 +1138,7 @@ func _Edit_AddEdge_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddEdge", + FullMethod: Edit_AddEdge_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddEdge(ctx, req.(*GraphElement)) @@ -1162,30 +1147,18 @@ func _Edit_AddEdge_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Edit_BulkAdd_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(EditServer).BulkAdd(&editBulkAddServer{stream}) + return srv.(EditServer).BulkAdd(&grpc.GenericServerStream[GraphElement, BulkEditResult]{ServerStream: stream}) } -type Edit_BulkAddServer interface { - SendAndClose(*BulkEditResult) error - Recv() (*GraphElement, error) - grpc.ServerStream -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Edit_BulkAddServer = grpc.ClientStreamingServer[GraphElement, BulkEditResult] -type editBulkAddServer struct { - grpc.ServerStream +func _Edit_BulkAddRaw_Handler(srv interface{}, stream grpc.ServerStream) error { + return srv.(EditServer).BulkAddRaw(&grpc.GenericServerStream[RawJson, BulkJsonEditResult]{ServerStream: stream}) } -func (x *editBulkAddServer) SendAndClose(m *BulkEditResult) error { - return x.ServerStream.SendMsg(m) -} - -func (x *editBulkAddServer) Recv() (*GraphElement, error) { - m := new(GraphElement) - if err := x.ServerStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type Edit_BulkAddRawServer = grpc.ClientStreamingServer[RawJson, BulkJsonEditResult] func _Edit_AddGraph_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GraphID) @@ -1197,7 +1170,7 @@ func _Edit_AddGraph_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddGraph", + FullMethod: Edit_AddGraph_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddGraph(ctx, req.(*GraphID)) @@ -1215,7 +1188,7 @@ func _Edit_DeleteGraph_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/DeleteGraph", + FullMethod: Edit_DeleteGraph_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).DeleteGraph(ctx, req.(*GraphID)) @@ -1223,6 +1196,24 @@ func _Edit_DeleteGraph_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } +func _Edit_BulkDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteData) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EditServer).BulkDelete(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Edit_BulkDelete_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EditServer).BulkDelete(ctx, req.(*DeleteData)) + } + return interceptor(ctx, in, info, handler) +} + func _Edit_DeleteVertex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ElementID) if err := dec(in); err != nil { @@ -1233,7 +1224,7 @@ func _Edit_DeleteVertex_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/DeleteVertex", + FullMethod: Edit_DeleteVertex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).DeleteVertex(ctx, req.(*ElementID)) @@ -1251,7 +1242,7 @@ func _Edit_DeleteEdge_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/DeleteEdge", + FullMethod: Edit_DeleteEdge_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).DeleteEdge(ctx, req.(*ElementID)) @@ -1269,7 +1260,7 @@ func _Edit_AddIndex_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddIndex", + FullMethod: Edit_AddIndex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddIndex(ctx, req.(*IndexID)) @@ -1287,7 +1278,7 @@ func _Edit_DeleteIndex_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/DeleteIndex", + FullMethod: Edit_DeleteIndex_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).DeleteIndex(ctx, req.(*IndexID)) @@ -1305,7 +1296,7 @@ func _Edit_AddSchema_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddSchema", + FullMethod: Edit_AddSchema_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddSchema(ctx, req.(*Graph)) @@ -1313,6 +1304,24 @@ func _Edit_AddSchema_Handler(srv interface{}, ctx context.Context, dec func(inte return interceptor(ctx, in, info, handler) } +func _Edit_AddJsonSchema_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(RawJson) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(EditServer).AddJsonSchema(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Edit_AddJsonSchema_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(EditServer).AddJsonSchema(ctx, req.(*RawJson)) + } + return interceptor(ctx, in, info, handler) +} + func _Edit_SampleSchema_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GraphID) if err := dec(in); err != nil { @@ -1323,7 +1332,7 @@ func _Edit_SampleSchema_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/SampleSchema", + FullMethod: Edit_SampleSchema_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).SampleSchema(ctx, req.(*GraphID)) @@ -1341,7 +1350,7 @@ func _Edit_AddMapping_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Edit/AddMapping", + FullMethod: Edit_AddMapping_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(EditServer).AddMapping(ctx, req.(*Graph)) @@ -1372,6 +1381,10 @@ var Edit_ServiceDesc = grpc.ServiceDesc{ MethodName: "DeleteGraph", Handler: _Edit_DeleteGraph_Handler, }, + { + MethodName: "BulkDelete", + Handler: _Edit_BulkDelete_Handler, + }, { MethodName: "DeleteVertex", Handler: _Edit_DeleteVertex_Handler, @@ -1392,6 +1405,10 @@ var Edit_ServiceDesc = grpc.ServiceDesc{ MethodName: "AddSchema", Handler: _Edit_AddSchema_Handler, }, + { + MethodName: "AddJsonSchema", + Handler: _Edit_AddJsonSchema_Handler, + }, { MethodName: "SampleSchema", Handler: _Edit_SampleSchema_Handler, @@ -1407,10 +1424,21 @@ var Edit_ServiceDesc = grpc.ServiceDesc{ Handler: _Edit_BulkAdd_Handler, ClientStreams: true, }, + { + StreamName: "BulkAddRaw", + Handler: _Edit_BulkAddRaw_Handler, + ClientStreams: true, + }, }, Metadata: "gripql.proto", } +const ( + Configure_StartPlugin_FullMethodName = "/gripql.Configure/StartPlugin" + Configure_ListPlugins_FullMethodName = "/gripql.Configure/ListPlugins" + Configure_ListDrivers_FullMethodName = "/gripql.Configure/ListDrivers" +) + // ConfigureClient is the client API for Configure service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -1429,8 +1457,9 @@ func NewConfigureClient(cc grpc.ClientConnInterface) ConfigureClient { } func (c *configureClient) StartPlugin(ctx context.Context, in *PluginConfig, opts ...grpc.CallOption) (*PluginStatus, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(PluginStatus) - err := c.cc.Invoke(ctx, "/gripql.Configure/StartPlugin", in, out, opts...) + err := c.cc.Invoke(ctx, Configure_StartPlugin_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1438,8 +1467,9 @@ func (c *configureClient) StartPlugin(ctx context.Context, in *PluginConfig, opt } func (c *configureClient) ListPlugins(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ListPluginsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListPluginsResponse) - err := c.cc.Invoke(ctx, "/gripql.Configure/ListPlugins", in, out, opts...) + err := c.cc.Invoke(ctx, Configure_ListPlugins_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1447,8 +1477,9 @@ func (c *configureClient) ListPlugins(ctx context.Context, in *Empty, opts ...gr } func (c *configureClient) ListDrivers(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ListDriversResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(ListDriversResponse) - err := c.cc.Invoke(ctx, "/gripql.Configure/ListDrivers", in, out, opts...) + err := c.cc.Invoke(ctx, Configure_ListDrivers_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -1457,7 +1488,7 @@ func (c *configureClient) ListDrivers(ctx context.Context, in *Empty, opts ...gr // ConfigureServer is the server API for Configure service. // All implementations must embed UnimplementedConfigureServer -// for forward compatibility +// for forward compatibility. type ConfigureServer interface { StartPlugin(context.Context, *PluginConfig) (*PluginStatus, error) ListPlugins(context.Context, *Empty) (*ListPluginsResponse, error) @@ -1465,9 +1496,12 @@ type ConfigureServer interface { mustEmbedUnimplementedConfigureServer() } -// UnimplementedConfigureServer must be embedded to have forward compatible implementations. -type UnimplementedConfigureServer struct { -} +// UnimplementedConfigureServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedConfigureServer struct{} func (UnimplementedConfigureServer) StartPlugin(context.Context, *PluginConfig) (*PluginStatus, error) { return nil, status.Errorf(codes.Unimplemented, "method StartPlugin not implemented") @@ -1479,6 +1513,7 @@ func (UnimplementedConfigureServer) ListDrivers(context.Context, *Empty) (*ListD return nil, status.Errorf(codes.Unimplemented, "method ListDrivers not implemented") } func (UnimplementedConfigureServer) mustEmbedUnimplementedConfigureServer() {} +func (UnimplementedConfigureServer) testEmbeddedByValue() {} // UnsafeConfigureServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to ConfigureServer will @@ -1488,6 +1523,13 @@ type UnsafeConfigureServer interface { } func RegisterConfigureServer(s grpc.ServiceRegistrar, srv ConfigureServer) { + // If the following call pancis, it indicates UnimplementedConfigureServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&Configure_ServiceDesc, srv) } @@ -1501,7 +1543,7 @@ func _Configure_StartPlugin_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Configure/StartPlugin", + FullMethod: Configure_StartPlugin_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ConfigureServer).StartPlugin(ctx, req.(*PluginConfig)) @@ -1519,7 +1561,7 @@ func _Configure_ListPlugins_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Configure/ListPlugins", + FullMethod: Configure_ListPlugins_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ConfigureServer).ListPlugins(ctx, req.(*Empty)) @@ -1537,7 +1579,7 @@ func _Configure_ListDrivers_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/gripql.Configure/ListDrivers", + FullMethod: Configure_ListDrivers_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ConfigureServer).ListDrivers(ctx, req.(*Empty)) diff --git a/engine/inspect/haslabel.go b/gripql/inspect/haslabel.go similarity index 86% rename from engine/inspect/haslabel.go rename to gripql/inspect/haslabel.go index fa9abdccb..aae670c66 100644 --- a/engine/inspect/haslabel.go +++ b/gripql/inspect/haslabel.go @@ -5,6 +5,9 @@ import ( "github.com/bmeg/grip/util/protoutil" ) +// Determine if a pipeline starts with 'V().hasLabel(x)' and trim it out +// This can be used to optimize pipelines that start with looking up vertex labels +// using an index func FindVertexHasLabelStart(pipe []*gripql.GraphStatement) ([]string, []*gripql.GraphStatement) { hasLabelLen := 0 labels := []string{} @@ -40,13 +43,6 @@ func FindEdgeHasLabelStart(pipe []*gripql.GraphStatement) ([]string, []*gripql.G if isDone { break } - if i == 0 { - if _, ok := step.GetStatement().(*gripql.GraphStatement_E); ok { - } else { - break - } - continue - } switch s := step.GetStatement().(type) { case *gripql.GraphStatement_HasLabel: labels = protoutil.AsStringList(s.HasLabel) diff --git a/engine/inspect/inspect.go b/gripql/inspect/inspect.go similarity index 64% rename from engine/inspect/inspect.go rename to gripql/inspect/inspect.go index 411909090..aab4fb5c2 100644 --- a/engine/inspect/inspect.go +++ b/gripql/inspect/inspect.go @@ -3,9 +3,10 @@ package inspect import ( "fmt" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/util/protoutil" ) @@ -21,15 +22,6 @@ func arrayEq(a, b []string) bool { return true } -func contains(a []string, n string) bool { - for _, c := range a { - if c == n { - return true - } - } - return false -} - // PipelineSteps create an array, the same length at stmts that labels the // step id for each of the GraphStatements func PipelineSteps(stmts []*gripql.GraphStatement) []string { @@ -39,7 +31,7 @@ func PipelineSteps(stmts []*gripql.GraphStatement) []string { switch gs.GetStatement().(type) { //These commands all change the position of the traveler. When that happens, //we go to the next 'step' of the traversal - case *gripql.GraphStatement_V, *gripql.GraphStatement_E, *gripql.GraphStatement_Out, + case *gripql.GraphStatement_V, *gripql.GraphStatement_Out, *gripql.GraphStatement_In, *gripql.GraphStatement_OutE, *gripql.GraphStatement_InE, *gripql.GraphStatement_Both, *gripql.GraphStatement_BothE, *gripql.GraphStatement_Select, *gripql.GraphStatement_InNull, *gripql.GraphStatement_OutNull, @@ -51,8 +43,10 @@ func PipelineSteps(stmts []*gripql.GraphStatement) []string { *gripql.GraphStatement_Range, *gripql.GraphStatement_Aggregate, *gripql.GraphStatement_Render, *gripql.GraphStatement_Fields, *gripql.GraphStatement_Unwind, *gripql.GraphStatement_Path, *gripql.GraphStatement_Set, *gripql.GraphStatement_Increment, - *gripql.GraphStatement_Mark, *gripql.GraphStatement_Jump: - case *gripql.GraphStatement_LookupVertsIndex, *gripql.GraphStatement_EngineCustom: + *gripql.GraphStatement_Mark, *gripql.GraphStatement_Jump, *gripql.GraphStatement_Sort, + *gripql.GraphStatement_Pivot, *gripql.GraphStatement_Group, *gripql.GraphStatement_Totype: + case *gripql.GraphStatement_LookupVertsLabelIndex, + *gripql.GraphStatement_EngineCustom: default: log.Errorf("Unknown Graph Statement: %T", gs.GetStatement()) } @@ -77,40 +71,76 @@ func PipelineAsSteps(stmts []*gripql.GraphStatement) map[string]string { } // PipelineStepOutputs identify the required outputs for each step in the traversal -func PipelineStepOutputs(stmts []*gripql.GraphStatement) map[string][]string { +// If fields, or specific steps of the traversal are not detected by this step, they +// may be omitted from the loading. For example, in a out().out() jump the middle +// vertex is never actual accessed, it's just part of the traversal, so the data from +// it doesn't need to be loaded +func PipelineStepOutputs(stmts []*gripql.GraphStatement, storeMarks bool) map[string][]string { + // mapping of what steps of the traversal as used at each stage of the pipeline steps := PipelineSteps(stmts) + asMap := PipelineAsSteps(stmts) + // we're inpecting the pipeline backwards, the last step is emitted onLast := true out := map[string][]string{} for i := len(stmts) - 1; i >= 0; i-- { gs := stmts[i] switch gs.GetStatement().(type) { case *gripql.GraphStatement_Count: + //if the pipeline ends with counting, we don't need to load data onLast = false case *gripql.GraphStatement_Select: + //if the last step is jumping back to a previous mark if onLast { - sel := gs.GetSelect().Marks - for _, s := range sel { - if a, ok := asMap[s]; ok { - out[a] = []string{"*"} - } + sel := gs.GetSelect() + if a, ok := asMap[sel]; ok { + out[a] = []string{"*"} } onLast = false } + + case *gripql.GraphStatement_Render: + // determine every step output that is needed for the render + val := gs.GetRender().AsInterface() + names := tpath.GetAllNamespaces(val) + for _, n := range names { + if n == tpath.CURRENT { + out[steps[i]] = []string{"*"} + } + if a, ok := asMap[n]; ok { + out[a] = []string{"*"} + } + } + onLast = false + + case *gripql.GraphStatement_Pivot: + if onLast { + out[steps[i]] = []string{"*"} + } + onLast = false + + case *gripql.GraphStatement_Group: + for _, f := range gs.GetGroup().Fields { + n := tpath.GetNamespace(f) + if a, ok := asMap[n]; ok { + out[a] = []string{"*"} + } + } + case *gripql.GraphStatement_Distinct: //if there is a distinct step, we need to load data, but only for requested fields fields := protoutil.AsStringList(gs.GetDistinct()) for _, f := range fields { - n := jsonpath.GetNamespace(f) - if n == "__current__" { + n := tpath.GetNamespace(f) + if n == tpath.CURRENT { out[steps[i]] = []string{"*"} } if a, ok := asMap[n]; ok { out[a] = []string{"*"} } } - case *gripql.GraphStatement_V, *gripql.GraphStatement_E, + case *gripql.GraphStatement_V, *gripql.GraphStatement_Out, *gripql.GraphStatement_In, *gripql.GraphStatement_OutE, *gripql.GraphStatement_InE, *gripql.GraphStatement_Both, *gripql.GraphStatement_BothE: @@ -118,7 +148,15 @@ func PipelineStepOutputs(stmts []*gripql.GraphStatement) map[string][]string { out[steps[i]] = []string{"*"} } onLast = false - case *gripql.GraphStatement_LookupVertsIndex: + + case *gripql.GraphStatement_Sort, *gripql.GraphStatement_Totype, + *gripql.GraphStatement_Unwind, *gripql.GraphStatement_Aggregate: + if onLast { + out[steps[i]] = []string{"*"} + } + onLast = false + + case *gripql.GraphStatement_LookupVertsLabelIndex: if onLast { out[steps[i]] = []string{"*"} } @@ -134,12 +172,21 @@ func PipelineStepOutputs(stmts []*gripql.GraphStatement) map[string][]string { out[steps[i]] = []string{"*"} } } + //if the job is a fragment, the elements marked with as_, they may be needed + //in followup runs + if storeMarks { + for _, v := range asMap { + out[v] = []string{"*"} + } + } return out } +// DEPRECATED : Was used for older version of GRIDS engine // PipelineNoLoadPath identifies 'paths' which are groups of statements that move // travelers across multiple steps, and don't require data (other then the label) // to be loaded +/* func PipelineNoLoadPath(stmts []*gripql.GraphStatement, minLen int) [][]int { out := [][]int{} @@ -170,3 +217,4 @@ func PipelineNoLoadPath(stmts []*gripql.GraphStatement, minLen int) [][]int { } return out } +*/ diff --git a/gripql/javascript/Makefile b/gripql/javascript/Makefile deleted file mode 100644 index 8efdc8485..000000000 --- a/gripql/javascript/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -# go install github.com/go-bindata/go-bindata/... - -build: - go-bindata -nocompress -pkg gripqljs -o gripqljs.go gripql.js diff --git a/gripql/javascript/gripql.js b/gripql/javascript/gripql.js index 8164e3f9a..9ad8f43ad 100644 --- a/gripql/javascript/gripql.js +++ b/gripql/javascript/gripql.js @@ -9,9 +9,14 @@ function process(val) { return val } -function query() { +function resume() { + return query() +} + +function query(client=null) { return { query: [], + client: client, V: function(id) { this.query.push({'v': process(id)}) return this @@ -76,8 +81,8 @@ function query() { this.query.push({'as': name}) return this }, - select: function(marks) { - this.query.push({'select': {'marks': process(marks)}}) + select: function(name) { + this.query.push({'select': name}) return this }, limit: function(n) { @@ -143,6 +148,21 @@ function query() { aggregate: function() { this.query.push({'aggregate': {'aggregations': Array.prototype.slice.call(arguments)}}) return this + }, + sort: function(field, descending=true) { + this.query.push({'sort': {'fields': [{"field":field, "descending":descending}] }}) + return this + }, + unwind: function(field) { + this.query.push({"unwind": field}) + return this + }, + group: function(fields) { + this.query.push({"group": {"fields":fields}}) + return this + }, + toList: function() { + return this.client.toList( {"query": this.query} ) } } } @@ -256,6 +276,37 @@ function histogram(name, field, interval) { } } +function count(name) { + return { + "name": name, + "count": {} + } +} + +function field(name, field){ + return { + "name": name, + "field": { + "field": field + } + } +} + +gripql = { + "lt" : lt, + "gt" : gt, + "lte" : lte, + "gte" : gte, + "eq" : eq, + "without": without, + "within" : within, + "inside" : inside, + "field" : field, + "count" : count, + "histogram": histogram, + "percentile": percentile, +} + function V(id) { return query().V(id) } diff --git a/gripql/javascript/gripqljs.go b/gripql/javascript/gripqljs.go index 4b2386c2e..dc89e3d0c 100644 --- a/gripql/javascript/gripqljs.go +++ b/gripql/javascript/gripqljs.go @@ -1,482 +1,13 @@ -// Code generated for package gripqljs by go-bindata DO NOT EDIT. (@generated) -// sources: -// gripql.js package gripqljs import ( - "fmt" - "io/ioutil" - "os" - "path/filepath" - "strings" - "time" + "embed" ) -type asset struct { - bytes []byte - info os.FileInfo -} - -type bindataFileInfo struct { - name string - size int64 - mode os.FileMode - modTime time.Time -} - -// Name return file name -func (fi bindataFileInfo) Name() string { - return fi.name -} - -// Size return file size -func (fi bindataFileInfo) Size() int64 { - return fi.size -} - -// Mode return file mode -func (fi bindataFileInfo) Mode() os.FileMode { - return fi.mode -} - -// Mode return file modify time -func (fi bindataFileInfo) ModTime() time.Time { - return fi.modTime -} - -// IsDir return file whether a directory -func (fi bindataFileInfo) IsDir() bool { - return fi.mode&os.ModeDir != 0 -} - -// Sys return file is sys mode -func (fi bindataFileInfo) Sys() interface{} { - return nil -} - -var _gripqlJs = []byte(`function process(val) { - if (!val) { - val = [] - } else if (typeof val == "string" || typeof val == "number") { - val = [val] - } else if (!Array.isArray(val)) { - throw "not something we know how to process into an array" - } - return val -} - -function query() { - return { - query: [], - V: function(id) { - this.query.push({'v': process(id)}) - return this - }, - E: function(id) { - this.query.push({'e': process(id)}) - return this - }, - out: function(label) { - this.query.push({'out': process(label)}) - return this - }, - outNull: function(label) { - this.query.push({'outNull': process(label)}) - return this - }, - in_: function(label) { - this.query.push({'in': process(label)}) - return this - }, - inNull: function(label) { - this.query.push({'inNull': process(label)}) - return this - }, - both: function(label) { - this.query.push({'both': process(label)}) - return this - }, - outV: function(label) { - this.query.push({'outV': process(label)}) - return this - }, - inV: function(label) { - this.query.push({'inV': process(label)}) - return this - }, - bothV: function(label) { - this.query.push({'bothV': process(label)}) - return this - }, - outE: function(label) { - this.query.push({'outE': process(label)}) - return this - }, - outENull: function(label) { - this.query.push({'outENull': process(label)}) - return this - }, - inE: function(label) { - this.query.push({'inE': process(label)}) - return this - }, - inENull: function(label) { - this.query.push({'inENull': process(label)}) - return this - }, - bothE: function(label) { - this.query.push({'bothE': process(label)}) - return this - }, - as_: function(name) { - this.query.push({'as': name}) - return this - }, - select: function(marks) { - this.query.push({'select': {'marks': process(marks)}}) - return this - }, - limit: function(n) { - this.query.push({'limit': n}) - return this - }, - skip: function(n) { - this.query.push({'skip': n}) - return this - }, - range: function(start, stop) { - this.query.push({'range': {'start': start, 'stop': stop}}) - return this - }, - count: function() { - this.query.push({'count': ''}) - return this - }, - distinct: function(val) { - this.query.push({'distinct': process(val)}) - return this - }, - fields: function(fields) { - this.query.push({'fields': fields}) - return this - }, - render: function(r) { - this.query.push({'render': r}) - return this - }, - has: function(expression) { - this.query.push({'has': expression}) - return this - }, - hasLabel: function(label) { - this.query.push({'hasLabel': process(label)}) - return this - }, - hasId: function(id) { - this.query.push({'hasId': process(id)}) - return this - }, - hasKey: function(key) { - this.query.push({'hasKey': process(key)}) - return this - }, - set: function(key, value) { - this.query.push({'set':{'key':key, 'value':value}}) - return this - }, - increment: function(key, value) { - this.query.push({'increment':{'key':key, 'value':value}}) - return this - }, - jump: function(mark, expression, emit) { - this.query.push({"jump": {"mark":mark, "expression" : expression, "emit":emit}}) - return this - }, - mark: function(name){ - this.query.push({"mark": name}) - return this - }, - aggregate: function() { - this.query.push({'aggregate': {'aggregations': Array.prototype.slice.call(arguments)}}) - return this - } - } -} - -// Where operators -function and_() { - return {'and': {'expressions': Array.prototype.slice.call(arguments)}} -} - -function or_() { - return {'or': {'expressions': Array.prototype.slice.call(arguments)}} -} - -function not_(expression) { - return {'not': expression} -} - -function eq(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'EQ'}} -} - -function neq(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'NEQ'}} -} - -function gt(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'GT'}} -} - -function gte(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'GTE'}} -} - -function lt(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'LT'}} -} - -function lte(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'LTE'}} -} - -function inside(key, values) { - return {'condition': {'key': key, 'value': process(values), 'condition': 'INSIDE'}} -} - -function outside(key, values) { - return {'condition': {'key': key, 'value': process(values), 'condition': 'OUTSIDE'}} -} - -function between(key, values) { - return {'condition': {'key': key, 'value': process(values), 'condition': 'BETWEEN'}} -} -function within(key, values) { - return {'condition': {'key': key, 'value': process(values), 'condition': 'WITHIN'}} -} - -function without(key, values) { - return {'condition': {'key': key, 'value': process(values), 'condition': 'WITHOUT'}} -} - -function contains(key, value) { - return {'condition': {'key': key, 'value': value, 'condition': 'CONTAINS'}} -} - -// Aggregation builders -function term(name, field, size) { - agg = { - "name": name, - "term": {"field": field} - } - if (size) { - if (typeof size != "number") { - throw "expected size to be a number" - } - agg["term"]["size"] = size - } - return agg -} - -function percentile(name, field, percents) { - if (!percents) { - percents = [1, 5, 25, 50, 75, 95, 99] - } else { - percents = process(percents) - } - - if (!percents.every(function(x){ return typeof x == "number" })) { - throw "percents expected to be an array of numbers" - } - - return { - "name": name, - "percentile": { - "field": field, "percents": percents - } - } -} - -function histogram(name, field, interval) { - if (interval) { - if (typeof interval != "number") { - throw "expected interval to be a number" - } - } - return { - "name": name, - "histogram": { - "field": field, "interval": interval - } - } -} - -function V(id) { - return query().V(id) -} - -function E(id) { - return query().E(id) -} -`) - -func gripqlJsBytes() ([]byte, error) { - return _gripqlJs, nil -} - -func gripqlJs() (*asset, error) { - bytes, err := gripqlJsBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "gripql.js", size: 5921, mode: os.FileMode(420), modTime: time.Unix(1689808257, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -// Asset loads and returns the asset for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) - } - return a.bytes, nil - } - return nil, fmt.Errorf("Asset %s not found", name) -} - -// MustAsset is like Asset but panics when Asset would return an error. -// It simplifies safe initialization of global variables. -func MustAsset(name string) []byte { - a, err := Asset(name) - if err != nil { - panic("asset: Asset(" + name + "): " + err.Error()) - } - - return a -} - -// AssetInfo loads and returns the asset info for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) - } - return a.info, nil - } - return nil, fmt.Errorf("AssetInfo %s not found", name) -} - -// AssetNames returns the names of the assets. -func AssetNames() []string { - names := make([]string, 0, len(_bindata)) - for name := range _bindata { - names = append(names, name) - } - return names -} - -// _bindata is a table, holding each asset generator, mapped to its name. -var _bindata = map[string]func() (*asset, error){ - "gripql.js": gripqlJs, -} - -// AssetDir returns the file names below a certain -// directory embedded in the file by go-bindata. -// For example if you run go-bindata on data/... and data contains the -// following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png -// then AssetDir("data") would return []string{"foo.txt", "img"} -// AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error -// AssetDir("") will return []string{"data"}. -func AssetDir(name string) ([]string, error) { - node := _bintree - if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") - for _, p := range pathList { - node = node.Children[p] - if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - } - } - if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - rv := make([]string, 0, len(node.Children)) - for childName := range node.Children { - rv = append(rv, childName) - } - return rv, nil -} - -type bintree struct { - Func func() (*asset, error) - Children map[string]*bintree -} - -var _bintree = &bintree{nil, map[string]*bintree{ - "gripql.js": &bintree{gripqlJs, map[string]*bintree{}}, -}} - -// RestoreAsset restores an asset under the given directory -func RestoreAsset(dir, name string) error { - data, err := Asset(name) - if err != nil { - return err - } - info, err := AssetInfo(name) - if err != nil { - return err - } - err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) - if err != nil { - return err - } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) - if err != nil { - return err - } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil -} - -// RestoreAssets restores an asset under the given directory recursively -func RestoreAssets(dir, name string) error { - children, err := AssetDir(name) - // File - if err != nil { - return RestoreAsset(dir, name) - } - // Dir - for _, child := range children { - err = RestoreAssets(dir, filepath.Join(name, child)) - if err != nil { - return err - } - } - return nil -} +//go:embed gripql.js +var js embed.FS -func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) +func Asset(path string) (string, error) { + data, err := js.ReadFile(path) + return string(data), err } diff --git a/gripql/javascript/parse.go b/gripql/javascript/parse.go new file mode 100644 index 000000000..c9e6f5ca2 --- /dev/null +++ b/gripql/javascript/parse.go @@ -0,0 +1,48 @@ +package gripqljs + +import ( + "encoding/json" + "fmt" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/jsengine/underscore" + "github.com/dop251/goja" + "google.golang.org/protobuf/encoding/protojson" +) + +func ParseQuery(queryString string) (*gripql.GraphQuery, error) { + vm := goja.New() + us, err := underscore.Asset("underscore.js") + if err != nil { + return nil, fmt.Errorf("failed to load underscore.js") + } + if _, err := vm.RunString(string(us)); err != nil { + return nil, err + } + gripqlString, err := Asset("gripql.js") + if err != nil { + return nil, fmt.Errorf("failed to load gripql.js") + } + if _, err := vm.RunString(string(gripqlString)); err != nil { + return nil, err + } + + val, err := vm.RunString(queryString) + if err != nil { + return nil, err + } + obj := val.ToObject(vm) + obj.Delete("client") + queryJSON, err := json.Marshal(obj) + if err != nil { + return nil, err + } + //fmt.Printf("%s\n", queryJSON) + query := gripql.GraphQuery{} + err = protojson.Unmarshal(queryJSON, &query) + if err != nil { + return nil, err + } + + return &query, nil +} diff --git a/gripql/marshal_flattened.go b/gripql/marshal_flattened.go new file mode 100644 index 000000000..e1920a6fb --- /dev/null +++ b/gripql/marshal_flattened.go @@ -0,0 +1,126 @@ +package gripql + +import ( + "fmt" + + "github.com/bytedance/sonic" + "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/structpb" +) + +type MarshalFlatten struct { + marshal protojson.MarshalOptions + unmarshal protojson.UnmarshalOptions +} + +func NewFlattenMarshaler() *MarshalFlatten { + return &MarshalFlatten{ + protojson.MarshalOptions{EmitUnpopulated: true}, + protojson.UnmarshalOptions{}, + } +} + +func (mflat *MarshalFlatten) Marshal(d any) ([]byte, error) { + switch x := d.(type) { + case *Vertex: + out := x.Data.AsMap() + out["_id"] = x.Id + out["_label"] = x.Label + return sonic.ConfigFastest.Marshal(out) + case *Edge: + out := x.Data.AsMap() + out["_id"] = x.Id + out["_label"] = x.Label + out["_to"] = x.To + out["_from"] = x.From + return sonic.ConfigFastest.Marshal(d) + case *QueryResult: + if e := x.GetVertex(); e != nil { + out := e.Data.AsMap() + out["_id"] = e.Id + out["_label"] = e.Label + return sonic.ConfigFastest.Marshal(map[string]any{"vertex": out}) + } else if e := x.GetEdge(); e != nil { + out := e.Data.AsMap() + out["_id"] = e.Id + out["_label"] = e.Label + out["_to"] = e.To + out["_from"] = e.From + return sonic.ConfigFastest.Marshal(map[string]any{"edge": out}) + } + } + if x, ok := d.(proto.Message); ok { + return mflat.marshal.Marshal(x) + } + return sonic.ConfigFastest.Marshal(d) +} + +func (mflat *MarshalFlatten) Unmarshal(data []byte, v any) error { + if x, ok := v.(proto.Message); ok { + if y, ok := v.(*Vertex); ok { + z := map[string]any{} + err := sonic.ConfigFastest.Unmarshal(data, &z) + if err != nil { + return err + } + data := map[string]any{} + for k, v := range z { + if k == "_id" { + if kStr, ok := v.(string); ok { + y.Id = kStr + } + } else if k == "_label" { + if kStr, ok := v.(string); ok { + y.Label = kStr + } + } else { + data[k] = v + } + } + s, err := structpb.NewStruct(data) + if err != nil { + fmt.Printf("NewStruct error: %s", err) + } + if err == nil { + y.Data = s + return nil + } + } else if y, ok := v.(*Edge); ok { + z := map[string]any{} + err := sonic.ConfigFastest.Unmarshal(data, &z) + if err != nil { + return err + } + data := map[string]any{} + for k, v := range z { + if k == "_id" { + if kStr, ok := v.(string); ok { + y.Id = kStr + } + } else if k == "_label" { + if kStr, ok := v.(string); ok { + y.Label = kStr + } + } else if k == "_to" { + if kStr, ok := v.(string); ok { + y.To = kStr + } + } else if k == "_from" { + if kStr, ok := v.(string); ok { + y.From = kStr + } + } else { + data[k] = v + } + } + s, err := structpb.NewStruct(data) + if err == nil { + y.Data = s + return nil + } + } + return mflat.unmarshal.Unmarshal(data, x) + } + return sonic.ConfigFastest.Unmarshal(data, v) +} diff --git a/gripql/python/README.md b/gripql/python/README.md index d602022a6..f8767d5be 100644 --- a/gripql/python/README.md +++ b/gripql/python/README.md @@ -1,9 +1,8 @@ [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -GRIP Client -=========== +# GRIP Client -__gripql__ is a python library for interacting with a GRIP server. +**gripql** is a python library for interacting with a GRIP server. ### Install @@ -22,3 +21,12 @@ pip install "git+https://github.com/bmeg/grip.git#subdirectory=gripql/python" ### Getting Started Check out the getting started guide [here](https://bmeg.github.io/grip/docs/queries/getting_started/). + +## Steps to Create a New Pypi Release + +1. Increment the release version. Release version can be found at the bottom of `gripql/__init__.py` +2. `export TWINE_USERNAME=` # the username to use for authentication to the repository. +3. `export TWINE_PASSWORD=` # the password to use for authentication to the repository. +4. Remove old build dir `rm -r dist/` +5. pip install dev tools `pip install -r requirements-dev.txt` +6. push a new version `twine upload dist/*` diff --git a/gripql/python/gripql/__init__.py b/gripql/python/gripql/__init__.py index 3ff47cfee..bbacd739d 100644 --- a/gripql/python/gripql/__init__.py +++ b/gripql/python/gripql/__init__.py @@ -36,4 +36,4 @@ count ] -__version__ = "0.7.0" +__version__ = "0.8.0" diff --git a/gripql/python/gripql/aggregations.py b/gripql/python/gripql/aggregations.py index 2d693f392..9be79c11f 100644 --- a/gripql/python/gripql/aggregations.py +++ b/gripql/python/gripql/aggregations.py @@ -46,4 +46,4 @@ def count(name): return { "name": name, "count": {} - } + } \ No newline at end of file diff --git a/gripql/python/gripql/connection.py b/gripql/python/gripql/connection.py index d7cb1feba..4c4ed2f7d 100644 --- a/gripql/python/gripql/connection.py +++ b/gripql/python/gripql/connection.py @@ -41,6 +41,20 @@ def deleteGraph(self, name): ) raise_for_status(response) return response.json() + def addJsonSchema(self, fhirjson): + """ + Add a Json Schema for a graph + """ + payload = { + "graph": self.graph, + "data":fhirjson, + } + response = self.session.post( + self.url + "/jsonschema", + json=payload + ) + raise_for_status(response) + return response.json() def getSchema(self, name): """ @@ -91,10 +105,9 @@ def postMapping(self, name, vertices, edges): """ response = self.session.post( self.url + "/" + name + "/mapping", - json={"vertices" : vertices, "edges" : edges} + json={"vertices": vertices, "edges": edges} ) - #raise_for_status(response) - print("mapping", response.text) + raise_for_status(response) return response.json() def graph(self, name): diff --git a/gripql/python/gripql/graph.py b/gripql/python/gripql/graph.py index d235240e4..ea7c6b847 100644 --- a/gripql/python/gripql/graph.py +++ b/gripql/python/gripql/graph.py @@ -1,6 +1,7 @@ from __future__ import absolute_import, print_function, unicode_literals import json +import requests from gripql.util import BaseConnection, raise_for_status from gripql.query import Query @@ -12,6 +13,41 @@ def __init__(self, url, graph, user=None, password=None, token=None, credential_ self.url = self.base_url + "/v1/graph/" + graph self.graph = graph + # This method is what makes it possible to call query methods directly from a Graph object. + def __getattr__(self, name): + """ + Dynamically handles method calls that don't exist in Graph. + If the method exists in the Query class, it is called on a new Query object. + """ + # Create a new Query object + q = Query(self.base_url, self.graph, self.user, self.password, self.token, self.credential_file) + + # Check if the requested method exists in the Query class + if hasattr(q, name) and callable(getattr(q, name)): + # Return a wrapper function that calls the method on the Query object + def method_wrapper(*args, **kwargs): + return getattr(q, name)(*args, **kwargs) + return method_wrapper + + # If the method is not found, raise the default AttributeError + raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{name}'") + + + def addJsonSchema(self, fhirjson): + """ + Add a Json Schema for a graph + """ + payload = { + "graph": self.graph, + "data":fhirjson, + } + response = self.session.post( + self.url + "/jsonschema", + json=payload + ) + raise_for_status(response) + return response.json() + def addSchema(self, vertices=[], edges=[]): """ Add the schema for a graph. @@ -48,12 +84,12 @@ def sampleSchema(self): raise_for_status(response) return response.json() - def addVertex(self, gid, label, data={}): + def addVertex(self, id, label, data={}): """ Add vertex to a graph. """ payload = { - "gid": gid, + "id": id, "label": label, "data": data } @@ -64,29 +100,29 @@ def addVertex(self, gid, label, data={}): raise_for_status(response) return response.json() - def deleteVertex(self, gid): + def deleteVertex(self, id): """ Delete a vertex from the graph. """ - url = self.url + "/vertex/" + gid + url = self.url + "/vertex/" + id response = self.session.delete( url ) raise_for_status(response) return response.json() - def getVertex(self, gid): + def getVertex(self, id): """ Get a vertex by id. """ - url = self.url + "/vertex/" + gid + url = self.url + "/vertex/" + id response = self.session.get( url ) raise_for_status(response) return response.json() - def addEdge(self, src, dst, label, data={}, gid=None): + def addEdge(self, src, dst, label, data={}, id=None): """ Add edge to the graph. """ @@ -96,8 +132,8 @@ def addEdge(self, src, dst, label, data={}, gid=None): "label": label, "data": data } - if gid is not None: - payload["gid"] = gid + if id is not None: + payload["id"] = id response = self.session.post( self.url + "/edge", json=payload @@ -105,31 +141,50 @@ def addEdge(self, src, dst, label, data={}, gid=None): raise_for_status(response) return response.json() - def deleteEdge(self, gid): + def deleteEdge(self, id): """ Delete an edge from the graph. """ - url = self.url + "/edge/" + gid + url = self.url + "/edge/" + id response = self.session.delete( url ) raise_for_status(response) return response.json() - def getEdge(self, gid): + def getEdge(self, id): """ Get an edge by id. """ - url = self.url + "/edge/" + gid + url = self.url + "/edge/" + id response = self.session.get( url ) raise_for_status(response) return response.json() + def delete(self, vertices=[], edges=[]): + """ + delete data from graph + """ + payload = { + "graph": self.graph, + "vertices": vertices, + "edges": edges + } + response = self.session.delete( + self.base_url + "/v1/graph", + json=payload + ) + raise_for_status(response) + return response.json() + def bulkAdd(self): return BulkAdd(self.base_url, self.graph, self.user, self.password, self.token) + def bulkAddRaw(self): + return BulkAddRaw(self.base_url, self.graph, self.user, self.password, self.token) + def addIndex(self, label, field): url = self.url + "/index/" + label response = self.session.post( @@ -139,6 +194,14 @@ def addIndex(self, label, field): raise_for_status(response) return response.json() + def deleteIndex(self, label, field): + url = self.url + f"/index/{label}/{field}" + response = self.session.delete( + url, + ) + raise_for_status(response) + return response.json() + def listIndices(self): url = self.url + "/index" response = self.session.get( @@ -156,12 +219,6 @@ def listLabels(self): raise_for_status(response) return response.json() - def query(self): - """ - Create a query handle. - """ - return Query(self.base_url, self.graph, self.user, self.password, self.token, self.credential_file) - def resume(self, job_id): """ Create a query handle. @@ -250,18 +307,18 @@ def __init__(self, url, graph, user=None, password=None, token=None, credential_ self.graph = graph self.elements = [] - def addVertex(self, gid, label, data={}): + def addVertex(self, id, label, data={}): payload = { "graph": self.graph, "vertex": { - "gid": gid, + "id": id, "label": label, "data": data } } self.elements.append(json.dumps(payload)) - def addEdge(self, src, dst, label, data={}, gid=None): + def addEdge(self, src, dst, label, data={}, id=None): payload = { "graph": self.graph, "edge": { @@ -271,10 +328,37 @@ def addEdge(self, src, dst, label, data={}, gid=None): "data": data } } - if gid is not None: - payload["gid"] = gid + if id is not None: + payload["edge"]["id"] = id + self.elements.append(json.dumps(payload)) + + def execute(self): + payload = "\n".join(self.elements) + response = self.session.post( + self.url, + data=payload + ) + raise_for_status(response) + return response.json() + + +class BulkAddRaw(BaseConnection): + def __init__(self, url, graph, extraArgs=None, user=None, password=None, token=None, credential_file=None): + super(BulkAddRaw, self).__init__(url, user, password, token, credential_file) + self.url = self.base_url + "/v1/rawJson" + self.graph = graph + self.elements = [] + + + def addJson(self, data={}, extra_args={}): + payload = { + "graph": self.graph, + "extra_args": extra_args, + "data": data + } self.elements.append(json.dumps(payload)) + def execute(self): payload = "\n".join(self.elements) response = self.session.post( diff --git a/gripql/python/gripql/query.py b/gripql/python/gripql/query.py index 62563d0b5..8fa26c8cd 100644 --- a/gripql/python/gripql/query.py +++ b/gripql/python/gripql/query.py @@ -59,15 +59,6 @@ def V(self, id=[]): id = _wrap_str_value(id) return self.__append({"v": id}) - def E(self, id=[]): - """ - Start the query at an edge. - - "id" is an ID to start from. Optional. - """ - id = _wrap_str_value(id) - return self.__append({"e": id}) - def in_(self, label=[]): """ Follow an incoming edge to the source vertex. @@ -80,7 +71,7 @@ def in_(self, label=[]): def inNull(self, label=[]): """ - Follow an incoming edge to the source vertex. + Follow an incoming edge to the source vertex. If there are no incoming edges then a null value is emitted. "label" is the label of the edge to follow. "label" can be a list. @@ -104,7 +95,7 @@ def out(self, label=[]): def outNull(self, label=[]): """ - Follow an outgoing edge to the destination vertex. + Follow an outgoing edge to the destination vertex. If there are no outgoing edges then a null is emitted. "label" is the label of the edge to follow. "label" can be a list. @@ -114,6 +105,9 @@ def outNull(self, label=[]): def outV(self, label=[]): + """ + Move from an edge to the vertex on the outgoing side. Same as calling `out` on an edge (may be depricated) + """ return self.out(label) def both(self, label=[]): @@ -127,6 +121,12 @@ def both(self, label=[]): return self.__append({"both": label}) def bothV(self, label=[]): + """ + Follow both incoming and outgoing vertices from an edge. Only valid when called on an edge and provides same function as `both` (may be depricated) + + "label" is the label of the edge to follow. + "label" can be a list. + """ return self.both(label) def inE(self, label=[]): @@ -143,7 +143,7 @@ def inE(self, label=[]): def inENull(self, label=[]): """ - Move from a vertex to an incoming edge. + Move from a vertex to an incoming edge. If there are no incoming edges, emit a null. "label" is the label of the edge to move to. "label" can be a list. @@ -168,7 +168,7 @@ def outE(self, label=[]): def outENull(self, label=[]): """ - Move from a vertex to an outgoing edge. + Move from a vertex to an outgoing edge. If there are no outgoing edges emit a null. "label" is the label of the edge to move to. "label" can be a list. @@ -193,12 +193,33 @@ def bothE(self, label=[]): def has(self, expression): """ Filter vertex/edge based on properties. + + Expression is composed using arguments built with + - gripql.and_ + - gripql.or_ + - gripql.not_ + - gripql.eq + - gripql.neq + - gripql.gt + - gripql.gte + - gripql.lt + - gripql.lte + - gripql.inside + - gripql.outside + - gripql.between + - gripql.within + - gripql.without + - gripql.contains """ return self.__append({"has": expression}) def hasLabel(self, label): """ Filter vertex/edge based on label. + + q.hasLabel("LabelName) + is the same as invoking + q.has( gripql.eq("_label", "LabelName")) """ label = _wrap_str_value(label) return self.__append({"hasLabel": label}) @@ -206,6 +227,10 @@ def hasLabel(self, label): def hasId(self, id): """ Filter vertex/edge based on id. + + q.hasId("vertexID) + is the same as invoking + q.has( gripql.eq("_id", "vertexID")) """ id = _wrap_str_value(id) return self.__append({"hasId": id}) @@ -220,33 +245,35 @@ def hasKey(self, key): def fields(self, field=[]): """ Select document properties to be returned in document. + + G.V("vertex1").fields("symbol") # include only symbol field + G.V("vertex1").fields("-symbol") # exclude symbol field + G.V("vertex1").fields() # exclude all field """ field = _wrap_str_value(field) return self.__append({"fields": field}) def as_(self, name): """ - Mark the current vertex/edge with the given name. + Annotate the current vertex/edge with the given name. Used to return elements from select(). """ return self.__append({"as": name}) - def select(self, marks): + def select(self, name): + """ + Move traveler back to a previously annotated position + + G.V().as_("a").out().as_("b").select(["a", "b"]) """ - Returns rows of marked elements, with one item for each mark. + return self.__append({"select": name}) - "marks" is a list of mark names. - The rows returned are all combinations of marks, e.g. - [ - [A1, B1], - [A1, B2], - [A2, B1], - [A2, B2], - ] + def sort(self, field, descending=False): + """ + Sort return rows by field """ - marks = _wrap_str_value(marks) - return self.__append({"select": {"marks": marks}}) + return self.__append({"sort" : {"fields": [{"field":field, "descending":descending}]}}) def limit(self, n): """ @@ -285,6 +312,14 @@ def distinct(self, props=[]): def set(self, key, value): """ Set field to constant value + + Typically used with `increment` + q = G.V("Character:1").set("count", 0) + + returns + ``` + {"_id":"Character:1"" : "_label" : "Character: "count" : 0} + ``` """ return self.__append({"set": {"key":key, "value":value}}) @@ -294,24 +329,40 @@ def increment(self, key, value=1): """ return self.__append({"increment": {"key":key, "value":value}}) + def mark(self, name): + """ + Mark a labeled step in the query operation list that can recieve travelers from `jump` command + """ + return self.__append({"mark": name}) + def jump(self, mark, expression, emit=False): """ Jump to marked instruction if condition is true. If `emit` is true - send copy to next step inm chain + send copy to next step in the chain + + Example command + + q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") + q = q.has(gripql.lt("$start.count", 2)) + q = q.jump("a", None, True) + """ return self.__append({"jump": {"mark":mark, "expression" : expression, "emit":emit}}) - def mark(self, name): + def render(self, template): """ - Mark a labeled step that can recieve travelers from `jump` command + Render output of query + + Example: + query = G.V().hasLabel("Character").as_("char").out("starships").render(["$char.name", "$._id", "$"]) """ - return self.__append({"mark": name}) + return self.__append({"render": template}) - def render(self, template): + def pivot(self, id, field, value): """ Render output of query """ - return self.__append({"render": template}) + return self.__append({"pivot": {"id":id, "field":field, "value":value}}) def path(self): """ @@ -325,6 +376,18 @@ def unwind(self, field): """ return self.__append({"unwind": field}) + def group(self,fields): + """ + Group togeather travelers that are on the same element + """ + return self.__append({"group" : {"fields" : fields }}) + + def totype(self, path, typeName): + """ + Cast a field located at 'path' to a primitive type or list specified as 'typeName' + """ + return self.__append({"totype" : {"field" : path, "type_name": typeName }}) + def aggregate(self, aggregations): """ Aggregate results of query output diff --git a/gripql/python/gripql/util.py b/gripql/python/gripql/util.py index f1cb34de8..6ab0cad48 100644 --- a/gripql/python/gripql/util.py +++ b/gripql/python/gripql/util.py @@ -64,6 +64,10 @@ def close(self): if self.i == 0: return + if self.start is None: + self.logger.error("Rate.close() called but Rate.init() was never called. self.start is None.") + return + now = datetime.now() dt = now - self.start rate = self.i / dt.total_seconds() diff --git a/gripql/python/requirements-dev.txt b/gripql/python/requirements-dev.txt new file mode 100644 index 000000000..45396421f --- /dev/null +++ b/gripql/python/requirements-dev.txt @@ -0,0 +1,2 @@ +twine +setuptools \ No newline at end of file diff --git a/gripql/python/requirements.txt b/gripql/python/requirements.txt index f4218d008..d4cc84e58 100644 --- a/gripql/python/requirements.txt +++ b/gripql/python/requirements.txt @@ -1 +1 @@ -requests>=2.19.1 +requests>=2.32.5 diff --git a/gripql/python/setup.py b/gripql/python/setup.py index c949a129d..00163462b 100644 --- a/gripql/python/setup.py +++ b/gripql/python/setup.py @@ -37,9 +37,9 @@ def find_version(*file_paths): url="https://github.com/bmeg/grip/gripql/python", license='MIT', packages=find_packages(), - python_requires='>=2.7, <4', + python_requires='>=3.9, <4', install_requires=[ - "requests>=2.19.1" + "requests>=2.32.5" ], zip_safe=True, classifiers=[ @@ -48,9 +48,8 @@ def find_version(*file_paths): 'Natural Language :: English', 'License :: OSI Approved :: MIT License', 'Topic :: Software Development :: Libraries', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7' + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.12' + ], ) diff --git a/gripql/python/tests/unit/header_test.py b/gripql/python/tests/unit/header_test.py index 26455bded..8d6bc8acf 100644 --- a/gripql/python/tests/unit/header_test.py +++ b/gripql/python/tests/unit/header_test.py @@ -44,4 +44,4 @@ def test_connection(self): # test header propagation to Graph and Query classes c = Connection(self.mock_url, token="iamnotarealtoken") self.assertEqual(c.session.headers, c.graph('test').session.headers) - self.assertEqual(c.session.headers, c.graph('test').query().session.headers) + self.assertEqual(c.session.headers, c.graph('test').session.headers) diff --git a/gripql/python/tests/unit/url_test.py b/gripql/python/tests/unit/url_test.py index f353969b9..e1e1b0ee3 100644 --- a/gripql/python/tests/unit/url_test.py +++ b/gripql/python/tests/unit/url_test.py @@ -23,6 +23,6 @@ def test_url_building(self): self.assertEqual(ba.base_url, self.mock_url) self.assertEqual(ba.url, self.mock_url + "/v1/graph") - q = g.query() + q = g self.assertEqual(q.base_url, self.mock_url) self.assertEqual(q.url, self.mock_url + "/v1/graph/test/query") diff --git a/gripql/query.go b/gripql/query.go index b17c45cd5..0d893062b 100644 --- a/gripql/query.go +++ b/gripql/query.go @@ -15,11 +15,6 @@ func V(ids ...string) *Query { return NewQuery().V(ids...) } -// E starts a new vertex query, short for `NewQuery().E()`. -func E(ids ...string) *Query { - return NewQuery().E(ids...) -} - // NewQuery creates a new Query instance. func NewQuery() *Query { return &Query{} @@ -45,12 +40,6 @@ func (q *Query) V(id ...string) *Query { return q.with(&GraphStatement{Statement: &GraphStatement_V{vlist}}) } -// E adds a edge selection step to the query -func (q *Query) E(id ...string) *Query { - elist := protoutil.NewListFromStrings(id) - return q.with(&GraphStatement{Statement: &GraphStatement_E{elist}}) -} - // In follows incoming edges to adjacent vertex func (q *Query) In(label ...string) *Query { vlist := protoutil.NewListFromStrings(label) @@ -159,9 +148,8 @@ func (q *Query) As(id string) *Query { } // Select retreieves previously marked elemets -func (q *Query) Select(id ...string) *Query { - idList := SelectStatement{Marks: id} - return q.with(&GraphStatement{Statement: &GraphStatement_Select{&idList}}) +func (q *Query) Select(name string) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Select{name}}) } // Fields selects which properties are returned in the result. @@ -200,6 +188,27 @@ func (q *Query) Aggregate(agg []*Aggregate) *Query { return q.with(&GraphStatement{Statement: &GraphStatement_Aggregate{Aggregate: &Aggregations{Aggregations: agg}}}) } +func (q *Query) Pivot(id string, field string, value string) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Pivot{Pivot: &PivotStep{Id: id, Field: field, Value: value}}}) +} + +// Deconstruct a vertex with an array of n fields as n vertices with no array, and a dict object instead +func (q *Query) Unwind(path string) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Unwind{Unwind: path}}) +} + +func (q *Query) Group(fields map[string]string) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Group{Group: &Group{Fields: fields}}}) +} + +func (q *Query) ToType(field string, typeName string) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Totype{Totype: &ToType{Field: field, TypeName: typeName}}}) +} + +func (q *Query) Sort(sortFields []*SortField) *Query { + return q.with(&GraphStatement{Statement: &GraphStatement_Sort{Sort: &Sorting{Fields: sortFields}}}) +} + func (q *Query) String() string { parts := []string{} add := func(name string, x ...string) { @@ -213,10 +222,6 @@ func (q *Query) String() string { ids := protoutil.AsStringList(stmt.V) add("V", ids...) - case *GraphStatement_E: - ids := protoutil.AsStringList(stmt.E) - add("E", ids...) - case *GraphStatement_In: ids := protoutil.AsStringList(stmt.In) add("In", ids...) @@ -280,7 +285,7 @@ func (q *Query) String() string { add("As", stmt.As) case *GraphStatement_Select: - add("Select", stmt.Select.Marks...) + add("Select", stmt.Select) case *GraphStatement_Fields: fields := protoutil.AsStringList(stmt.Fields) @@ -289,6 +294,21 @@ func (q *Query) String() string { case *GraphStatement_Aggregate: add("Aggregate") + case *GraphStatement_Unwind: + add("Unwind", stmt.Unwind) + + case *GraphStatement_Pivot: + add("Pivot", fmt.Sprintf("%s", stmt.Pivot.Id), fmt.Sprintf("%s", stmt.Pivot.Field), fmt.Sprintf("%s", stmt.Pivot.Value)) + + case *GraphStatement_Group: + add("Group", fmt.Sprintf("%v", stmt.Group.Fields)) + + case *GraphStatement_Totype: + add("Totype", fmt.Sprintf("%s", stmt.Totype.Field), fmt.Sprintf("%s", stmt.Totype.TypeName)) + + case *GraphStatement_Sort: + add("Sort", fmt.Sprintf("%s", stmt.Sort.Fields)) + case *GraphStatement_Render: jtxt, err := protojson.Marshal(stmt.Render) if err != nil { diff --git a/gripql/query_result.go b/gripql/query_result.go new file mode 100644 index 000000000..da4d56362 --- /dev/null +++ b/gripql/query_result.go @@ -0,0 +1,32 @@ +package gripql + +func (qr *QueryResult) ToInterface() any { + out := map[string]any{} + if v := qr.GetVertex(); v != nil { + out["vertex"] = v.GetDataMap() + } + if e := qr.GetEdge(); e != nil { + out["edge"] = e.GetDataMap() + } + if c := qr.GetCount(); c != 0 { + out["count"] = c + } + if r := qr.GetRender(); r != nil { + out["render"] = r.AsInterface() + } + if a := qr.GetAggregations(); a != nil { + out["aggregation"] = map[string]any{ + "key": a.GetKey().AsInterface(), + "value": a.GetValue(), + "name": a.GetName(), + } + } + if p := qr.GetPath(); p != nil { + pa := []any{} + for _, c := range p.GetValues() { + pa = append(pa, c.AsInterface()) + } + out["path"] = pa + } + return out +} diff --git a/gripql/schema.go b/gripql/schema.go index 7711c1573..0c2df7054 100644 --- a/gripql/schema.go +++ b/gripql/schema.go @@ -1,17 +1,17 @@ package gripql // GetDataFieldTypes iterates over the data map and determines the type of each field -func GetDataFieldTypes(data map[string]interface{}) map[string]interface{} { - out := make(map[string]interface{}) +func GetDataFieldTypes(data map[string]any) map[string]any { + out := make(map[string]any) for key, val := range data { - if vMap, ok := val.(map[string]interface{}); ok { + if vMap, ok := val.(map[string]any); ok { out[key] = GetDataFieldTypes(vMap) continue - } else if vSlice, ok := val.([]interface{}); ok { - var vType interface{} = []interface{}{FieldType_UNKNOWN.String()} + } else if vSlice, ok := val.([]any); ok { + var vType any = []any{FieldType_UNKNOWN.String()} if len(vSlice) > 0 { vSliceVal := vSlice[0] - vType = []interface{}{GetFieldType(vSliceVal)} + vType = []any{GetFieldType(vSliceVal)} } out[key] = vType continue @@ -22,7 +22,7 @@ func GetDataFieldTypes(data map[string]interface{}) map[string]interface{} { } // GetFieldType returns the FieldType for a value -func GetFieldType(field interface{}) string { +func GetFieldType(field any) string { switch field.(type) { case string: return FieldType_STRING.String() diff --git a/gripql/schema/scan.go b/gripql/schema/scan.go deleted file mode 100644 index 85e2b2572..000000000 --- a/gripql/schema/scan.go +++ /dev/null @@ -1,100 +0,0 @@ -package schema - -import ( - "fmt" - - "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/log" - "github.com/bmeg/grip/util" - "google.golang.org/protobuf/types/known/structpb" -) - -type edgeKey struct { - label, to, from string -} - -type edgeMap map[edgeKey]interface{} - -func stringInSlice(a string, list []string) bool { - for _, b := range list { - if b == a { - return true - } - } - return false -} - -// ScanSchema attempts to construct a schema of a graph by sampling vertices and edges -// This version of the schema scanner (vs the ones found in the drivers) can be run -// via the client library -func ScanSchema(conn gripql.Client, graph string, sampleCount uint32, exclude []string) (*gripql.Graph, error) { - - labelRes, err := conn.ListLabels(graph) - if err != nil { - return nil, err - } - - vList := []*gripql.Vertex{} - for _, label := range labelRes.VertexLabels { - if stringInSlice(label, exclude) { - continue - } - schema := map[string]interface{}{} - log.Infof("Scanning %s\n", label) - nodeQuery := gripql.V().HasLabel(label).Limit(sampleCount) - nodeRes, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: nodeQuery.Statements}) - if err == nil { - for row := range nodeRes { - v := row.GetVertex() - data := v.Data.AsMap() - ds := gripql.GetDataFieldTypes(data) - util.MergeMaps(schema, ds) - } - sValue, err := structpb.NewStruct(schema) - if err != nil { - log.Error(err) - } - vList = append(vList, &gripql.Vertex{Gid: label, Label: "Vertex", Data: sValue}) - } else { - log.Errorf("Traversal error: %s", err) - } - } - - eList := []*gripql.Edge{} - for _, elabel := range labelRes.EdgeLabels { - if stringInSlice(elabel, exclude) { - continue - } - log.Infof("Scanning edge %s\n", elabel) - edgeQuery := gripql.E().HasLabel(elabel).Limit(sampleCount).As("edge").Out().Fields().As("to").Select("edge").In().Fields().As("from").Select("edge", "from", "to") - edgeRes, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: edgeQuery.Statements}) - if err == nil { - labelSchema := edgeMap{} - for row := range edgeRes { - sel := row.GetSelections().Selections - edge := sel["edge"].GetEdge() - src := sel["from"].GetVertex() - dst := sel["to"].GetVertex() - ds := gripql.GetDataFieldTypes(edge.Data.AsMap()) - k := edgeKey{to: dst.Label, from: src.Label, label: edge.Label} - if p, ok := labelSchema[k]; ok { - labelSchema[k] = util.MergeMaps(p, ds) - } else { - labelSchema[k] = ds - } - } - for k, v := range labelSchema { - sValue, _ := structpb.NewStruct(v.(map[string]interface{})) - eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)-%s->(%s)", k.from, k.label, k.to), - Label: k.label, - From: k.from, - To: k.to, - Data: sValue, - } - eList = append(eList, eSchema) - } - } - } - return &gripql.Graph{Graph: graph, Vertices: vList, Edges: eList}, nil -} diff --git a/gripql/util.go b/gripql/util.go index 0e082ca19..d35885cb8 100644 --- a/gripql/util.go +++ b/gripql/util.go @@ -52,11 +52,11 @@ func (vertex *Vertex) HasProperty(key string) bool { // Validate returns an error if the vertex is invalid func (vertex *Vertex) Validate() error { - if vertex.Gid == "" { - return errors.New("'gid' cannot be blank") + if vertex.Id == "" { + return errors.New("'_id' cannot be blank") } if vertex.Label == "" { - return errors.New("'label' cannot be blank") + return errors.New("'_label' cannot be blank") } for k := range vertex.GetDataMap() { err := ValidateFieldName(k) @@ -109,17 +109,17 @@ func (edge *Edge) HasProperty(key string) bool { // Validate returns an error if the edge is invalid func (edge *Edge) Validate() error { - if edge.Gid == "" { - return errors.New("'gid' cannot be blank") + if edge.Id == "" { + return errors.New("'_id' cannot be blank") } if edge.Label == "" { - return errors.New("'label' cannot be blank") + return errors.New("'_label' cannot be blank") } if edge.From == "" { - return errors.New("'from' cannot be blank") + return errors.New("'_from' cannot be blank") } if edge.To == "" { - return errors.New("'to' cannot be blank") + return errors.New("'_to' cannot be blank") } for k := range edge.GetDataMap() { err := ValidateFieldName(k) diff --git a/jobstorage/serializer_test.go b/jobstorage/serializer_test.go index 302d66d6a..1227f290e 100644 --- a/jobstorage/serializer_test.go +++ b/jobstorage/serializer_test.go @@ -27,7 +27,7 @@ func TestSerializeStream(t *testing.T) { if o.GetCurrent() == nil { t.Errorf("Incorrect ouput") } else { - if i, err := strconv.Atoi(o.GetCurrent().ID); err == nil { + if i, err := strconv.Atoi(o.GetCurrent().Get().ID); err == nil { if i != count { t.Errorf("Incorrect ouput order") } diff --git a/jobstorage/storage.go b/jobstorage/storage.go index b0a587a41..3d263077b 100644 --- a/jobstorage/storage.go +++ b/jobstorage/storage.go @@ -5,8 +5,7 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" - "log" + "io" "os" "path/filepath" "sync" @@ -14,6 +13,7 @@ import ( "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" "github.com/kennygrant/sanitize" ) @@ -59,21 +59,21 @@ func NewFSJobStorage(path string) *FSResults { graphName := filepath.Base(graphDir) file, err := os.Open(j) if err == nil { - sData, err := ioutil.ReadAll(file) + sData, err := io.ReadAll(file) if err == nil { job := Job{} err := json.Unmarshal(sData, &job) if err == nil { - log.Printf("Found job %s %s", graphName, jobName) + log.Infof("Found job %s %s", graphName, jobName) out.jobs.Store(jobKey(graphName, jobName), &job) } else { - log.Printf("Error Unmarshaling job data: %s", err) + log.Infof("Error Unmarshaling job data: %s", err) } } else { - log.Printf("Error reading job data: %s", err) + log.Infof("Error reading job data: %s", err) } } else { - log.Printf("Error opening job data: %s", err) + log.Infof("Error opening job data: %s", err) } } return &out @@ -122,7 +122,7 @@ func (fs *FSResults) Spool(graph string, stream *Stream) (string, error) { if _, err := os.Stat(graphDir); os.IsNotExist(err) { os.MkdirAll(graphDir, 0700) } - spoolDir, err := ioutil.TempDir(graphDir, "job-") + spoolDir, err := os.MkdirTemp(graphDir, "job-") if err != nil { return "", err } @@ -147,7 +147,7 @@ func (fs *FSResults) Spool(graph string, stream *Stream) (string, error) { tbStream := MarshalStream(stream.Pipe, 4) //TODO: make worker count configurable go func() { job.Status.State = gripql.JobState_RUNNING - log.Printf("Starting Job: %#v", job) + log.Infof("Starting Job: %#v", job) defer resultFile.Close() for i := range tbStream { resultFile.Write(i) @@ -163,10 +163,10 @@ func (fs *FSResults) Spool(graph string, stream *Stream) (string, error) { if err == nil { statusFile.Write([]byte(fmt.Sprintf("%s\n", out))) } - log.Printf("Job Done: %s (%d results)", jobName, job.Status.Count) + log.Infof("Job Done: %s (%d results)", jobName, job.Status.Count) } else { job.Status.State = gripql.JobState_ERROR - log.Printf("Job Error: %s %s", jobName, err) + log.Infof("Job Error: %s %s", jobName, err) } }() return jobName, nil @@ -190,14 +190,17 @@ func (fs *FSResults) Stream(ctx context.Context, graph, id string) (*Stream, err bufSize := 1024 * 1024 * 32 buf := make([]byte, bufSize) scan.Buffer(buf, bufSize) + count := uint64(0) for scan.Scan() { if ctx.Err() == context.Canceled { return } c := make([]byte, len(scan.Bytes())) copy(c, scan.Bytes()) + count++ os <- c } + log.Infof("Stored job with %d records read", count) }() return &Stream{ Pipe: out, diff --git a/jsengine/underscore/Makefile b/jsengine/underscore/Makefile index 5ed9cb187..536daa8ec 100644 --- a/jsengine/underscore/Makefile +++ b/jsengine/underscore/Makefile @@ -1,5 +1,2 @@ -build : underscore.js - go-bindata -nocompress -pkg underscore -o underscore.go underscore.js - underscore.js : - curl http://underscorejs.org/underscore-min.js | gunzip > underscore.js + curl http://underscorejs.org/underscore-min.js > underscore.js diff --git a/jsengine/underscore/underscore.go b/jsengine/underscore/underscore.go index 0ec49adae..4abf044e0 100644 --- a/jsengine/underscore/underscore.go +++ b/jsengine/underscore/underscore.go @@ -1,214 +1,13 @@ -// Code generated by go-bindata. -// sources: -// underscore.js -// DO NOT EDIT! - package underscore import ( - "fmt" - "io/ioutil" - "os" - "path/filepath" - "strings" - "time" + "embed" ) -type asset struct { - bytes []byte - info os.FileInfo -} - -type bindataFileInfo struct { - name string - size int64 - mode os.FileMode - modTime time.Time -} - -func (fi bindataFileInfo) Name() string { - return fi.name -} -func (fi bindataFileInfo) Size() int64 { - return fi.size -} -func (fi bindataFileInfo) Mode() os.FileMode { - return fi.mode -} -func (fi bindataFileInfo) ModTime() time.Time { - return fi.modTime -} -func (fi bindataFileInfo) IsDir() bool { - return false -} -func (fi bindataFileInfo) Sys() interface{} { - return nil -} - -var _underscoreJs = []byte(`// Underscore.js 1.8.3 -// http://underscorejs.org -// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors -// Underscore may be freely distributed under the MIT license. -(function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a=i>=0?Math.min(i+1,a):i+a+1;else if(r&&i&&a)return i=r(e,u),e[i]===u?i:-1;if(u!==u)return i=t(l.call(e,o,a),m.isNaN),i>=0?i+o:-1;for(i=n>0?o:a-1;i>=0&&a>i;i+=n)if(e[i]===u)return i;return-1}}function e(n,t){var r=I.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||a,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=I[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var u=this,i=u._,o=Array.prototype,a=Object.prototype,c=Function.prototype,f=o.push,l=o.slice,s=a.toString,p=a.hasOwnProperty,h=Array.isArray,v=Object.keys,g=c.bind,y=Object.create,d=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):u._=m,m.VERSION="1.8.3";var b=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},x=function(n,t,r){return null==n?m.identity:m.isFunction(n)?b(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return x(n,t,1/0)};var _=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var f=o[c];t&&r[f]!==void 0||(r[f]=i[f])}return r}},j=function(n){if(!m.isObject(n))return{};if(y)return y(n);d.prototype=n;var t=new d;return d.prototype=null,t},w=function(n){return function(t){return null==t?void 0:t[n]}},A=Math.pow(2,53)-1,O=w("length"),k=function(n){var t=O(n);return"number"==typeof t&&t>=0&&A>=t};m.each=m.forEach=function(n,t,r){t=b(t,r);var e,u;if(k(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=k(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=x(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(x(t)),r)},m.every=m.all=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r,e){return k(n)||(n=m.values(n)),("number"!=typeof r||e)&&(r=0),m.indexOf(n,t,r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=k(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(k(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=x(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={};return r=x(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=F(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=F(function(n,t,r){n[r]=t}),m.countBy=F(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):k(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:k(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=x(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var S=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=O(n);a>o;o++){var c=n[o];if(k(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=S(c,t,r));var f=0,l=c.length;for(u.length+=l;l>f;)u[i++]=c[f++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return S(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=x(r,e));for(var u=[],i=[],o=0,a=O(n);a>o;o++){var c=n[o],f=r?r(c,o,n):c;t?(o&&i===f||u.push(c),i=f):r?m.contains(i,f)||(i.push(f),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(S(arguments,!0,!0))},m.intersection=function(n){for(var t=[],r=arguments.length,e=0,u=O(n);u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=S(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,O).length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=O(n);u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=x(r,e,1);for(var u=r(t),i=0,o=O(n);o>i;){var a=Math.floor((i+o)/2);r(n[a])i;i++,n+=r)u[i]=n;return u};var E=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=j(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(g&&n.bind===g)return g.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return E(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var f=m.now();a||r.leading!==!1||(a=f);var l=t-(f-a);return e=this,u=arguments,0>=l||l>t?(o&&(clearTimeout(o),o=null),a=f,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,l)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var f=m.now()-o;t>f&&f>=0?e=setTimeout(c,t-f):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var f=r&&!e;return e||(e=setTimeout(c,t)),f&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var M=!{toString:null}.propertyIsEnumerable("toString"),I=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(v)return v(n);var t=[];for(var r in n)m.has(n,r)&&t.push(r);return M&&e(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var r in n)t.push(r);return M&&e(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=_(m.allKeys),m.extendOwn=m.assign=_(m.keys),m.findKey=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=b(t,r)):(u=S(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var f=u[a],l=o[f];e(l,f,o)&&(i[f]=l)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(S(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=_(m.allKeys,!0),m.create=function(n,t){var r=j(n);return t&&m.extendOwn(r,t),r},m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var N=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=s.call(n);if(u!==s.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!N(n[c],t[c],r,e))return!1}else{var f,l=m.keys(n);if(c=l.length,m.keys(t).length!==c)return!1;for(;c--;)if(f=l[c],!m.has(t,f)||!N(n[f],t[f],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return N(n,t)},m.isEmpty=function(n){return null==n?!0:k(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=h||function(n){return"[object Array]"===s.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return s.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===s.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&p.call(n,t)},m.noConflict=function(){return u._=i,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=w,m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=b(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var B={"&":"&","<":"<",">":">",'"':""","'":"'","` + "`" + `":"`"},T=m.invert(B),R=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=R(B),m.unescape=R(T),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var q=0;m.uniqueId=function(n){var t=++q+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var K=/(.)^/,z={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\u2028|\u2029/g,L=function(n){return"\\"+z[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||K).source,(t.interpolate||K).source,(t.evaluate||K).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(D,L),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},f=t.variable||"obj";return c.source="function("+f+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var P=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return f.apply(n,arguments),P(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=o[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],P(this,r)}}),m.each(["concat","join","slice"],function(n){var t=o[n];m.prototype[n]=function(){return P(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this); -//# sourceMappingURL=underscore-min.map`) - -func underscoreJsBytes() ([]byte, error) { - return _underscoreJs, nil -} - -func underscoreJs() (*asset, error) { - bytes, err := underscoreJsBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "underscore.js", size: 16449, mode: os.FileMode(420), modTime: time.Unix(1506054937, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -// Asset loads and returns the asset for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func Asset(name string) ([]byte, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) - } - return a.bytes, nil - } - return nil, fmt.Errorf("Asset %s not found", name) -} - -// MustAsset is like Asset but panics when Asset would return an error. -// It simplifies safe initialization of global variables. -func MustAsset(name string) []byte { - a, err := Asset(name) - if err != nil { - panic("asset: Asset(" + name + "): " + err.Error()) - } - - return a -} - -// AssetInfo loads and returns the asset info for the given name. -// It returns an error if the asset could not be found or -// could not be loaded. -func AssetInfo(name string) (os.FileInfo, error) { - cannonicalName := strings.Replace(name, "\\", "/", -1) - if f, ok := _bindata[cannonicalName]; ok { - a, err := f() - if err != nil { - return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) - } - return a.info, nil - } - return nil, fmt.Errorf("AssetInfo %s not found", name) -} - -// AssetNames returns the names of the assets. -func AssetNames() []string { - names := make([]string, 0, len(_bindata)) - for name := range _bindata { - names = append(names, name) - } - return names -} - -// _bindata is a table, holding each asset generator, mapped to its name. -var _bindata = map[string]func() (*asset, error){ - "underscore.js": underscoreJs, -} - -// AssetDir returns the file names below a certain -// directory embedded in the file by go-bindata. -// For example if you run go-bindata on data/... and data contains the -// following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png -// then AssetDir("data") would return []string{"foo.txt", "img"} -// AssetDir("data/img") would return []string{"a.png", "b.png"} -// AssetDir("foo.txt") and AssetDir("notexist") would return an error -// AssetDir("") will return []string{"data"}. -func AssetDir(name string) ([]string, error) { - node := _bintree - if len(name) != 0 { - cannonicalName := strings.Replace(name, "\\", "/", -1) - pathList := strings.Split(cannonicalName, "/") - for _, p := range pathList { - node = node.Children[p] - if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - } - } - if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) - } - rv := make([]string, 0, len(node.Children)) - for childName := range node.Children { - rv = append(rv, childName) - } - return rv, nil -} - -type bintree struct { - Func func() (*asset, error) - Children map[string]*bintree -} - -var _bintree = &bintree{nil, map[string]*bintree{ - "underscore.js": &bintree{underscoreJs, map[string]*bintree{}}, -}} - -// RestoreAsset restores an asset under the given directory -func RestoreAsset(dir, name string) error { - data, err := Asset(name) - if err != nil { - return err - } - info, err := AssetInfo(name) - if err != nil { - return err - } - err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755)) - if err != nil { - return err - } - err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) - if err != nil { - return err - } - err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) - if err != nil { - return err - } - return nil -} - -// RestoreAssets restores an asset under the given directory recursively -func RestoreAssets(dir, name string) error { - children, err := AssetDir(name) - // File - if err != nil { - return RestoreAsset(dir, name) - } - // Dir - for _, child := range children { - err = RestoreAssets(dir, filepath.Join(name, child)) - if err != nil { - return err - } - } - return nil -} +//go:embed underscore.js +var js embed.FS -func _filePath(dir, name string) string { - cannonicalName := strings.Replace(name, "\\", "/", -1) - return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) +func Asset(path string) (string, error) { + data, err := js.ReadFile(path) + return string(data), err } diff --git a/jsengine/underscore/underscore.js b/jsengine/underscore/underscore.js new file mode 100644 index 000000000..b73f16e95 --- /dev/null +++ b/jsengine/underscore/underscore.js @@ -0,0 +1,6 @@ +!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define("underscore",r):(n="undefined"!=typeof globalThis?globalThis:n||self,function(){var t=n._,e=n._=r();e.noConflict=function(){return n._=t,e}}())}(this,(function(){ +// Underscore.js 1.13.6 +// https://underscorejs.org +// (c) 2009-2022 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. +var n="1.13.6",r="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||Function("return this")()||{},t=Array.prototype,e=Object.prototype,u="undefined"!=typeof Symbol?Symbol.prototype:null,o=t.push,i=t.slice,a=e.toString,f=e.hasOwnProperty,c="undefined"!=typeof ArrayBuffer,l="undefined"!=typeof DataView,s=Array.isArray,p=Object.keys,v=Object.create,h=c&&ArrayBuffer.isView,y=isNaN,d=isFinite,g=!{toString:null}.propertyIsEnumerable("toString"),b=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"],m=Math.pow(2,53)-1;function j(n,r){return r=null==r?n.length-1:+r,function(){for(var t=Math.max(arguments.length-r,0),e=Array(t),u=0;u=0&&t<=m}}function J(n){return function(r){return null==r?void 0:r[n]}}var G=J("byteLength"),H=K(G),Q=/\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/;var X=c?function(n){return h?h(n)&&!q(n):H(n)&&Q.test(a.call(n))}:C(!1),Y=J("length");function Z(n,r){r=function(n){for(var r={},t=n.length,e=0;e":">",'"':""","'":"'","`":"`"},$n=zn(Ln),Cn=zn(_n(Ln)),Kn=tn.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g},Jn=/(.)^/,Gn={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},Hn=/\\|'|\r|\n|\u2028|\u2029/g;function Qn(n){return"\\"+Gn[n]}var Xn=/^\s*(\w|\$)+\s*$/;var Yn=0;function Zn(n,r,t,e,u){if(!(e instanceof r))return n.apply(t,u);var o=Mn(n.prototype),i=n.apply(o,u);return _(i)?i:o}var nr=j((function(n,r){var t=nr.placeholder,e=function(){for(var u=0,o=r.length,i=Array(o),a=0;a1)er(a,r-1,t,e),u=e.length;else for(var f=0,c=a.length;f0&&(t=r.apply(this,arguments)),n<=1&&(r=null),t}}var cr=nr(fr,2);function lr(n,r,t){r=Pn(r,t);for(var e,u=nn(n),o=0,i=u.length;o0?0:u-1;o>=0&&o0?a=o>=0?o:Math.max(o+f,a):f=o>=0?Math.min(o+1,f):o+f+1;else if(t&&o&&f)return e[o=t(e,u)]===u?o:-1;if(u!=u)return(o=r(i.call(e,a,f),$))>=0?o+a:-1;for(o=n>0?a:f-1;o>=0&&o0?0:i-1;for(u||(e=r[o?o[a]:a],a+=n);a>=0&&a=3;return r(n,Rn(t,u,4),e,o)}}var wr=_r(1),Ar=_r(-1);function xr(n,r,t){var e=[];return r=Pn(r,t),mr(n,(function(n,t,u){r(n,t,u)&&e.push(n)})),e}function Sr(n,r,t){r=Pn(r,t);for(var e=!tr(n)&&nn(n),u=(e||n).length,o=0;o=0}var Er=j((function(n,r,t){var e,u;return D(r)?u=r:(r=Bn(r),e=r.slice(0,-1),r=r[r.length-1]),jr(n,(function(n){var o=u;if(!o){if(e&&e.length&&(n=Nn(n,e)),null==n)return;o=n[r]}return null==o?o:o.apply(n,t)}))}));function Br(n,r){return jr(n,Dn(r))}function Nr(n,r,t){var e,u,o=-1/0,i=-1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=tr(n)?n:jn(n)).length;ao&&(o=e);else r=Pn(r,t),mr(n,(function(n,t,e){((u=r(n,t,e))>i||u===-1/0&&o===-1/0)&&(o=n,i=u)}));return o}var Ir=/[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;function Tr(n){return n?U(n)?i.call(n):S(n)?n.match(Ir):tr(n)?jr(n,Tn):jn(n):[]}function kr(n,r,t){if(null==r||t)return tr(n)||(n=jn(n)),n[Un(n.length-1)];var e=Tr(n),u=Y(e);r=Math.max(Math.min(r,u),0);for(var o=u-1,i=0;i1&&(e=Rn(e,r[1])),r=an(n)):(e=qr,r=er(r,!1,!1),n=Object(n));for(var u=0,o=r.length;u1&&(t=r[1])):(r=jr(er(r,!1,!1),String),e=function(n,t){return!Mr(r,t)}),Ur(n,e,t)}));function zr(n,r,t){return i.call(n,0,Math.max(0,n.length-(null==r||t?1:r)))}function Lr(n,r,t){return null==n||n.length<1?null==r||t?void 0:[]:null==r||t?n[0]:zr(n,n.length-r)}function $r(n,r,t){return i.call(n,null==r||t?1:r)}var Cr=j((function(n,r){return r=er(r,!0,!0),xr(n,(function(n){return!Mr(r,n)}))})),Kr=j((function(n,r){return Cr(n,r)}));function Jr(n,r,t,e){A(r)||(e=t,t=r,r=!1),null!=t&&(t=Pn(t,e));for(var u=[],o=[],i=0,a=Y(n);ir?(e&&(clearTimeout(e),e=null),a=c,i=n.apply(u,o),e||(u=o=null)):e||!1===t.trailing||(e=setTimeout(f,l)),i};return c.cancel=function(){clearTimeout(e),a=0,e=u=o=null},c},debounce:function(n,r,t){var e,u,o,i,a,f=function(){var c=Wn()-u;r>c?e=setTimeout(f,r-c):(e=null,t||(i=n.apply(a,o)),e||(o=a=null))},c=j((function(c){return a=this,o=c,u=Wn(),e||(e=setTimeout(f,r),t&&(i=n.apply(a,o))),i}));return c.cancel=function(){clearTimeout(e),e=o=a=null},c},wrap:function(n,r){return nr(r,n)},negate:ar,compose:function(){var n=arguments,r=n.length-1;return function(){for(var t=r,e=n[r].apply(this,arguments);t--;)e=n[t].call(this,e);return e}},after:function(n,r){return function(){if(--n<1)return r.apply(this,arguments)}},before:fr,once:cr,findKey:lr,findIndex:pr,findLastIndex:vr,sortedIndex:hr,indexOf:dr,lastIndexOf:gr,find:br,detect:br,findWhere:function(n,r){return br(n,kn(r))},each:mr,forEach:mr,map:jr,collect:jr,reduce:wr,foldl:wr,inject:wr,reduceRight:Ar,foldr:Ar,filter:xr,select:xr,reject:function(n,r,t){return xr(n,ar(Pn(r)),t)},every:Sr,all:Sr,some:Or,any:Or,contains:Mr,includes:Mr,include:Mr,invoke:Er,pluck:Br,where:function(n,r){return xr(n,kn(r))},max:Nr,min:function(n,r,t){var e,u,o=1/0,i=1/0;if(null==r||"number"==typeof r&&"object"!=typeof n[0]&&null!=n)for(var a=0,f=(n=tr(n)?n:jn(n)).length;ae||void 0===t)return 1;if(t 0 { - cde = excludeFields(cde, excludePaths) - for k, v := range cde.Data { - ode.Data[k] = v - } - } - - ode.ID = cde.ID - ode.Label = cde.Label - ode.From = cde.From - ode.To = cde.To - - if len(includePaths) > 0 { - ode = includeFields(ode, cde, includePaths) - } - ode.Loaded = true - return out -} - -func includeFields(new, old *gdbi.DataElement, paths []string) *gdbi.DataElement { - newData := make(map[string]interface{}) -Include: - for _, path := range paths { - switch path { - case "gid", "label", "from", "to": - // noop - case "data": - for k, v := range old.Data { - newData[k] = v - } - default: - parts := strings.Split(path, ".") - var data map[string]interface{} - var ok bool - data = old.Data - for i := 0; i < len(parts); i++ { - if parts[i] == "data" { - continue - } - if i == len(parts)-1 { - if val, ok := data[parts[i]]; ok { - newData[parts[i]] = val - } else { - log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) - continue Include - } - } else { - if _, ok := data[parts[i]]; !ok { - log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) - continue Include - } - newData[parts[i]] = map[string]interface{}{} - data, ok = data[parts[i]].(map[string]interface{}) - if !ok { - log.Errorf("SelectTravelerFields: includeFields: property does not exist: %s", path) - continue Include - } - } - } - } - } - new.Data = newData - return new -} - -func excludeFields(elem *gdbi.DataElement, paths []string) *gdbi.DataElement { - result := &gdbi.DataElement{ - ID: elem.ID, - Label: elem.Label, - From: elem.From, - To: elem.To, - Data: map[string]interface{}{}, - } - for k, v := range elem.Data { - result.Data[k] = v - } - data := result.Data -Exclude: - for _, path := range paths { - switch path { - case "gid": - result.ID = "" - case "label": - result.Label = "" - case "from": - result.From = "" - case "to": - result.To = "" - case "data": - result.Data = map[string]interface{}{} - default: - parts := strings.Split(path, ".") - for i := 0; i < len(parts); i++ { - if parts[i] == "data" { - continue - } - if i == len(parts)-1 { - if _, ok := data[parts[i]]; !ok { - log.Errorf("SelectTravelerFields: excludeFields: property does not exist: %s", path) - continue Exclude - } - delete(data, parts[i]) - } else { - var ok bool - var val interface{} - var mapVal map[string]interface{} - if val, ok = elem.Data[parts[i]]; ok { - if mapVal, ok = val.(map[string]interface{}); ok { - data[parts[i]] = mapVal - } - } - if !ok { - log.Errorf("SelectTravelerFields: excludeFields: property does not exist: %s", path) - continue Exclude - } - } - } - } - } - return result -} diff --git a/kvgraph/graph.go b/kvgraph/graph.go index 94b14255e..48b11f904 100644 --- a/kvgraph/graph.go +++ b/kvgraph/graph.go @@ -11,20 +11,12 @@ import ( "github.com/bmeg/grip/kvi" "github.com/bmeg/grip/kvindex" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/util/setcmp" "google.golang.org/protobuf/proto" multierror "github.com/hashicorp/go-multierror" ) -func contains(a []string, v string) bool { - for _, i := range a { - if i == v { - return true - } - } - return false -} - // GetTimestamp returns the update timestamp func (kgdb *KVInterfaceGDB) GetTimestamp() string { return kgdb.kvg.ts.Get(kgdb.graph) @@ -63,7 +55,7 @@ func insertVertex(tx kvi.KVBulkWrite, idx *kvindex.KVIndex, graph string, vertex return err } - key := VertexKey(graph, vertex.Gid) + key := VertexKey(graph, vertex.Id) value, err := proto.Marshal(vertex) if err != nil { return nil @@ -72,14 +64,14 @@ func insertVertex(tx kvi.KVBulkWrite, idx *kvindex.KVIndex, graph string, vertex if err := tx.Set(key, value); err != nil { return fmt.Errorf("AddVertex Error %s", err) } - if err := idx.AddDocTx(tx, vertex.Gid, doc); err != nil { + if err := idx.AddDocTx(tx, vertex.Id, doc); err != nil { return fmt.Errorf("AddVertex Error %s", err) } return nil } func insertEdge(tx kvi.KVBulkWrite, idx *kvindex.KVIndex, graph string, edge *gripql.Edge) error { - eid := edge.Gid + eid := edge.Id var err error var data []byte @@ -155,6 +147,21 @@ func (kgdb *KVInterfaceGDB) BulkAdd(stream <-chan *gdbi.GraphElement) error { return err } +func (kgdb *KVInterfaceGDB) BulkDel(Data *gdbi.DeleteData) error { + var bulkErr *multierror.Error + for _, v := range Data.Edges { + if err := kgdb.DelEdge(v); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + } + for _, v := range Data.Vertices { + if err := kgdb.DelVertex(v); err != nil { + bulkErr = multierror.Append(bulkErr, err) + } + } + return bulkErr.ErrorOrNil() +} + // DelEdge deletes edge with id `key` func (kgdb *KVInterfaceGDB) DelEdge(eid string) error { ekeyPrefix := EdgeKeyPrefix(kgdb.graph, eid) @@ -178,12 +185,16 @@ func (kgdb *KVInterfaceGDB) DelEdge(eid string) error { if err := kgdb.kvg.kv.Delete(ekey); err != nil { return err } - if err := kgdb.kvg.kv.Delete(skey); err != nil { + if err := kgdb.kvg.kv.DeletePrefix(skey); err != nil { + return err + } + if err := kgdb.kvg.kv.DeletePrefix(dkey); err != nil { return err } - if err := kgdb.kvg.kv.Delete(dkey); err != nil { + if err := kgdb.kvg.idx.RemoveDoc(eid); err != nil { return err } + kgdb.kvg.ts.Touch(kgdb.graph) return nil } @@ -220,11 +231,17 @@ func (kgdb *KVInterfaceGDB) DelVertex(id string) error { if err := tx.Delete(vid); err != nil { return err } + for _, k := range delKeys { if err := tx.Delete(k); err != nil { return err } } + + if err := kgdb.kvg.idx.RemoveDoc(kvindex.FieldKeyParse(vid)); err != nil { + return err + } + kgdb.kvg.ts.Touch(kgdb.graph) return nil }) @@ -250,7 +267,7 @@ func (kgdb *KVInterfaceGDB) GetEdgeList(ctx context.Context, loadProp bool) <-ch edgeData, _ := it.Value() ge := &gripql.Edge{} proto.Unmarshal(edgeData, ge) - e := &gdbi.Edge{ID: ge.Gid, Label: ge.Label, From: sid, To: did, Data: ge.Data.AsMap(), Loaded: true} + e := &gdbi.Edge{ID: ge.Id, Label: ge.Label, From: sid, To: did, Data: ge.Data.AsMap(), Loaded: true} o <- e } else { e := &gdbi.Edge{ID: string(eid), Label: label, From: sid, To: did, Loaded: false} @@ -275,7 +292,7 @@ func (kgdb *KVInterfaceGDB) GetVertex(id string, loadProp bool) *gdbi.Vertex { return fmt.Errorf("get call failed: %v", err) } gv := &gripql.Vertex{ - Gid: id, + Id: id, } err = proto.Unmarshal(dataValue, gv) //FIXME: this can't be skipped because vertex label is in value... if err != nil { @@ -363,7 +380,7 @@ func (kgdb *KVInterfaceGDB) GetOutChannel(ctx context.Context, reqChan chan gdbi for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { keyValue := it.Key() _, _, dst, _, label, etype := SrcEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || contains(edgeLabels, label) { + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { vkey := VertexKey(kgdb.graph, dst) if etype == edgeSingle { vertexChan <- elementData{ @@ -397,8 +414,8 @@ func (kgdb *KVInterfaceGDB) GetOutChannel(ctx context.Context, reqChan chan gdbi if req.data != nil { dataValue, err := it.Get(req.data) if err == nil { - _, gid := VertexKeyParse(req.data) - v := &gripql.Vertex{Gid: gid} + _, id := VertexKeyParse(req.data) + v := &gripql.Vertex{Id: id} //if load { //TODO: can't skip loading data, because the label in the data err = proto.Unmarshal(dataValue, v) if err != nil { @@ -407,7 +424,7 @@ func (kgdb *KVInterfaceGDB) GetOutChannel(ctx context.Context, reqChan chan gdbi //} } req.req.Vertex = &gdbi.Vertex{ - ID: gid, + ID: id, Label: v.Label, Data: v.Data.AsMap(), Loaded: true, @@ -441,11 +458,11 @@ func (kgdb *KVInterfaceGDB) GetInChannel(ctx context.Context, reqChan chan gdbi. for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { keyValue := it.Key() _, src, _, _, label, _ := DstEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || contains(edgeLabels, label) { + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { vkey := VertexKey(kgdb.graph, src) dataValue, err := it.Get(vkey) if err == nil { - v := &gripql.Vertex{Gid: src} + v := &gripql.Vertex{Id: src} //if load { //TODO: Can't skip data load because vertex label is in data err = proto.Unmarshal(dataValue, v) if err != nil { @@ -491,7 +508,7 @@ func (kgdb *KVInterfaceGDB) GetOutEdgeChannel(ctx context.Context, reqChan chan for it.Seek(skeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), skeyPrefix); it.Next() { keyValue := it.Key() _, src, dst, eid, label, edgeType := SrcEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || contains(edgeLabels, label) { + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { if edgeType == edgeSingle { e := gdbi.Edge{} if load { @@ -548,7 +565,7 @@ func (kgdb *KVInterfaceGDB) GetInEdgeChannel(ctx context.Context, reqChan chan g for it.Seek(dkeyPrefix); it.Valid() && bytes.HasPrefix(it.Key(), dkeyPrefix); it.Next() { keyValue := it.Key() _, src, dst, eid, label, edgeType := DstEdgeKeyParse(keyValue) - if len(edgeLabels) == 0 || contains(edgeLabels, label) { + if len(edgeLabels) == 0 || setcmp.ContainsString(edgeLabels, label) { if edgeType == edgeSingle { e := gdbi.Edge{} if load { diff --git a/kvgraph/index.go b/kvgraph/index.go index 193c799ba..6707ffca5 100644 --- a/kvgraph/index.go +++ b/kvgraph/index.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" ) @@ -33,7 +32,7 @@ func (kgraph *KVGraph) deleteGraphIndex(graph string) { } func normalizePath(path string) string { - path = jsonpath.GetJSONPath(path) + //path = travelerpath.GetJSONPath(path) path = strings.TrimPrefix(path, "$.") path = strings.TrimPrefix(path, "data.") return path @@ -59,7 +58,7 @@ func edgeIdxStruct(e *gripql.Edge) map[string]interface{} { return k } -//AddVertexIndex add index to vertices +// AddVertexIndex add index to vertices func (kgdb *KVInterfaceGDB) AddVertexIndex(label string, field string) error { log.WithFields(log.Fields{"label": label, "field": field}).Info("Adding vertex index") field = normalizePath(field) @@ -67,14 +66,14 @@ func (kgdb *KVInterfaceGDB) AddVertexIndex(label string, field string) error { return kgdb.kvg.idx.AddField(fmt.Sprintf("%s.v.%s.%s", kgdb.graph, label, field)) } -//DeleteVertexIndex delete index from vertices +// DeleteVertexIndex delete index from vertices func (kgdb *KVInterfaceGDB) DeleteVertexIndex(label string, field string) error { log.WithFields(log.Fields{"label": label, "field": field}).Info("Deleting vertex index") field = normalizePath(field) return kgdb.kvg.idx.RemoveField(fmt.Sprintf("%s.v.%s.%s", kgdb.graph, label, field)) } -//GetVertexIndexList lists out all the vertex indices for a graph +// GetVertexIndexList lists out all the vertex indices for a graph func (kgdb *KVInterfaceGDB) GetVertexIndexList() <-chan *gripql.IndexID { log.Debug("Running GetVertexIndexList") out := make(chan *gripql.IndexID) @@ -91,8 +90,8 @@ func (kgdb *KVInterfaceGDB) GetVertexIndexList() <-chan *gripql.IndexID { return out } -//VertexLabelScan produces a channel of all vertex ids in a graph -//that match a given label +// VertexLabelScan produces a channel of all vertex ids in a graph +// that match a given label func (kgdb *KVInterfaceGDB) VertexLabelScan(ctx context.Context, label string) chan string { log.WithFields(log.Fields{"label": label}).Debug("Running VertexLabelScan") //TODO: Make this work better diff --git a/kvgraph/schema.go b/kvgraph/schema.go index 2d4d49e54..47b118f87 100644 --- a/kvgraph/schema.go +++ b/kvgraph/schema.go @@ -54,10 +54,10 @@ func (ma *KVGraph) sampleSchema(ctx context.Context, graph string, n uint32, ran reqChan <- gdbi.ElementLookup{ID: i} close(reqChan) for e := range gi.GetOutEdgeChannel(ctx, reqChan, true, false, []string{}) { - o := gi.GetVertex(e.Edge.To, false) + o := gi.GetVertex(e.Edge.Get().To, false) if o != nil { - k := fromtokey{from: v.Label, to: o.Label, label: e.Edge.Label} - ds := gripql.GetDataFieldTypes(e.Edge.Data) + k := fromtokey{from: v.Label, to: o.Label, label: e.Edge.Get().Label} + ds := gripql.GetDataFieldTypes(e.Edge.Get().Data) if p, ok := fromToPairs[k]; ok { fromToPairs[k] = util.MergeMaps(p, ds) } else { @@ -67,13 +67,13 @@ func (ma *KVGraph) sampleSchema(ctx context.Context, graph string, n uint32, ran } } sSchema, _ := structpb.NewStruct(schema) - vSchema := &gripql.Vertex{Gid: label, Label: "Vertex", Data: sSchema} + vSchema := &gripql.Vertex{Id: label, Label: "Vertex", Data: sSchema} vOutput = append(vOutput, vSchema) } for k, v := range fromToPairs { sV, _ := structpb.NewStruct(v.(map[string]interface{})) eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), + Id: fmt.Sprintf("(%s)--%s->(%s)", k.from, k.label, k.to), Label: k.label, From: k.from, To: k.to, diff --git a/kvgraph/test/index_test.go b/kvgraph/test/index_test.go index 0062f0e8a..a8a61c416 100644 --- a/kvgraph/test/index_test.go +++ b/kvgraph/test/index_test.go @@ -7,41 +7,34 @@ import ( "context" "github.com/bmeg/grip/kvindex" + "github.com/bmeg/grip/util/setcmp" ) var docs = `[ { - "gid" : "vertex1", - "label" : "Person", - "data" : { - "firstName" : "Bob", - "lastName" : "Smith", - "age" : 35 - } + "_id" : "vertex1", + "_label" : "Person", + "firstName" : "Bob", + "lastName" : "Smith", + "age" : 35 },{ - "gid" : "vertex2", - "label" : "Person", - "data" : { - "firstName" : "Jack", - "lastName" : "Smith", - "age" : 50.2 - } + "_id" : "vertex2", + "_label" : "Person", + "firstName" : "Jack", + "lastName" : "Smith", + "age" : 50.2 },{ - "gid" : "vertex3", - "label" : "Person", - "data" : { - "firstName" : "Jill", - "lastName" : "Jones", - "age" : 35.1 - } + "_id" : "vertex3", + "_label" : "Person", + "firstName" : "Jill", + "lastName" : "Jones", + "age" : 35.1 },{ - "gid" : "vertex4", - "label" : "Dog", - "data" : { - "firstName" : "Fido", - "lastName" : "Ruff", - "age" : 3 - } + "_id" : "vertex4", + "_label" : "Dog", + "firstName" : "Fido", + "lastName" : "Ruff", + "age" : 3 }] ` @@ -54,14 +47,14 @@ func TestFieldListing(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"label", "data.firstName", "data.lastName"} + newFields := []string{"_label", "data.firstName", "data.lastName"} for _, s := range newFields { idx.AddField(s) } count := 0 for _, field := range idx.ListFields() { - if !contains(newFields, field) { + if !setcmp.ContainsString(newFields, field) { t.Errorf("Bad field return: %s", field) } count++ @@ -78,18 +71,18 @@ func TestLoadDoc(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"v.label", "v.data.firstName", "v.data.lastName"} + newFields := []string{"v._label", "v.firstName", "v.lastName"} for _, s := range newFields { idx.AddField(s) } for _, d := range data { - idx.AddDoc(d["gid"].(string), map[string]interface{}{"v": d}) + idx.AddDoc(d["_id"].(string), map[string]interface{}{"v": d}) } count := 0 - for d := range idx.GetTermMatch(context.Background(), "v.label", "Person", -1) { - if !contains(personDocs, d) { + for d := range idx.GetTermMatch(context.Background(), "v._label", "Person", -1) { + if !setcmp.ContainsString(personDocs, d) { t.Errorf("Bad doc return: %s", d) } count++ @@ -99,8 +92,8 @@ func TestLoadDoc(t *testing.T) { } count = 0 - for d := range idx.GetTermMatch(context.Background(), "v.data.firstName", "Bob", -1) { - if !contains(bobDocs, d) { + for d := range idx.GetTermMatch(context.Background(), "v.firstName", "Bob", -1) { + if !setcmp.ContainsString(bobDocs, d) { t.Errorf("Bad doc return: %s", d) } count++ @@ -117,18 +110,18 @@ func TestTermEnum(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"v.label", "v.data.firstName", "v.data.lastName"} + newFields := []string{"v._label", "v.firstName", "v.lastName"} for _, s := range newFields { idx.AddField(s) } for _, d := range data { - idx.AddDoc(d["gid"].(string), map[string]interface{}{"v": d}) + idx.AddDoc(d["_id"].(string), map[string]interface{}{"v": d}) } count := 0 - for d := range idx.FieldTerms("v.data.lastName") { + for d := range idx.FieldTerms("v.lastName") { count++ - if !contains(lastNames, d.(string)) { + if !setcmp.ContainsString(lastNames, d.(string)) { t.Errorf("Bad term return: %s", d) } } @@ -137,9 +130,9 @@ func TestTermEnum(t *testing.T) { } count = 0 - for d := range idx.FieldTerms("v.data.firstName") { + for d := range idx.FieldTerms("v.firstName") { count++ - if !contains(firstNames, d.(string)) { + if !setcmp.ContainsString(firstNames, d.(string)) { t.Errorf("Bad term return: %s", d) } } @@ -155,18 +148,18 @@ func TestTermCount(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"v.label", "v.data.firstName", "v.data.lastName"} + newFields := []string{"v._label", "v.firstName", "v.lastName"} for _, s := range newFields { idx.AddField(s) } for _, d := range data { - idx.AddDoc(d["gid"].(string), map[string]interface{}{"v": d}) + idx.AddDoc(d["_id"].(string), map[string]interface{}{"v": d}) } count := 0 - for d := range idx.FieldStringTermCounts("v.data.lastName") { + for d := range idx.FieldStringTermCounts("v.lastName") { count++ - if !contains(lastNames, d.String) { + if !setcmp.ContainsString(lastNames, d.String) { t.Errorf("Bad term return: %s", d.String) } if d.String == "Smith" { @@ -180,9 +173,9 @@ func TestTermCount(t *testing.T) { } count = 0 - for d := range idx.FieldTermCounts("v.data.firstName") { + for d := range idx.FieldTermCounts("v.firstName") { count++ - if !contains(firstNames, d.String) { + if !setcmp.ContainsString(firstNames, d.String) { t.Errorf("Bad term return: %s", d.String) } } @@ -198,7 +191,7 @@ func TestDocDelete(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"v.label", "v.data.firstName", "v.data.lastName"} + newFields := []string{"v._label", "v.firstName", "v.lastName"} for _, s := range newFields { idx.AddField(s) } @@ -210,9 +203,9 @@ func TestDocDelete(t *testing.T) { } count := 0 - for d := range idx.FieldStringTermCounts("v.data.lastName") { + for d := range idx.FieldStringTermCounts("v.lastName") { count++ - if !contains(lastNames, d.String) { + if !setcmp.ContainsString(lastNames, d.String) { t.Errorf("Bad term return: %s", d.String) } if d.String == "Smith" { @@ -231,9 +224,9 @@ func TestDocDelete(t *testing.T) { } count = 0 - for d := range idx.FieldStringTermCounts("v.data.lastName") { + for d := range idx.FieldStringTermCounts("v.lastName") { count++ - if !contains(lastNames, d.String) { + if !setcmp.ContainsString(lastNames, d.String) { t.Errorf("Bad term return: %s", d.String) } if d.String == "Smith" { @@ -246,7 +239,7 @@ func TestDocDelete(t *testing.T) { t.Errorf("Wrong return count %d != %d", count, 3) } - for d := range idx.FieldTermCounts("v.data.firstName") { + for d := range idx.FieldTermCounts("v.firstName") { if d.String == "Bob" { if d.Count != 0 { t.Errorf("Bad term count return: %d", d.Count) @@ -255,7 +248,7 @@ func TestDocDelete(t *testing.T) { } count = 0 - for range idx.GetTermMatch(context.Background(), "v.data.firstName", "Bob", -1) { + for range idx.GetTermMatch(context.Background(), "v.firstName", "Bob", -1) { count++ } if count != 0 { @@ -269,15 +262,15 @@ func TestNumField(t *testing.T) { resetKVInterface() idx := kvindex.NewIndex(kvdriver) - newFields := []string{"v.label", "v.data.age"} + newFields := []string{"v._label", "v.age"} for _, s := range newFields { idx.AddField(s) } for _, d := range data { - idx.AddDoc(d["gid"].(string), map[string]interface{}{"v": d}) + idx.AddDoc(d["_id"].(string), map[string]interface{}{"v": d}) } count := 0 - for d := range idx.FieldTerms("v.data.age") { + for d := range idx.FieldTerms("v.age") { count++ t.Logf("Age: %v", d) } diff --git a/kvgraph/test/main_test.go b/kvgraph/test/main_test.go index 3cd617154..1cc6c2eb6 100644 --- a/kvgraph/test/main_test.go +++ b/kvgraph/test/main_test.go @@ -9,6 +9,7 @@ import ( _ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself _ "github.com/bmeg/grip/kvi/boltdb" // import so bolt will register itself _ "github.com/bmeg/grip/kvi/leveldb" // import so level will register itself + _ "github.com/bmeg/grip/kvi/pebbledb" // import so pebble will register itself "github.com/bmeg/grip/util" ) @@ -28,15 +29,6 @@ func resetKVInterface() { } } -func contains(a []string, v string) bool { - for _, i := range a { - if i == v { - return true - } - } - return false -} - func TestMain(m *testing.M) { var err error var exit = 1 @@ -49,7 +41,7 @@ func TestMain(m *testing.M) { os.RemoveAll(dbpath) }() - for _, dbname = range []string{"badger", "bolt", "level"} { + for _, dbname = range []string{"badger", "bolt", "level", "pebble"} { dbpath = "test.db." + util.RandomString(6) kvdriver, err = kvi.NewKVInterface(dbname, dbpath, nil) diff --git a/kvi/pebbledb/pebble_store.go b/kvi/pebbledb/pebble_store.go index 09e6a1e3f..d239c741a 100644 --- a/kvi/pebbledb/pebble_store.go +++ b/kvi/pebbledb/pebble_store.go @@ -19,9 +19,13 @@ import ( var loaded = kvi.AddKVDriver("pebble", NewKVInterface) +var defaultCompactLimit = uint32(10000) + // PebbleKV is an implementation of the KVStore for badger type PebbleKV struct { - db *pebble.DB + db *pebble.DB + insertCount uint32 + compactLimit uint32 } // NewKVInterface creates new BoltDB backed KVInterface at `path` @@ -30,7 +34,15 @@ func NewKVInterface(path string, kopts kvi.Options) (kvi.KVInterface, error) { if err != nil { return nil, err } - return &PebbleKV{db: db}, nil + return &PebbleKV{db: db, insertCount: 0, compactLimit: defaultCompactLimit}, nil +} + +func WrapPebble(db *pebble.DB) kvi.KVInterface { + return &PebbleKV{ + db: db, + insertCount: 0, + compactLimit: 10000, + } } // Close closes the badger connection @@ -57,24 +69,8 @@ func (pdb *PebbleKV) Delete(id []byte) error { // DeletePrefix deletes all elements in kvstore that begin with prefix `id` func (pdb *PebbleKV) DeletePrefix(prefix []byte) error { - deleteBlockSize := 10000 - for found := true; found; { - found = false - wb := make([][]byte, 0, deleteBlockSize) - it := pdb.db.NewIter(&pebble.IterOptions{LowerBound: prefix}) - for ; it.Valid() && bytes.HasPrefix(it.Key(), prefix) && len(wb) < deleteBlockSize-1; it.Next() { - wb = append(wb, copyBytes(it.Key())) - } - it.Close() - for _, i := range wb { - err := pdb.db.Delete(i, nil) - if err != nil { - return err - } - found = true - } - } - return nil + nextPrefix := append(prefix, 0xFF) + return pdb.db.DeleteRange(prefix, nextPrefix, nil) } // HasKey returns true if the key is exists in kvstore @@ -93,9 +89,12 @@ func (pdb *PebbleKV) Set(id []byte, val []byte) error { } func (pdb *PebbleKV) View(u func(it kvi.KVIterator) error) error { - it := pdb.db.NewIter(&pebble.IterOptions{}) + it, err := pdb.db.NewIter(&pebble.IterOptions{}) + if err != nil { + return err + } pit := &pebbleIterator{pdb.db, it, true, nil, nil} - err := u(pit) + err = u(pit) it.Close() return err } @@ -133,9 +132,12 @@ func (ptx pebbleTransaction) Delete(id []byte) error { } func (ptx pebbleTransaction) View(u func(it kvi.KVIterator) error) error { - it := ptx.db.NewIter(&pebble.IterOptions{}) + it, err := ptx.db.NewIter(&pebble.IterOptions{}) + if err != nil { + return err + } pit := &pebbleIterator{ptx.db, it, true, nil, nil} - err := u(pit) + err = u(pit) it.Close() return err } @@ -224,6 +226,7 @@ type pebbleBulkWrite struct { batch *pebble.Batch highest, lowest []byte curSize int + totalInserts uint32 } const ( @@ -232,6 +235,7 @@ const ( func (pbw *pebbleBulkWrite) Set(id []byte, val []byte) error { pbw.curSize += len(id) + len(val) + pbw.totalInserts++ if pbw.highest == nil || bytes.Compare(id, pbw.highest) > 0 { pbw.highest = copyBytes(id) } @@ -250,12 +254,17 @@ func (pbw *pebbleBulkWrite) Set(id []byte, val []byte) error { // BulkWrite is a replication of the regular update, no special code for bulk writes func (pdb *PebbleKV) BulkWrite(u func(tx kvi.KVBulkWrite) error) error { batch := pdb.db.NewBatch() - ptx := &pebbleBulkWrite{pdb.db, batch, nil, nil, 0} + ptx := &pebbleBulkWrite{pdb.db, batch, nil, nil, 0, 0} err := u(ptx) batch.Commit(nil) batch.Close() - if ptx.lowest != nil && ptx.highest != nil { - pdb.db.Compact(ptx.lowest, ptx.highest, true) + + pdb.insertCount += ptx.totalInserts + if pdb.insertCount > pdb.compactLimit { + log.Debugf("Running pebble compact %d > %d", pdb.insertCount, pdb.compactLimit) + //pdb.db.Compact(ptx.lowest, ptx.highest, true) + pdb.db.Compact([]byte{0x00}, []byte{0xFF}, true) + pdb.insertCount = 0 } return err } diff --git a/kvindex/entries.go b/kvindex/entries.go index 5859f185a..4636c3324 100644 --- a/kvindex/entries.go +++ b/kvindex/entries.go @@ -4,6 +4,8 @@ import ( "encoding/binary" "fmt" "math" + + "github.com/bmeg/grip/util/setcmp" ) // TermType defines in a term is a Number or a String @@ -37,18 +39,19 @@ func fieldScan(docID string, doc map[string]interface{}, fieldPrefix string, fie if containsPrefix(f, fields) { if x, ok := v.(map[string]interface{}); ok { fieldScan(docID, x, fmt.Sprintf("%s.%s", fieldPrefix, k), fields, out) - } else if contains(f, fields) { + } else if setcmp.ContainsString(fields, f) { out <- newEntry(docID, f, v) } } } } -func mapDig(i map[string]interface{}, path []string) interface{} { +// Given a list of fields (graphs), return term (label) of doc (graph element) if it exists on field +func getTermOnField(i map[string]interface{}, path []string) interface{} { if x, ok := i[path[0]]; ok { if len(path) > 1 { if y, ok := x.(map[string]interface{}); ok { - return mapDig(y, path[1:]) + return getTermOnField(y, path[1:]) } } else { return x diff --git a/kvindex/index.pb.go b/kvindex/index.pb.go index 687dd2ea7..25f4289f8 100644 --- a/kvindex/index.pb.go +++ b/kvindex/index.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc-gen-go v1.34.2 +// protoc v5.29.3 // source: index.proto package kvindex @@ -91,7 +91,7 @@ func file_index_proto_rawDescGZIP() []byte { } var file_index_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_index_proto_goTypes = []interface{}{ +var file_index_proto_goTypes = []any{ (*Doc)(nil), // 0: kvindex.Doc } var file_index_proto_depIdxs = []int32{ @@ -108,7 +108,7 @@ func file_index_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_index_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_index_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Doc); i { case 0: return &v.state diff --git a/kvindex/keys.go b/kvindex/keys.go index d2405a72c..a9155735b 100644 --- a/kvindex/keys.go +++ b/kvindex/keys.go @@ -4,24 +4,28 @@ import ( "bytes" ) -//Fields -//key: f | field -//val: +// Fields +// key: f | field +// Known as 'graph' in grip +// val: var idxFieldPrefix = []byte("f") -//Terms -//key: t | field | TermType | term -//val: count +// Terms +// key: t | field | TermType' +// Known as 'label' in grip +// val: count var idxTermPrefix = []byte("t") -//Entries -//key: i | field | TermType | term | docid -//val: +// Entries +// key: i | field | TermType | term | docid +// What links the graph + label to the doc via an id +// val: var idxEntryPrefix = []byte("i") -//Docs -//key: d | docid -//val: Doc entry list +// Docs +// key: d | docid +// Known as 'data' in grip +// val: Doc entry list var idxDocPrefix = []byte("D") // FieldPrefix returns the byte array prefix for all graph entry keys @@ -75,7 +79,7 @@ func EntryPrefix(field string) []byte { return bytes.Join([][]byte{idxEntryPrefix, []byte(field), {}}, []byte{0}) } -// EntryTypePrefix get prefix for all entries for a single field +// EntryTypePrefix get prefix for all entries for a single field an a single type func EntryTypePrefix(field string, ttype TermType) []byte { return bytes.Join([][]byte{idxEntryPrefix, []byte(field), {byte(ttype)}, {}}, []byte{0}) } diff --git a/kvindex/kvindex.go b/kvindex/kvindex.go index 73ef66d5e..6bcdf63d2 100644 --- a/kvindex/kvindex.go +++ b/kvindex/kvindex.go @@ -16,15 +16,6 @@ import ( const bufferSize = 1000 -func contains(c string, s []string) bool { - for _, i := range s { - if c == i { - return true - } - } - return false -} - func containsPrefix(c string, s []string) bool { for _, i := range s { if strings.HasPrefix(i, c) { @@ -64,8 +55,12 @@ func (idx *KVIndex) RemoveField(path string) error { fk := FieldKey(path) fkt := TermPrefix(path) ed := EntryPrefix(path) + dk := DocKey(path) + idx.KV.DeletePrefix(fkt) idx.KV.DeletePrefix(ed) + idx.KV.DeletePrefix(dk) + delete(idx.Fields, path) return idx.KV.Delete(fk) } @@ -101,19 +96,19 @@ func (idx *KVIndex) AddDocTx(tx kvi.KVBulkWrite, docID string, doc map[string]in docKey := DocKey(docID) for field, p := range idx.Fields { - x := mapDig(doc, p) - if x != nil { - term, t := GetTermBytes(x) + term := getTermOnField(doc, p) + if term != nil { + termBytes, t := GetTermBytes(term) switch t { case TermString, TermNumber: - entryKey := EntryKey(field, t, term, docID) + entryKey := EntryKey(field, t, termBytes, docID) err := tx.Set(entryKey, []byte{}) if err != nil { return fmt.Errorf("failed to set entry key %s: %v", entryKey, err) } sdoc.Entries = append(sdoc.Entries, entryKey) - termKey := TermKey(field, t, term) + termKey := TermKey(field, t, termBytes) //set the term count to 0 to invalidate it. Later on, if other code trying //to get the term count will have to recount //previously, it was a set(get+1), but for bulk loading, its better @@ -425,7 +420,7 @@ func (idx *KVIndex) FieldTermNumberMax(field string) float64 { return min } -//FieldTermNumberRange gets all number term counts between min and max +// FieldTermNumberRange gets all number term counts between min and max func (idx *KVIndex) FieldTermNumberRange(field string, min, max float64) chan KVTermCount { minBytes, _ := GetTermBytes(min) diff --git a/log/logger.go b/log/logger.go index 8874179e2..a316bf8d0 100644 --- a/log/logger.go +++ b/log/logger.go @@ -11,13 +11,13 @@ import ( "strings" "time" + "golang.org/x/term" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "github.com/kr/pretty" "github.com/logrusorgru/aurora" "github.com/sirupsen/logrus" - "golang.org/x/crypto/ssh/terminal" ) var PanicLevel = logrus.PanicLevel @@ -110,7 +110,7 @@ type textFormatter struct { func checkIfTerminal(w io.Writer) bool { switch v := w.(type) { case *os.File: - return terminal.IsTerminal(int(v.Fd())) + return term.IsTerminal(int(v.Fd())) default: return false } @@ -141,7 +141,7 @@ func (f *textFormatter) Format(entry *logrus.Entry) ([]byte, error) { case logrus.DebugLevel: levelColor = aurora.MagentaFg case logrus.WarnLevel: - levelColor = aurora.BrownFg + levelColor = aurora.YellowFg case logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel: levelColor = aurora.RedFg default: @@ -191,8 +191,8 @@ func (f *textFormatter) Format(entry *logrus.Entry) ([]byte, error) { fmt.Fprintf(b, "%s%-20s %v\n", f.Indent, aurora.Colorize(k, levelColor), v) } - - b.WriteByte('\n') + b.WriteString("-=-=-\n") + //b.WriteByte('\n') return b.Bytes(), nil } @@ -276,67 +276,67 @@ func ConfigureLogger(conf Logger) { } // Debug log message -func Debug(args ...interface{}) { +func Debug(args ...any) { logger.Debug(args...) } // Debugln log message -func Debugln(args ...interface{}) { +func Debugln(args ...any) { logger.Debugln(args...) } // Debugf log message -func Debugf(format string, args ...interface{}) { +func Debugf(format string, args ...any) { logger.Debugf(format, args...) } // Info log message -func Info(args ...interface{}) { +func Info(args ...any) { logger.Info(args...) } // Infoln log message -func Infoln(args ...interface{}) { +func Infoln(args ...any) { logger.Infoln(args...) } // Infof log message -func Infof(format string, args ...interface{}) { +func Infof(format string, args ...any) { logger.Infof(format, args...) } // Warning log message -func Warning(args ...interface{}) { +func Warning(args ...any) { logger.Warning(args...) } // Warningln log message -func Warningln(args ...interface{}) { +func Warningln(args ...any) { logger.Warningln(fmt.Sprint(args...)) } // Warningf log message -func Warningf(format string, args ...interface{}) { +func Warningf(format string, args ...any) { logger.Warningf(format, args...) } // Error log message -func Error(args ...interface{}) { +func Error(args ...any) { logger.Error(args...) } // Errorln log message -func Errorln(args ...interface{}) { +func Errorln(args ...any) { logger.Errorln(args...) } // Errorf log message -func Errorf(format string, args ...interface{}) { +func Errorf(format string, args ...any) { logger.Errorf(format, args...) } // WithField creates an entry from the standard logger and adds a field to it. -func WithField(key string, value interface{}) *Entry { +func WithField(key string, value any) *Entry { return logger.WithField(key, value) } @@ -358,3 +358,16 @@ func GetLogger() *logrus.Logger { func Sub(ns string) *Entry { return logger.WithFields(Fields{"namespace": ns}) } + +func Redf(format string, args ...any) { + if tf, ok := logger.Formatter.(*textFormatter); ok { + isColored := (tf.ForceColors || isColorTerminal(logger.Out)) && !tf.DisableColors + if isColored { + msg := fmt.Sprintf(format, args...) + redMsg := aurora.Red(msg).String() + fmt.Fprintln(logger.Out, redMsg) + return + } + } + logger.Errorf(format, args...) +} diff --git a/mongo/compile.go b/mongo/compile.go index 613afe033..241c6d2fb 100644 --- a/mongo/compile.go +++ b/mongo/compile.go @@ -1,13 +1,15 @@ package mongo import ( + "encoding/json" "fmt" + "strconv" "strings" "github.com/bmeg/grip/engine/core" "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" "github.com/bmeg/grip/util/protoutil" "go.mongodb.org/mongo-driver/bson" @@ -76,7 +78,7 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile //in the case of a pipeline extension, switch over the the //core based engine. Until the mongo aggregation pipeline engine //is updated to support - if opts != nil && opts.PipelineExtension != gdbi.NoData { + if opts != nil && opts.Extends != nil { cmpl := core.NewCompiler(comp.db) return cmpl.Compile(stmts, opts) } @@ -90,6 +92,23 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile vertCol := fmt.Sprintf("%s_vertices", comp.db.graph) edgeCol := fmt.Sprintf("%s_edges", comp.db.graph) + if core.OptimizeHasLabelMatch(stmts) { + stmt := stmts[1].GetHasLabel() + labels := protoutil.AsStringList(stmt) + //find by label first + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{FIELD_LABEL: bson.M{"$in": labels}}}}) + startCollection = vertCol + query = append(query, + bson.D{primitive.E{Key: "$project", Value: bson.M{ + FIELD_CURRENT: "$$CURRENT", + "marks": "$marks", + "path": []any{bson.M{"vertex": "$_id"}}, + }, + }}) + lastType = gdbi.VertexData + stmts = stmts[2:] + } + for _, gs := range stmts { switch stmt := gs.GetStatement().(type) { case *gripql.GraphStatement_V: @@ -99,41 +118,17 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile startCollection = vertCol ids := protoutil.AsStringList(stmt.V) if len(ids) > 0 { - query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"_id": bson.M{"$in": ids}}}}) + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{FIELD_ID: bson.M{"$in": ids}}}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$_id", - "label": "$label", - "data": "$data", - "marks": "$marks", - "path": []interface{}{bson.M{"vertex": "$_id"}}, + FIELD_CURRENT: "$$CURRENT", + "marks": "$marks", + "path": []any{bson.M{"vertex": "$_id"}}, }, }}) lastType = gdbi.VertexData - case *gripql.GraphStatement_E: - if lastType != gdbi.NoData { - return &Pipeline{}, fmt.Errorf(`"E" statement is only valid at the beginning of the traversal`) - } - startCollection = edgeCol - ids := protoutil.AsStringList(stmt.E) - if len(ids) > 0 { - query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"_id": bson.M{"$in": ids}}}}) - } - query = append(query, - bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$_id", - "to": "$to", - "from": "$from", - "label": "$label", - "data": "$data", - "marks": "$marks", - "path": []interface{}{bson.M{"edge": "$_id"}}, - }, - }}) - lastType = gdbi.EdgeData - case *gripql.GraphStatement_In, *gripql.GraphStatement_InNull: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"in" statement is only valid for edge or vertex types not: %s`, lastType.String()) @@ -149,9 +144,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "localField": "_id", - "foreignField": "to", - "as": "dst", + "localField": FIELD_CURRENT_ID, + "foreignField": FIELD_TO, + "as": FIELD_DST, }, }}, ) @@ -159,12 +154,12 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ "marks": "$marks", "path": "$path", - "dst": bson.M{ + FIELD_DST: bson.M{ "$filter": bson.M{ "input": "$dst", "as": "d", "cond": bson.M{ - "$in": bson.A{"$$d.label", labels}, + "$in": bson.A{"$$d._label", labels}, }, }, }, @@ -176,12 +171,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "path": "$path", + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": "$path", }}}) } else { if len(labels) > 0 { @@ -192,9 +184,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": vertCol, - "localField": "from", - "foreignField": "_id", - "as": "dst", + "localField": FIELD_CURRENT_FROM, + "foreignField": FIELD_ID, + "as": FIELD_DST, }, }}, ) @@ -204,11 +196,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"vertex": "$dst._id"}}}}, + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"vertex": "$dst._id"}}}}, }}}) lastType = gdbi.VertexData @@ -227,9 +217,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "localField": "_id", - "foreignField": "from", - "as": "dst", + "localField": FIELD_CURRENT_ID, + "foreignField": FIELD_FROM, + "as": FIELD_DST, }, }}, ) @@ -237,12 +227,12 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ "marks": "$marks", "path": "$path", - "dst": bson.M{ + FIELD_DST: bson.M{ "$filter": bson.M{ "input": "$dst", "as": "d", "cond": bson.M{ - "$in": bson.A{"$$d.label", labels}, + "$in": bson.A{"$$d._label", labels}, }, }, }, @@ -254,16 +244,13 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "path": "$path", + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": "$path", }}}) } else { if len(labels) > 0 { - query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"label": bson.M{"$in": labels}}}}) + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{FIELD_LABEL: bson.M{"$in": labels}}}}) } } @@ -271,9 +258,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": vertCol, - "localField": "to", - "foreignField": "_id", - "as": "dst", + "localField": FIELD_CURRENT_TO, + "foreignField": FIELD_ID, + "as": FIELD_DST, }, }}, ) @@ -283,11 +270,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", + "data": "$dst", "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"vertex": "$dst._id"}}}}, + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"vertex": "$dst._id"}}}}, }}}) lastType = gdbi.VertexData @@ -301,14 +286,14 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "let": bson.M{"vid": "$_id", "marks": "$marks"}, + "let": bson.M{"vid": "$data._id", "marks": "$marks"}, "pipeline": []bson.M{ { "$match": bson.M{ "$expr": bson.M{ "$or": []bson.M{ - {"$eq": []string{"$to", "$$vid"}}, - {"$eq": []string{"$from", "$$vid"}}, + {"$eq": []string{"$_to", "$$vid"}}, + {"$eq": []string{"$_from", "$$vid"}}, }, }, }, @@ -317,30 +302,28 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile "$sort": bson.M{"to": 1}, }, }, - "as": "dst", + "as": FIELD_DST, }, }}, ) query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "vid": "$_id", - "path": "$path", + FIELD_CURRENT: "$dst", + "marks": "$marks", + "vid": "$data._id", + "path": "$path", }}}) } + // filter outgoing edges by label is needed if len(labels) > 0 { - query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"label": bson.M{"$in": labels}}}}) + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"data._label": bson.M{"$in": labels}}}}) } + // lookup the vertex on the other end of that edge query = append(query, bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": vertCol, - "let": bson.M{"to": "$to", "from": "$from", "marks": "$marks", "vid": "$vid"}, + "let": bson.M{"to": "$data._to", "from": "$data._from", "marks": "$marks", "vid": "$vid"}, "pipeline": []bson.M{ { "$match": bson.M{ @@ -360,17 +343,15 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile }, }, }, - "as": "dst", + "as": FIELD_DST, }, }}, ) query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"vertex": "$dst._id"}}}}, + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"vertex": "$dst._id"}}}}, }}}) lastType = gdbi.VertexData @@ -388,9 +369,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "localField": "_id", - "foreignField": "to", - "as": "dst", + "localField": FIELD_CURRENT_ID, + "foreignField": FIELD_TO, + "as": FIELD_DST, }, }}, ) @@ -398,12 +379,12 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ "marks": "$marks", "path": "$path", - "dst": bson.M{ + FIELD_DST: bson.M{ "$filter": bson.M{ "input": "$dst", "as": "d", "cond": bson.M{ - "$in": bson.A{"$$d.label", labels}, + "$in": bson.A{"$$d._label", labels}, }, }, }, @@ -415,13 +396,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"edge": "$dst._id"}}}}, + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"edge": "$dst._id"}}}}, }}}) lastType = gdbi.EdgeData @@ -440,9 +417,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "localField": "_id", - "foreignField": "from", - "as": "dst", + "localField": FIELD_CURRENT_ID, + "foreignField": FIELD_FROM, + "as": FIELD_DST, }, }}, ) @@ -450,12 +427,12 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ "marks": "$marks", "path": "$path", - "dst": bson.M{ + FIELD_DST: bson.M{ "$filter": bson.M{ "input": "$dst", "as": "d", "cond": bson.M{ - "$in": bson.A{"$$d.label", labels}, + "$in": bson.A{"$$d._label", labels}, }, }, }, @@ -467,13 +444,9 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) } query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"edge": "$dst._id"}}}}, + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"edge": "$dst._id"}}}}, }}}) lastType = gdbi.EdgeData @@ -485,14 +458,14 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile bson.D{primitive.E{ Key: "$lookup", Value: bson.M{ "from": edgeCol, - "let": bson.M{"vid": "$_id", "marks": "$marks"}, + "let": bson.M{"vid": "$data._id", "marks": "$marks"}, "pipeline": []bson.M{ { "$match": bson.M{ "$expr": bson.M{ "$or": []bson.M{ - {"$eq": []string{"$to", "$$vid"}}, - {"$eq": []string{"$from", "$$vid"}}, + {"$eq": []string{"$_to", "$$vid"}}, + {"$eq": []string{"$_from", "$$vid"}}, }, }, }, @@ -501,23 +474,19 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile "$sort": bson.M{"to": 1}, }, }, - "as": "dst", + "as": FIELD_DST, }, }}, ) query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$dst"}}) query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", - "data": "$dst.data", - "to": "$dst.to", - "from": "$dst.from", - "marks": "$marks", - "path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"edge": "$dst._id"}}}}, + FIELD_CURRENT: "$dst", + "marks": "$marks", + "path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"edge": "$dst._id"}}}}, }}}) labels := protoutil.AsStringList(stmt.BothE) if len(labels) > 0 { - query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"label": bson.M{"$in": labels}}}}) + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{"data._label": bson.M{"$in": labels}}}}) } lastType = gdbi.EdgeData @@ -534,21 +503,14 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile return &Pipeline{}, fmt.Errorf(`"hasLabel" statement is only valid for edge or vertex types not: %s`, lastType.String()) } labels := protoutil.AsStringList(stmt.HasLabel) - ilabels := make([]interface{}, len(labels)) - for i, v := range labels { - ilabels[i] = v - } - has := gripql.Within("_label", ilabels...) - whereExpr := convertHasExpression(has, false) - matchStmt := bson.D{primitive.E{Key: "$match", Value: whereExpr}} - query = append(query, matchStmt) + query = append(query, bson.D{primitive.E{Key: "$match", Value: bson.M{FIELD_CURRENT_LABEL: bson.M{"$in": labels}}}}) case *gripql.GraphStatement_HasId: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"hasId" statement is only valid for edge or vertex types not: %s`, lastType.String()) } ids := protoutil.AsStringList(stmt.HasId) - iids := make([]interface{}, len(ids)) + iids := make([]any, len(ids)) for i, v := range ids { iids[i] = v } @@ -564,10 +526,11 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile hasKeys := bson.M{} keys := protoutil.AsStringList(stmt.HasKey) for _, key := range keys { - key = jsonpath.GetJSONPath(key) - key = strings.TrimPrefix(key, "$.") - hasKeys[key] = bson.M{"$exists": true} + lKey := ToPipelinePath(key) + fmt.Printf("Key: %s -> %s\n", key, lKey) + hasKeys[lKey] = bson.M{"$exists": true} } + fmt.Printf("hasKey: %#v\n", hasKeys) query = append(query, bson.D{primitive.E{Key: "$match", Value: hasKeys}}) case *gripql.GraphStatement_Limit: @@ -597,55 +560,58 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile } fields := protoutil.AsStringList(stmt.Distinct) if len(fields) == 0 { - fields = append(fields, "_gid") + fields = append(fields, FIELD_ID) } keys := bson.M{} match := bson.M{} for _, f := range fields { - namespace := jsonpath.GetNamespace(f) - f = jsonpath.GetJSONPath(f) - f = strings.TrimPrefix(f, "$.") - if f == "gid" { - f = "_id" - } - if namespace != jsonpath.Current { - f = fmt.Sprintf("marks.%s.%s", namespace, f) - } - match[f] = bson.M{"$exists": true} - k := strings.Replace(f, ".", "_", -1) - keys[k] = "$" + f + p := ToPipelinePath(f) + match[p] = bson.M{"$exists": true} + k := strings.Replace(f[1:], ".", "_", -1) // FIXME + keys[k] = "$" + p } query = append(query, bson.D{primitive.E{ Key: "$match", Value: match, }}) query = append(query, bson.D{primitive.E{ Key: "$group", Value: bson.M{ - "_id": keys, - "dst": bson.M{"$first": "$$ROOT"}, + FIELD_ID: keys, + FIELD_DST: bson.M{"$first": "$$ROOT"}, }, }, }) + fmt.Printf("Distinct: %s\n", query) switch lastType { case gdbi.VertexData: query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", "data": "$dst.data", "marks": "$dst.marks", "path": "$dst.path", }}}) case gdbi.EdgeData: query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": "$dst._id", - "label": "$dst.label", "data": "$dst.data", - "to": "$dst.to", - "from": "$dst.from", "marks": "$dst.marks", "path": "$dst.path", }}}) } + case *gripql.GraphStatement_Sort: + if len(stmt.Sort.Fields) == 0 { + return nil, fmt.Errorf("`sort` requires sort field") + } + sortFields := bson.D{} + for _, i := range stmt.Sort.Fields { + tf := tpath.NormalizePath(i.Field) + f := ToPipelinePath(tf) + if i.Descending { + sortFields = append(sortFields, primitive.E{Key: f, Value: -1}) + } else { + sortFields = append(sortFields, primitive.E{Key: f, Value: 1}) + } + } + query = append(query, bson.D{primitive.E{Key: "$sort", Value: sortFields}}) + case *gripql.GraphStatement_As: if lastType == gdbi.NoData { return &Pipeline{}, fmt.Errorf(`"as" statement is not valid at the beginning of a traversal`) @@ -656,52 +622,34 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile if err := gripql.ValidateFieldName(stmt.As); err != nil { return &Pipeline{}, fmt.Errorf(`"as" statement invalid; %v`, err) } - if stmt.As == jsonpath.Current { - return &Pipeline{}, fmt.Errorf(`"as" statement invalid; uses reserved name %s`, jsonpath.Current) + if stmt.As == tpath.CURRENT { + return &Pipeline{}, fmt.Errorf(`"as" statement invalid; uses reserved name %s`, tpath.CURRENT) } markTypes[stmt.As] = lastType - query = append(query, bson.D{primitive.E{Key: "$addFields", Value: bson.M{"marks": bson.M{stmt.As: "$$ROOT"}}}}) + query = append(query, bson.D{primitive.E{Key: "$addFields", Value: bson.M{"marks": bson.M{stmt.As: "$" + FIELD_CURRENT}}}}) case *gripql.GraphStatement_Select: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"select" statement is only valid for edge or vertex types not: %s`, lastType.String()) } - switch len(stmt.Select.Marks) { - case 0: - return &Pipeline{}, fmt.Errorf(`"select" statement has an empty list of mark names`) - case 1: - mark := "$marks." + stmt.Select.Marks[0] - switch markTypes[stmt.Select.Marks[0]] { - case gdbi.VertexData: - query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": mark + "._id", - "label": mark + ".label", - "data": mark + ".data", - "marks": 1, - "path": "$path", - //"path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"vertex": mark + "._id"}}}}, - }}}) - lastType = gdbi.VertexData - case gdbi.EdgeData: - query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ - "_id": mark + "._id", - "label": mark + ".label", - "from": mark + ".from", - "to": mark + ".to", - "data": mark + ".data", - "marks": 1, - "path": "$path", - //"path": bson.M{"$concatArrays": []interface{}{"$path", []bson.M{{"edge": mark + "._id"}}}}, - }}}) - lastType = gdbi.EdgeData - } - default: - selection := bson.M{} - for _, mark := range stmt.Select.Marks { - selection["marks."+mark] = 1 - } - query = append(query, bson.D{primitive.E{Key: "$project", Value: selection}}) - lastType = gdbi.SelectionData + mark := "$marks." + stmt.Select + switch markTypes[stmt.Select] { + case gdbi.VertexData: + query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ + FIELD_CURRENT: mark, + "marks": 1, + "path": "$path", + //"path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"vertex": mark + "._id"}}}}, + }}}) + lastType = gdbi.VertexData + case gdbi.EdgeData: + query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ + FIELD_CURRENT: mark, + "marks": 1, + "path": "$path", + //"path": bson.M{"$concatArrays": []any{"$path", []bson.M{{"edge": mark + "._id"}}}}, + }}}) + lastType = gdbi.EdgeData } case *gripql.GraphStatement_Render: @@ -711,6 +659,13 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile procs = append(procs, &core.Render{Template: stmt.Render.AsInterface()}) lastType = gdbi.RenderData + case *gripql.GraphStatement_Pivot: + if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { + return &Pipeline{}, fmt.Errorf(`"pivot" statement is only valid for edge or vertex types not: %s`, lastType.String()) + } + procs = append(procs, &core.Pivot{Stmt: stmt.Pivot}) + lastType = gdbi.RenderData + case *gripql.GraphStatement_Path: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"path" statement is only valid for edge or vertex types not: %s`, lastType.String()) @@ -722,6 +677,84 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$unwind", Value: "$data." + f}}) + case *gripql.GraphStatement_Totype: + if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { + return &Pipeline{}, fmt.Errorf(`"group" statement is only valid for edge or vertex types not: %s`, lastType.String()) + } + + if stmt.Totype.TypeName == "float" { + stmt.Totype.TypeName = "double" + } else if stmt.Totype.TypeName == "list" { + stmt.Totype.TypeName = "array" + } + f := ToPipelinePath(stmt.Totype.Field) + query = append(query, bson.D{ + {Key: "$set", Value: bson.D{ + {Key: f, Value: bson.D{ + {Key: "$convert", Value: bson.D{ + {Key: "input", Value: f}, + {Key: "to", Value: stmt.Totype.TypeName}, + {Key: "onError", Value: bson.D{ + {Key: "$switch", Value: bson.D{ + {Key: "branches", Value: bson.A{ + // handle list input + bson.D{ + {Key: "case", Value: bson.D{ + {Key: "$eq", Value: bson.A{ + bson.D{{Key: "$literal", Value: stmt.Totype.TypeName}}, "array", + }}, + }}, + {Key: "then", Value: bson.D{ + {Key: "$concatArrays", Value: bson.A{ + bson.A{"$" + f}, + }}, + }}, + }, + // Handle string input + bson.D{ + {Key: "case", Value: bson.D{ + {Key: "$eq", Value: bson.A{ + bson.D{{Key: "$literal", Value: stmt.Totype.TypeName}}, "string", + }}, + }}, + {Key: "then", Value: ""}, + }, + // Handle boolean input + bson.D{ + {Key: "case", Value: bson.D{ + {Key: "$eq", Value: bson.A{ + bson.D{{Key: "$literal", Value: stmt.Totype.TypeName}}, "bool", + }}, + }}, + {Key: "then", Value: false}, + }, + // Handle float input + bson.D{ + {Key: "case", Value: bson.D{ + {Key: "$eq", Value: bson.A{ + bson.D{{Key: "$literal", Value: stmt.Totype.TypeName}}, "double", + }}, + }}, + {Key: "then", Value: 0.0}, + }, + // Handle int input + bson.D{ + {Key: "case", Value: bson.D{ + {Key: "$eq", Value: bson.A{ + bson.D{{Key: "$literal", Value: stmt.Totype.TypeName}}, "int", + }}, + }}, + {Key: "then", Value: 0}, + }, + }}, + {Key: "default", Value: nil}, // Default empty list for unhandled types + }}, + }}, + }}, + }}, + }}, + }) + case *gripql.GraphStatement_Fields: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"fields" statement is only valid for edge or vertex types not: %s`, lastType.String()) @@ -736,13 +769,13 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile exclude = true f = strings.TrimPrefix(f, "-") } - namespace := jsonpath.GetNamespace(f) - if namespace != jsonpath.Current { + f = tpath.NormalizePath(f) + namespace := tpath.GetNamespace(f) + if namespace != tpath.CURRENT { log.Errorf("FieldsProcessor: only can select field from current traveler") continue SelectLoop } - f = jsonpath.GetJSONPath(f) - f = strings.TrimPrefix(f, "$.") + f = ToPipelinePath(f) if exclude { excludeFields = append(excludeFields, f) } else { @@ -756,16 +789,16 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile } if len(includeFields) > 0 || len(excludeFields) == 0 { - fieldSelect = bson.M{"_id": 1, "label": 1, "from": 1, "to": 1, "marks": 1} + fieldSelect = bson.M{"data._id": 1, "data._label": 1, "data._from": 1, "data._to": 1, "marks": 1} for _, v := range excludeFields { switch v { - case "gid": - fieldSelect["_id"] = 0 - case "label": + case "_gid": + fieldSelect[FIELD_ID] = 0 + case FIELD_LABEL: delete(fieldSelect, "label") - case "from": + case FIELD_FROM: delete(fieldSelect, "from") - case "to": + case FIELD_TO: delete(fieldSelect, "to") } } @@ -776,11 +809,52 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile query = append(query, bson.D{primitive.E{Key: "$project", Value: fieldSelect}}) + case *gripql.GraphStatement_Group: + if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { + return &Pipeline{}, fmt.Errorf(`"group" statement is only valid for edge or vertex types not: %s`, lastType.String()) + } + + //group entiies by the primary ID + grouping := bson.M{ + FIELD_ID: "$" + FIELD_CURRENT_ID, + FIELD_DST: bson.M{"$first": "$$ROOT"}, + } + //We're only keeping the first 'current' record, for everything else + //accumulate all the requested fields + nMap := map[string]string{} + i := 0 + for dest, field := range stmt.Group.Fields { + n := strconv.Itoa(i) + nMap[dest] = n + grouping[n] = bson.M{ + "$push": "$" + ToPipelinePath(field), + } + i++ + } + query = append(query, bson.D{primitive.E{ + Key: "$group", Value: grouping, + }}) + + //Take the accumulated fields and push them into the document + aFields := bson.M{} + for dest := range stmt.Group.Fields { + dstField := "dst.data." + dest + srcField := "$" + nMap[dest] + aFields[dstField] = srcField + } + query = append(query, bson.D{primitive.E{Key: "$addFields", Value: aFields}}) + //project back into the regular shape of a traveler + query = append(query, bson.D{primitive.E{Key: "$project", Value: bson.M{ + "data": "$dst.data", + "marks": "$dst.marks", + "path": "$dst.path", + }}}) + case *gripql.GraphStatement_Aggregate: if lastType != gdbi.VertexData && lastType != gdbi.EdgeData { return &Pipeline{}, fmt.Errorf(`"aggregate" statement is only valid for edge or vertex types not: %s`, lastType.String()) } - aggNames := make(map[string]interface{}) + aggNames := make(map[string]any) for _, a := range stmt.Aggregate.Aggregations { if _, ok := aggNames[a.Name]; ok { return &Pipeline{}, fmt.Errorf("duplicate aggregation name '%s' found; all aggregations must have a unique name", a.Name) @@ -791,11 +865,7 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile switch a.Aggregation.(type) { case *gripql.Aggregate_Term: agg := a.GetTerm() - field := jsonpath.GetJSONPath(agg.Field) - field = strings.TrimPrefix(field, "$.") - if field == "gid" { - field = "_id" - } + field := ToPipelinePath(agg.Field) stmt := []bson.M{ { "$match": bson.M{ @@ -814,8 +884,7 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile case *gripql.Aggregate_Histogram: agg := a.GetHistogram() - field := jsonpath.GetJSONPath(agg.Field) - field = strings.TrimPrefix(field, "$.") + field := ToPipelinePath(agg.Field) stmt := []bson.M{ { "$match": bson.M{ @@ -824,14 +893,14 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile }, { "$group": bson.M{ - "_id": bson.M{ - "$multiply": []interface{}{agg.Interval, bson.M{"$floor": bson.M{"$divide": []interface{}{"$" + field, agg.Interval}}}}, + FIELD_ID: bson.M{ + "$multiply": []any{agg.Interval, bson.M{"$floor": bson.M{"$divide": []any{"$" + field, agg.Interval}}}}, }, "count": bson.M{"$sum": 1}, }, }, { - "$sort": bson.M{"_id": 1}, + "$sort": bson.M{FIELD_ID: 1}, }, } aggTypes[a.Name] = a @@ -839,8 +908,7 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile case *gripql.Aggregate_Percentile: agg := a.GetPercentile() - field := jsonpath.GetJSONPath(agg.Field) - field = strings.TrimPrefix(field, "$.") + field := ToPipelinePath(agg.Field) stmt := []bson.M{ { "$match": bson.M{ @@ -852,29 +920,28 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile }, { "$group": bson.M{ - "_id": "null", + FIELD_ID: "null", "values": bson.M{"$push": "$" + field}, }, }, } - percentiles := []interface{}{} + percentiles := []any{} for _, p := range agg.Percents { pName := strings.Replace(fmt.Sprintf("%v", p), ".", "_", -1) percentile := bson.M{} - percentile["_id"] = pName + percentile[FIELD_ID] = pName percentile["count"] = percentileCalc(p) percentiles = append(percentiles, percentile) } stmt = append(stmt, bson.M{"$project": bson.M{"results": percentiles}}) stmt = append(stmt, bson.M{"$unwind": "$results"}) - stmt = append(stmt, bson.M{"$project": bson.M{"_id": "$results._id", "count": "$results.count"}}) + stmt = append(stmt, bson.M{"$project": bson.M{FIELD_ID: "$results._id", "count": "$results.count"}}) aggTypes[a.Name] = a aggs[a.Name] = stmt case *gripql.Aggregate_Type: agg := a.GetType() - field := jsonpath.GetJSONPath(agg.Field) - field = strings.TrimPrefix(field, "$.") + field := ToPipelinePath(agg.Field) stmt := []bson.M{ { "$match": bson.M{ @@ -899,8 +966,7 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile case *gripql.Aggregate_Field: agg := a.GetField() - field := jsonpath.GetJSONPath(agg.Field) - field = strings.TrimPrefix(field, "$.") + field := ToPipelinePath(agg.Field) stmt := []bson.M{ { "$match": bson.M{ @@ -937,6 +1003,18 @@ func (comp *Compiler) Compile(stmts []*gripql.GraphStatement, opts *gdbi.Compile } } + bsonDoc, err := bson.Marshal(bson.D{{Key: "doc", Value: query}}) + if err != nil { + fmt.Printf("Error: %s\n", err) + } + var prettyDoc bson.M + err = bson.Unmarshal(bsonDoc, &prettyDoc) + if err != nil { + fmt.Printf("Error: %s\n", err) + } + queryStr, err := json.MarshalIndent(prettyDoc, "", " ") + log.Infof("Mongo query pipeline: %s", queryStr) + // query must be less than 16MB limit bsonSize, err := bson.Marshal(bson.M{"pipeline": query}) if err != nil { diff --git a/mongo/compile_test.go b/mongo/compile_test.go index 7dd6523f5..cba8a041c 100644 --- a/mongo/compile_test.go +++ b/mongo/compile_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/util" "go.mongodb.org/mongo-driver/bson" ) @@ -31,20 +31,20 @@ func TestQuerySizeLimit(t *testing.T) { func TestDistinctPathing(t *testing.T) { - fields := []string{"$case._gid", "$compound._gid"} + fields := []string{"$case._id", "$compound._id"} match := bson.M{} keys := bson.M{} for _, f := range fields { - namespace := jsonpath.GetNamespace(f) + namespace := tpath.GetNamespace(f) fmt.Printf("Namespace: %s\n", namespace) - f = jsonpath.GetJSONPath(f) + f = tpath.NormalizePath(f) f = strings.TrimPrefix(f, "$.") - if f == "gid" { - f = "_id" + if f == "id" { + f = FIELD_ID } - if namespace != jsonpath.Current { + if namespace != tpath.CURRENT { f = fmt.Sprintf("marks.%s.%s", namespace, f) } match[f] = bson.M{"$exists": true} diff --git a/mongo/convert.go b/mongo/convert.go index 8abf0926e..ec75339af 100644 --- a/mongo/convert.go +++ b/mongo/convert.go @@ -1,85 +1,83 @@ package mongo import ( + "maps" + "github.com/bmeg/grip/gdbi" "go.mongodb.org/mongo-driver/bson/primitive" - "google.golang.org/protobuf/types/known/structpb" ) // PackVertex take a GRIP vertex and convert it to a mongo doc -func PackVertex(v *gdbi.Vertex) map[string]interface{} { - p := map[string]interface{}{} +func PackVertex(v *gdbi.Vertex) map[string]any { + p := map[string]any{} if v.Data != nil { p = v.Data } - return map[string]interface{}{ - "_id": v.ID, - "label": v.Label, - "data": p, - } + out := map[string]any{} + maps.Copy(out, p) + + out[FIELD_ID] = v.ID + out[FIELD_LABEL] = v.Label + return out } // PackEdge takes a GRIP edge and converts it to a mongo doc -func PackEdge(e *gdbi.Edge) map[string]interface{} { - p := map[string]interface{}{} +func PackEdge(e *gdbi.Edge) map[string]any { + p := map[string]any{} if e.Data != nil { p = e.Data } - return map[string]interface{}{ - "_id": e.ID, - "from": e.From, - "to": e.To, - "label": e.Label, - "data": p, - } -} + out := map[string]any{} + maps.Copy(out, p) -type pair struct { - key string - valueMap interface{} - valueStruct *structpb.Struct + out[FIELD_ID] = e.ID + out[FIELD_FROM] = e.From + out[FIELD_TO] = e.To + out[FIELD_LABEL] = e.Label + return out } // UnpackVertex takes a mongo doc and converts it into an gripql.Vertex -func UnpackVertex(i map[string]interface{}) *gdbi.Vertex { +func UnpackVertex(i map[string]any) *gdbi.Vertex { o := &gdbi.Vertex{} - o.ID = i["_id"].(string) - o.Label = i["label"].(string) - if d, ok := i["data"]; ok { - d = removePrimatives(d) - o.Data = d.(map[string]interface{}) - o.Loaded = true - } else { - o.Loaded = false - o.Data = map[string]interface{}{} + o.ID = i[FIELD_ID].(string) + o.Label = i[FIELD_LABEL].(string) + d := removePrimatives(i).(map[string]any) + o.Data = map[string]any{} + for k, v := range d { + if k != FIELD_ID && k != FIELD_LABEL { + o.Data[k] = v + } } + o.Loaded = true return o } // UnpackEdge takes a mongo doc and convertes it into an gripql.Edge -func UnpackEdge(i map[string]interface{}) *gdbi.Edge { +func UnpackEdge(i map[string]any) *gdbi.Edge { o := &gdbi.Edge{} - id := i["_id"] + id := i[FIELD_ID] o.ID = id.(string) - o.Label = i["label"].(string) - o.From = i["from"].(string) - o.To = i["to"].(string) - if d, ok := i["data"]; ok { - o.Data = d.(map[string]interface{}) - o.Loaded = true - } else { - o.Loaded = false - o.Data = map[string]interface{}{} + o.Label = i[FIELD_LABEL].(string) + o.From = i[FIELD_FROM].(string) + o.To = i[FIELD_TO].(string) + o.Data = map[string]any{} + d := removePrimatives(i).(map[string]any) + for k, v := range d { + if k != FIELD_ID && k != FIELD_LABEL && k != FIELD_TO && k != FIELD_FROM { + o.Data[k] = v + } } + o.Loaded = true return o } // this is needed because protobuf doesn't recognize primitive.A // may want to find another solution, rather then copying the // entire data structure -func removePrimatives(i interface{}) interface{} { +func removePrimatives(i any) any { if x, ok := i.(primitive.A); ok { - out := make([]interface{}, len(x)) + out := make([]any, len(x)) for i := range x { out[i] = removePrimatives(x[i]) } @@ -88,8 +86,8 @@ func removePrimatives(i interface{}) interface{} { if x, ok := i.(primitive.ObjectID); ok { return x.String() } - if x, ok := i.(map[string]interface{}); ok { - out := make(map[string]interface{}) + if x, ok := i.(map[string]any); ok { + out := make(map[string]any) for i := range x { out[i] = removePrimatives(x[i]) } diff --git a/mongo/field_test.go b/mongo/field_test.go new file mode 100644 index 000000000..ac6f62df3 --- /dev/null +++ b/mongo/field_test.go @@ -0,0 +1,18 @@ +package mongo + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestFields(t *testing.T) { + + assert.Equal(t, ToPipelinePath("name"), "data.name") + assert.Equal(t, ToPipelinePath("_gid"), "data._id") + assert.Equal(t, ToPipelinePath("$a.name"), "marks.a.name") + + assert.Equal(t, ToPipelinePath("$.name"), "data.name") + assert.Equal(t, ToPipelinePath("$"), "data") + +} diff --git a/mongo/fields.go b/mongo/fields.go new file mode 100644 index 000000000..f3fc3bda5 --- /dev/null +++ b/mongo/fields.go @@ -0,0 +1,66 @@ +package mongo + +import ( + "strings" + + "github.com/bmeg/grip/gdbi/tpath" +) + +const FIELD_ID = "_id" +const FIELD_LABEL = "_label" +const FIELD_TO = "_to" +const FIELD_FROM = "_from" + +const FIELD_MARKS = "marks" + +const FIELD_CURRENT = "data" +const FIELD_CURRENT_ID = "data._id" +const FIELD_CURRENT_TO = "data._to" +const FIELD_CURRENT_FROM = "data._from" +const FIELD_CURRENT_LABEL = "data._label" + +const FIELD_DST = "dst" +const FIELD_DST_ID = "dst._id" +const FIELD_DST_TO = "dst._to" +const FIELD_DST_LABEL = "dst._label" + +const FIELD_SRC = "src" +const FIELD_SRC_ID = "src._id" +const FIELD_SRC_TO = "src._to" +const FIELD_SRC_LABEL = "src._label" + +func IsNodeField(f string) bool { + return f == FIELD_ID || f == FIELD_LABEL || f == FIELD_TO || f == FIELD_FROM +} + +func RemoveKeyFields(x map[string]any) map[string]any { + out := map[string]any{} + for k, v := range x { + if !IsNodeField(k) { + out[k] = v + } + } + return out +} + +func ToPipelinePath(p string) string { + n := tpath.NormalizePath(p) + ns := tpath.GetNamespace(n) + path := tpath.ToLocalPath(n) + path = strings.TrimPrefix(path, "$.") + + if path == "_gid" { + path = FIELD_ID + } + + if ns == tpath.CURRENT { + if path == "$" { + return FIELD_CURRENT + } + return FIELD_CURRENT + "." + path + } + if path == "$" { + return FIELD_MARKS + "." + ns + } + return FIELD_MARKS + "." + ns + "." + path +} diff --git a/mongo/graph.go b/mongo/graph.go index 4554ae5b1..870cc7a24 100644 --- a/mongo/graph.go +++ b/mongo/graph.go @@ -4,9 +4,6 @@ import ( "context" "fmt" - //"io" - //"strings" - "time" "github.com/bmeg/grip/engine/core" @@ -45,13 +42,13 @@ func (mg *Graph) GetTimestamp() string { func (mg *Graph) GetVertex(id string, load bool) *gdbi.Vertex { opts := options.FindOne() if !load { - opts.SetProjection(map[string]interface{}{"_id": 1, "label": 1}) + opts.SetProjection(map[string]any{FIELD_ID: 1, FIELD_LABEL: 1}) } - result := mg.ar.VertexCollection(mg.graph).FindOne(context.Background(), bson.M{"_id": id}, opts) + result := mg.ar.VertexCollection(mg.graph).FindOne(context.Background(), bson.M{FIELD_ID: id}, opts) if result.Err() != nil { return nil } - d := map[string]interface{}{} + d := map[string]any{} if nil == result.Decode(d) { v := UnpackVertex(d) return v @@ -63,13 +60,13 @@ func (mg *Graph) GetVertex(id string, load bool) *gdbi.Vertex { func (mg *Graph) GetEdge(id string, load bool) *gdbi.Edge { opts := options.FindOne() if !load { - opts.SetProjection(map[string]interface{}{"_id": 1, "label": 1, "from": 1, "to": 1}) + opts.SetProjection(map[string]any{FIELD_ID: 1, FIELD_LABEL: 1, FIELD_FROM: 1, FIELD_TO: 1}) } - result := mg.ar.EdgeCollection(mg.graph).FindOne(context.TODO(), bson.M{"_id": id}, opts) + result := mg.ar.EdgeCollection(mg.graph).FindOne(context.TODO(), bson.M{FIELD_ID: id}, opts) if result.Err() != nil { return nil } - d := map[string]interface{}{} + d := map[string]any{} if nil == result.Decode(d) { v := UnpackEdge(d) return v @@ -84,7 +81,7 @@ func (mg *Graph) AddVertex(vertices []*gdbi.Vertex) error { var err error docBatch := make([]mongo.WriteModel, 0, len(vertices)) for _, v := range vertices { - i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{"_id": v.ID}) + i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{FIELD_ID: v.ID}) ent := PackVertex(v) i.SetReplacement(ent) docBatch = append(docBatch, i) @@ -105,7 +102,7 @@ func (mg *Graph) AddEdge(edges []*gdbi.Edge) error { var err error docBatch := make([]mongo.WriteModel, 0, len(edges)) for _, edge := range edges { - i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{"_id": edge.ID}) + i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{FIELD_ID: edge.ID}) ent := PackEdge(edge) i.SetReplacement(ent) docBatch = append(docBatch, i) @@ -116,14 +113,103 @@ func (mg *Graph) AddEdge(edges []*gdbi.Edge) error { return err } +func (mg *Graph) StreamEdges(edgeChan <-chan *gdbi.Edge, batchsize int) error { + eCol := mg.ar.EdgeCollection(mg.graph) + var err error + docBatch := make([]mongo.WriteModel, 0, batchsize) + + for edge := range edgeChan { + i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{FIELD_ID: edge.ID}) + ent := PackEdge(edge) + i.SetReplacement(ent) + docBatch = append(docBatch, i) + + if len(docBatch) >= batchsize { + _, err = eCol.BulkWrite(context.Background(), docBatch) + if err != nil { + log.Errorf("StreamEdges error: (%s) %s", docBatch, err) + } + docBatch = make([]mongo.WriteModel, 0, batchsize) + } + } + if len(docBatch) > 0 { + _, err = eCol.BulkWrite(context.Background(), docBatch) + if err != nil { + log.Errorf("StreamEdges error: (%s) %s", docBatch, err) + } + } + return err +} + +func (mg *Graph) StreamVertices(vertChan <-chan *gdbi.Vertex, batchsize int) error { + vCol := mg.ar.VertexCollection(mg.graph) + var err error + docBatch := make([]mongo.WriteModel, 0, batchsize) + for v := range vertChan { + i := mongo.NewReplaceOneModel().SetUpsert(true).SetFilter(bson.M{FIELD_ID: v.ID}) + ent := PackVertex(v) + i.SetReplacement(ent) + docBatch = append(docBatch, i) + + if len(docBatch) >= batchsize { + _, err = vCol.BulkWrite(context.Background(), docBatch) + if err != nil { + log.Errorf("StreamVertices error: (%s) %s", docBatch, err) + } + docBatch = make([]mongo.WriteModel, 0, batchsize) + } + } + if len(docBatch) > 0 { + _, err = vCol.BulkWrite(context.Background(), docBatch) + if err != nil { + log.Errorf("StreamVertices error: (%s) %s", docBatch, err) + } + } + return err +} + func (mg *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { - return util.StreamBatch(stream, 50, mg.graph, mg.AddVertex, mg.AddEdge) + return util.StreamBatch(stream, 100, mg.graph, mg.StreamVertices, mg.StreamEdges) +} + +func (mg *Graph) BulkDel(Data *gdbi.DeleteData) error { + var err error + eCol := mg.ar.EdgeCollection(mg.graph) + vCol := mg.ar.VertexCollection(mg.graph) + + if Data.Edges != nil && len(Data.Edges) > 0 { + _, err := eCol.DeleteMany(context.TODO(), bson.M{FIELD_ID: bson.M{"$in": Data.Edges}}) + if err != nil { + return fmt.Errorf("failed to delete edge(s): %s", err) + } + mg.ts.Touch(mg.graph) + } + + if Data.Vertices != nil && len(Data.Vertices) > 0 { + _, err = vCol.DeleteMany(context.TODO(), bson.M{"_id": bson.M{"$in": Data.Vertices}}) + if err != nil { + return fmt.Errorf("failed to delete list of vertices: %s", err) + } + mg.ts.Touch(mg.graph) + + _, err = eCol.DeleteMany(context.TODO(), bson.M{ + "$or": []bson.M{ + {FIELD_FROM: bson.M{"$in": Data.Vertices}}, + {FIELD_TO: bson.M{"$in": Data.Vertices}}, + }}) + if err != nil { + return fmt.Errorf("failed to delete connected edge(s): %s", err) + } + mg.ts.Touch(mg.graph) + } + + return nil } // deleteConnectedEdges deletes edges where `from` or `to` equal `key` func (mg *Graph) deleteConnectedEdges(key string) error { eCol := mg.ar.EdgeCollection(mg.graph) - _, err := eCol.DeleteMany(context.TODO(), bson.M{"$or": []bson.M{{"from": key}, {"to": key}}}) + _, err := eCol.DeleteMany(context.TODO(), bson.M{"$or": []bson.M{{FIELD_FROM: key}, {FIELD_TO: key}}}) if err != nil { return fmt.Errorf("failed to delete edge(s): %s", err) } @@ -134,7 +220,7 @@ func (mg *Graph) deleteConnectedEdges(key string) error { // DelVertex deletes vertex with id `key` func (mg *Graph) DelVertex(key string) error { vCol := mg.ar.VertexCollection(mg.graph) - _, err := vCol.DeleteOne(context.TODO(), bson.M{"_id": key}) + _, err := vCol.DeleteOne(context.TODO(), bson.M{FIELD_ID: key}) if err != nil { return fmt.Errorf("failed to delete vertex %s: %s", key, err) } @@ -146,10 +232,10 @@ func (mg *Graph) DelVertex(key string) error { return nil } -// DelEdge deletes edge with id `key` +// DelEdge deletes edge with _id `key` func (mg *Graph) DelEdge(key string) error { eCol := mg.ar.EdgeCollection(mg.graph) - _, err := eCol.DeleteOne(context.TODO(), bson.M{"_id": key}) + _, err := eCol.DeleteOne(context.TODO(), bson.M{FIELD_ID: key}) if err != nil { return fmt.Errorf("failed to delete edge %s: %s", key, err) } @@ -166,20 +252,20 @@ func (mg *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Vert vCol := mg.ar.VertexCollection(mg.graph) opts := options.Find() if !load { - opts.SetProjection(bson.M{"_id": 1, "label": 1}) + opts.SetProjection(bson.M{FIELD_ID: 1, FIELD_LABEL: 1}) } query, err := vCol.Find(ctx, bson.M{}, opts) if err != nil { return } defer query.Close(ctx) - result := map[string]interface{}{} for query.Next(ctx) { select { case <-ctx.Done(): return default: } + result := map[string]any{} if err := query.Decode(&result); err == nil { v := UnpackVertex(result) o <- v @@ -201,22 +287,22 @@ func (mg *Graph) GetEdgeList(ctx context.Context, loadProp bool) <-chan *gdbi.Ed eCol := mg.ar.EdgeCollection(mg.graph) opts := options.Find() if !loadProp { - opts.SetProjection(bson.M{"_id": 1, "to": 1, "from": 1, "label": 1}) + opts.SetProjection(bson.M{FIELD_ID: 1, FIELD_TO: 1, FIELD_FROM: 1, FIELD_LABEL: 1}) } query, err := eCol.Find(ctx, bson.M{}, opts) if err != nil { return } defer query.Close(ctx) - result := map[string]interface{}{} for query.Next(ctx) { select { case <-ctx.Done(): return default: } + result := map[string]any{} if err := query.Decode(&result); err == nil { - if _, ok := result["to"]; ok { + if _, ok := result[FIELD_TO]; ok { e := UnpackEdge(result) o <- e } @@ -248,18 +334,19 @@ func (mg *Graph) GetVertexChannel(ctx context.Context, ids chan gdbi.ElementLook idBatch = append(idBatch, batch[i].ID) } } - query := bson.M{"_id": bson.M{"$in": idBatch}} + query := bson.M{FIELD_ID: bson.M{"$in": idBatch}} opts := options.Find() - if !load { - opts.SetProjection(bson.M{"_id": 1, "label": 1}) - } + // Todo: Need to optimize to pass load arg as true when doing pivot operation + /*if !load { + opts.SetProjection(bson.M{FIELD_ID: 1, FIELD_LABEL: 1}) + }*/ cursor, err := vCol.Find(context.TODO(), query, opts) if err != nil { return } chunk := map[string]*gdbi.Vertex{} - result := map[string]interface{}{} for cursor.Next(context.TODO()) { + result := map[string]any{} if err := cursor.Decode(&result); err == nil { v := UnpackVertex(result) chunk[v.ID] = v @@ -305,28 +392,28 @@ func (mg *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLoo batchMapReturnCount[batch[i].ID] = 0 } } - query := []bson.M{{"$match": bson.M{"from": bson.M{"$in": idBatch}}}} + query := []bson.M{{"$match": bson.M{FIELD_FROM: bson.M{"$in": idBatch}}}} if len(edgeLabels) > 0 { - query = append(query, bson.M{"$match": bson.M{"label": bson.M{"$in": edgeLabels}}}) + query = append(query, bson.M{"$match": bson.M{FIELD_LABEL: bson.M{"$in": edgeLabels}}}) } vertCol := fmt.Sprintf("%s_vertices", mg.graph) - query = append(query, bson.M{"$lookup": bson.M{"from": vertCol, "localField": "to", "foreignField": "_id", "as": "dst"}}) + query = append(query, bson.M{"$lookup": bson.M{"from": vertCol, "localField": FIELD_TO, "foreignField": FIELD_ID, "as": "dst"}}) query = append(query, bson.M{"$unwind": "$dst"}) - if load { - query = append(query, bson.M{"$project": bson.M{"from": true, "dst._id": true, "dst.label": true, "dst.data": true}}) - } else { - query = append(query, bson.M{"$project": bson.M{"from": true, "dst._id": true, "dst.label": true}}) - } + //if load { + query = append(query, bson.M{"$project": bson.M{FIELD_FROM: true, "dst": true}}) + /* } else { + query = append(query, bson.M{"$project": bson.M{FIELD_FROM: true, "dst._id": true, "dst._label": true}}) + }*/ eCol := mg.ar.EdgeCollection(mg.graph) cursor, err := eCol.Aggregate(context.TODO(), query) if err == nil { - result := map[string]interface{}{} for cursor.Next(context.TODO()) { + result := map[string]any{} if err := cursor.Decode(&result); err == nil { - if dst, ok := result["dst"].(map[string]interface{}); ok { + if dst, ok := result["dst"].(map[string]any); ok { v := UnpackVertex(dst) - fromID := result["from"].(string) + fromID := result[FIELD_FROM].(string) r := batchMap[fromID] batchMapReturnCount[fromID]++ for _, ri := range r { @@ -334,7 +421,7 @@ func (mg *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLoo o <- ri } } else { - log.WithFields(log.Fields{"result": result["dst"]}).Error("GetOutChannel: unable to cast result to map[string]interface{}") + log.WithFields(log.Fields{"result": result["dst"]}).Error("GetOutChannel: unable to cast result to map[string]any") } } else { log.WithFields(log.Fields{"result": result, "error": err}).Error("GetOutChannel: decode error") @@ -384,28 +471,28 @@ func (mg *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLook batchMapReturnCount[batch[i].ID] = 0 } } - query := []bson.M{{"$match": bson.M{"to": bson.M{"$in": idBatch}}}} + query := []bson.M{{"$match": bson.M{FIELD_TO: bson.M{"$in": idBatch}}}} if len(edgeLabels) > 0 { - query = append(query, bson.M{"$match": bson.M{"label": bson.M{"$in": edgeLabels}}}) + query = append(query, bson.M{"$match": bson.M{FIELD_LABEL: bson.M{"$in": edgeLabels}}}) } vertCol := fmt.Sprintf("%s_vertices", mg.graph) - query = append(query, bson.M{"$lookup": bson.M{"from": vertCol, "localField": "from", "foreignField": "_id", "as": "src"}}) + query = append(query, bson.M{"$lookup": bson.M{"from": vertCol, "localField": FIELD_FROM, "foreignField": FIELD_ID, "as": FIELD_SRC}}) query = append(query, bson.M{"$unwind": "$src"}) if load { - query = append(query, bson.M{"$project": bson.M{"to": true, "src._id": true, "src.label": true, "src.data": true}}) + query = append(query, bson.M{"$project": bson.M{FIELD_TO: true, FIELD_SRC: true}}) } else { - query = append(query, bson.M{"$project": bson.M{"to": true, "src._id": true, "src.label": true}}) + query = append(query, bson.M{"$project": bson.M{FIELD_TO: true, FIELD_SRC_ID: true, FIELD_SRC_LABEL: true}}) } eCol := mg.ar.EdgeCollection(mg.graph) cursor, err := eCol.Aggregate(context.TODO(), query) if err == nil { - result := map[string]interface{}{} for cursor.Next(context.TODO()) { + result := map[string]any{} if err := cursor.Decode(&result); err == nil { - if src, ok := result["src"].(map[string]interface{}); ok { + if src, ok := result[FIELD_SRC].(map[string]any); ok { v := UnpackVertex(src) - toID := result["to"].(string) + toID := result[FIELD_TO].(string) r := batchMap[toID] batchMapReturnCount[toID]++ for _, ri := range r { @@ -413,7 +500,7 @@ func (mg *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLook o <- ri } } else { - log.WithFields(log.Fields{"result": result["src"]}).Error("GetInChannel: unable to cast result to map[string]interface{}") + log.WithFields(log.Fields{"result": result[FIELD_SRC]}).Error("GetInChannel: unable to cast result to map[string]any") } } else { log.WithFields(log.Fields{"error": err}).Error("Decode") @@ -463,18 +550,18 @@ func (mg *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.Elemen batchMapReturnCount[batch[i].ID] = 0 } } - query := []bson.M{{"$match": bson.M{"from": bson.M{"$in": idBatch}}}} + query := []bson.M{{"$match": bson.M{FIELD_FROM: bson.M{"$in": idBatch}}}} if len(edgeLabels) > 0 { - query = append(query, bson.M{"$match": bson.M{"label": bson.M{"$in": edgeLabels}}}) + query = append(query, bson.M{"$match": bson.M{FIELD_LABEL: bson.M{"$in": edgeLabels}}}) } eCol := mg.ar.EdgeCollection(mg.graph) cursor, err := eCol.Aggregate(context.TODO(), query) if err == nil { - result := map[string]interface{}{} for cursor.Next(context.TODO()) { + result := map[string]any{} if err := cursor.Decode(&result); err == nil { e := UnpackEdge(result) - fromID := result["from"].(string) + fromID := result[FIELD_FROM].(string) r := batchMap[fromID] batchMapReturnCount[fromID]++ for _, ri := range r { @@ -530,18 +617,18 @@ func (mg *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.Element batchMapReturnCount[batch[i].ID] = 0 } } - query := []bson.M{{"$match": bson.M{"to": bson.M{"$in": idBatch}}}} + query := []bson.M{{"$match": bson.M{FIELD_TO: bson.M{"$in": idBatch}}}} if len(edgeLabels) > 0 { - query = append(query, bson.M{"$match": bson.M{"label": bson.M{"$in": edgeLabels}}}) + query = append(query, bson.M{"$match": bson.M{FIELD_LABEL: bson.M{"$in": edgeLabels}}}) } eCol := mg.ar.EdgeCollection(mg.graph) cursor, err := eCol.Aggregate(context.TODO(), query) if err == nil { - result := map[string]interface{}{} for cursor.Next(context.TODO()) { + result := map[string]any{} if err := cursor.Decode(&result); err == nil { e := UnpackEdge(result) - toID := result["to"].(string) + toID := result[FIELD_TO].(string) r := batchMap[toID] batchMapReturnCount[toID]++ for _, ri := range r { @@ -579,7 +666,7 @@ func (mg *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.Element // ListVertexLabels returns a list of vertex types in the graph func (mg *Graph) ListVertexLabels() ([]string, error) { v := mg.ar.VertexCollection(mg.graph) - out, err := v.Distinct(context.TODO(), "label", bson.M{}) + out, err := v.Distinct(context.TODO(), FIELD_LABEL, bson.M{}) if err != nil { return nil, err } @@ -593,7 +680,7 @@ func (mg *Graph) ListVertexLabels() ([]string, error) { // ListEdgeLabels returns a list of edge types in the graph func (mg *Graph) ListEdgeLabels() ([]string, error) { e := mg.ar.EdgeCollection(mg.graph) - out, err := e.Distinct(context.TODO(), "label", bson.M{}) + out, err := e.Distinct(context.TODO(), FIELD_LABEL, bson.M{}) if err != nil { return nil, err } diff --git a/mongo/graphdb.go b/mongo/graphdb.go index da6e9ec20..bb4cb65e9 100644 --- a/mongo/graphdb.go +++ b/mongo/graphdb.go @@ -156,10 +156,10 @@ func (ma *GraphDB) ListGraphs() []string { log.WithFields(log.Fields{"error": err}).Error("ListGraphs: MongoDB: list error") return nil } - result := map[string]interface{}{} + result := map[string]any{} for cursor.Next(context.TODO()) { if nil == cursor.Decode(&result) { - out = append(out, result["_id"].(string)) + out = append(out, result[FIELD_ID].(string)) } } if err := cursor.Close(context.TODO()); err != nil { diff --git a/mongo/has_evaluator.go b/mongo/has_evaluator.go index c6bcab285..cf798585a 100644 --- a/mongo/has_evaluator.go +++ b/mongo/has_evaluator.go @@ -1,10 +1,10 @@ package mongo import ( + "fmt" "strings" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" "go.mongodb.org/mongo-driver/bson" ) @@ -17,29 +17,33 @@ func convertHasExpression(stmt *gripql.HasExpression, not bool) bson.M { switch cond.Condition { case gripql.Condition_INSIDE: val := cond.Value.AsInterface() - lims, ok := val.([]interface{}) - if !ok { + lims, ok := val.([]any) + if !ok || len(lims) < 2 { log.Error("unable to cast values from INSIDE statement") } else { - output = convertHasExpression(gripql.And(gripql.Gt(cond.Key, lims[0]), gripql.Lt(cond.Key, lims[1])), not) + key := cond.Key + output = convertHasExpression(gripql.And(gripql.Gt(key, lims[0]), gripql.Lt(key, lims[1])), not) + //fmt.Printf("inside: %#v\n", output) } case gripql.Condition_OUTSIDE: val := cond.Value.AsInterface() - lims, ok := val.([]interface{}) - if !ok { + lims, ok := val.([]any) + if !ok || len(lims) < 2 { log.Error("unable to cast values from OUTSIDE statement") } else { - output = convertHasExpression(gripql.Or(gripql.Lt(cond.Key, lims[0]), gripql.Gt(cond.Key, lims[1])), not) + key := cond.Key + output = convertHasExpression(gripql.Or(gripql.Lt(key, lims[0]), gripql.Gt(key, lims[1])), not) } case gripql.Condition_BETWEEN: val := cond.Value.AsInterface() - lims, ok := val.([]interface{}) - if !ok { + lims, ok := val.([]any) + if !ok || len(lims) < 2 { log.Error("unable to cast values from BETWEEN statement") } else { - output = convertHasExpression(gripql.And(gripql.Gte(cond.Key, lims[0]), gripql.Lt(cond.Key, lims[1])), not) + key := cond.Key + output = convertHasExpression(gripql.And(gripql.Gte(key, lims[0]), gripql.Lt(key, lims[1])), not) } default: @@ -71,6 +75,7 @@ func convertHasExpression(stmt *gripql.HasExpression, not bool) bson.M { case *gripql.HasExpression_Not: notRes := convertHasExpression(stmt.GetNot(), true) output = notRes + fmt.Printf("not: %#v\n", output) default: log.Error("unknown where expression type") @@ -79,45 +84,88 @@ func convertHasExpression(stmt *gripql.HasExpression, not bool) bson.M { return output } -func convertPath(key string) string { - key = jsonpath.GetJSONPath(key) - key = strings.TrimPrefix(key, "$.") - if key == "gid" { - key = "_id" - } - return key -} - func convertCondition(cond *gripql.HasCondition, not bool) bson.M { var key string - var val interface{} - key = convertPath(cond.Key) + var val any + key = ToPipelinePath(cond.Key) val = cond.Value.AsInterface() - expr := bson.M{} + + isExpr := false + + if valStr, ok := val.(string); ok { + if strings.HasPrefix(valStr, "$") { + //user has a field reference to compare to, rather then a value + //we'll need to use the '$expr' and refer to the fields using the '$' prefix + val = "$" + ToPipelinePath(valStr) + key = "$" + key + isExpr = true + } + log.Infof("mongo val str: %s(%s) -- %s(%s)", cond.Key, key, valStr, val) + } + bCond := bson.M{} switch cond.Condition { case gripql.Condition_EQ: - expr = bson.M{"$eq": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$eq": []any{key, val}}} + } else { + bCond = bson.M{"$eq": val} + } case gripql.Condition_NEQ: - expr = bson.M{"$ne": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$ne": []any{key, val}}} + } else { + bCond = bson.M{"$ne": val} + } case gripql.Condition_GT: - expr = bson.M{"$gt": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$gt": []any{key, val}}} + } else { + bCond = bson.M{"$gt": val} + } case gripql.Condition_GTE: - expr = bson.M{"$gte": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$gte": []any{key, val}}} + } else { + bCond = bson.M{"$gte": val} + } case gripql.Condition_LT: - expr = bson.M{"$lt": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$lt": []any{key, val}}} + } else { + bCond = bson.M{"$lt": val} + } case gripql.Condition_LTE: - expr = bson.M{"$lte": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$lte": []any{key, val}}} + } else { + bCond = bson.M{"$lte": val} + } case gripql.Condition_WITHIN: - expr = bson.M{"$in": val} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$in": []any{key, val}}} + } else { + bCond = bson.M{"$in": val} + } case gripql.Condition_WITHOUT: - expr = bson.M{"$not": bson.M{"$in": val}} + if isExpr { + bCond = bson.M{"$not": bson.M{"$expr": bson.M{"$in": []any{key, val}}}} + } else { + bCond = bson.M{"$not": bson.M{"$in": val}} + } case gripql.Condition_CONTAINS: - expr = bson.M{"$in": []interface{}{val}} + if isExpr { + bCond = bson.M{"$expr": bson.M{"$in": []any{key, val}}} + } else { + bCond = bson.M{"$in": []any{val}} + } default: log.Error("unknown where condition type") } if not { - return bson.M{key: bson.M{"$not": expr}} + return bson.M{key: bson.M{"$not": bCond}} + } + if isExpr { + return bCond } - return bson.M{key: expr} + return bson.M{key: bCond} } diff --git a/mongo/index.go b/mongo/index.go index 53941b53e..ca92991b6 100644 --- a/mongo/index.go +++ b/mongo/index.go @@ -5,52 +5,74 @@ import ( "fmt" "strings" + "github.com/bmeg/grip/gdbi/tpath" "github.com/bmeg/grip/gripql" - "github.com/bmeg/grip/jsonpath" "github.com/bmeg/grip/log" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) -// AddVertexIndex add index to vertices +// AddVertexIndex adds an index to vertices for a specific label and field func (mg *Graph) AddVertexIndex(label string, field string) error { log.WithFields(log.Fields{"label": label, "field": field}).Info("Adding vertex index") - field = jsonpath.GetJSONPath(field) + field = tpath.NormalizePath(field) + field = tpath.ToLocalPath(field) field = strings.TrimPrefix(field, "$.") idx := mg.ar.VertexCollection(mg.graph).Indexes() + indexName := fmt.Sprintf("label_%s_%s_idx", label, field) + // Create a compound index on _label and the specified field, filtered by the specific label _, err := idx.CreateOne( context.Background(), mongo.IndexModel{ - Keys: bson.D{{"label", 1}, {field, 1}}, - Options: options.Index().SetUnique(false).SetSparse(true).SetBackground(true), + Keys: bson.D{ + {Key: FIELD_LABEL, Value: 1}, + {Key: field, Value: 1}, + }, + Options: options.Index(). + SetName(indexName). + SetUnique(false). + SetBackground(true). + SetPartialFilterExpression(bson.M{FIELD_LABEL: label}), }) if err != nil { - return fmt.Errorf("failed create index %s %s %s", label, field, err) + return fmt.Errorf("failed to create index for label %s on field %s: %s", label, field, err) } return nil } -// DeleteVertexIndex delete index from vertices +// DeleteVertexIndex deletes an index from vertices for a specific label and field func (mg *Graph) DeleteVertexIndex(label string, field string) error { log.WithFields(log.Fields{"label": label, "field": field}).Info("Deleting vertex index") - field = jsonpath.GetJSONPath(field) + field = tpath.NormalizePath(field) + field = tpath.ToLocalPath(field) field = strings.TrimPrefix(field, "$.") idx := mg.ar.VertexCollection(mg.graph).Indexes() cursor, err := idx.List(context.TODO()) + if err != nil { + return fmt.Errorf("failed to list indices: %s", err) + } + var results []bson.M if err = cursor.All(context.TODO(), &results); err != nil { - return err + return fmt.Errorf("failed to retrieve index list: %s", err) } + for _, rec := range results { - recKeys := rec["key"].(bson.M) - if _, ok := recKeys["label"]; ok { - if _, ok := recKeys[field]; ok { - if _, err := idx.DropOne(context.TODO(), rec["name"].(string)); err != nil { - return err + if recKeys, ok := rec["key"].(bson.M); ok { + if _, hasLabel := recKeys[FIELD_LABEL]; hasLabel { + if _, hasField := recKeys[field]; hasField { + if partialFilter, ok := rec["partialFilterExpression"].(bson.M); ok { + if partialLabel, ok := partialFilter[FIELD_LABEL].(string); ok && partialLabel == label { + if _, err := idx.DropOne(context.TODO(), rec["name"].(string)); err != nil { + return fmt.Errorf("failed to delete index for label %s on field %s: %s", label, field, err) + } + return nil + } + } } } } @@ -65,34 +87,30 @@ func (mg *Graph) GetVertexIndexList() <-chan *gripql.IndexID { go func() { defer close(out) - c := mg.ar.VertexCollection(mg.graph) - - labels, err := mg.ListVertexLabels() + idx := mg.ar.VertexCollection(mg.graph).Indexes() + cursor, err := idx.List(context.TODO()) if err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: finding distinct labels") + log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: failed to list indices") + return } - // list indexed fields - idx := c.Indexes() - cursor, err := idx.List(context.TODO()) var idxList []bson.M if err = cursor.All(context.TODO(), &idxList); err != nil { - log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: finding indexed fields") + log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: failed to retrieve index list") + return } + for _, rec := range idxList { - recKeys := rec["key"].(bson.M) - if len(recKeys) > 1 { - if _, ok := recKeys["label"]; ok { - key := "" - for k := range recKeys { - if k != "label" { - key = k - } - } - if len(key) > 0 { - f := strings.TrimPrefix(key, "data.") - for _, l := range labels { - out <- &gripql.IndexID{Graph: mg.graph, Label: l, Field: f} + if recKeys, ok := rec["key"].(bson.M); ok { + if _, hasLabelKey := recKeys[FIELD_LABEL]; hasLabelKey { + for key := range recKeys { + if key != FIELD_LABEL { + f := strings.TrimPrefix(key, "data.") + if partialFilter, ok := rec["partialFilterExpression"].(bson.M); ok { + if label, ok := partialFilter[FIELD_LABEL].(string); ok { + out <- &gripql.IndexID{Graph: mg.graph, Label: label, Field: f} + } + } } } } @@ -109,17 +127,17 @@ func (mg *Graph) VertexLabelScan(ctx context.Context, label string) chan string out := make(chan string, 100) go func() { defer close(out) - selection := map[string]interface{}{ - "label": label, + selection := map[string]any{ + FIELD_LABEL: label, } vcol := mg.ar.VertexCollection(mg.graph) opts := options.Find() - opts.SetProjection(map[string]interface{}{"_id": 1, "label": 1}) + opts.SetProjection(map[string]any{FIELD_ID: 1, FIELD_LABEL: 1}) cursor, err := vcol.Find(context.TODO(), selection, opts) if err == nil { defer cursor.Close(context.TODO()) - result := map[string]interface{}{} + result := map[string]any{} for cursor.Next(context.TODO()) { select { case <-ctx.Done(): @@ -127,7 +145,7 @@ func (mg *Graph) VertexLabelScan(ctx context.Context, label string) chan string default: } if nil == cursor.Decode(&result) { - out <- result["_id"].(string) + out <- result[FIELD_ID].(string) } } if err := cursor.Close(context.TODO()); err != nil { diff --git a/mongo/percentile.go b/mongo/percentile.go index 202c254a2..a4179f599 100644 --- a/mongo/percentile.go +++ b/mongo/percentile.go @@ -8,45 +8,45 @@ func percentileCalc(percent float64) bson.M { p := percent / 100 return bson.M{ - "$add": []interface{}{ + "$add": []any{ bson.M{ - "$arrayElemAt": []interface{}{ + "$arrayElemAt": []any{ "$values", bson.M{ "$floor": bson.M{ - "$multiply": []interface{}{ + "$multiply": []any{ p, - bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, + bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, }, }, }, }, }, bson.M{ - "$multiply": []interface{}{ + "$multiply": []any{ bson.M{ - "$subtract": []interface{}{ + "$subtract": []any{ bson.M{ - "$arrayElemAt": []interface{}{ + "$arrayElemAt": []any{ "$values", bson.M{ "$ceil": bson.M{ - "$multiply": []interface{}{ + "$multiply": []any{ p, - bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, + bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, }, }, }, }, }, bson.M{ - "$arrayElemAt": []interface{}{ + "$arrayElemAt": []any{ "$values", bson.M{ "$floor": bson.M{ - "$multiply": []interface{}{ + "$multiply": []any{ p, - bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, + bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, }, }, }, @@ -56,11 +56,11 @@ func percentileCalc(percent float64) bson.M { }, bson.M{ - "$mod": []interface{}{ + "$mod": []any{ bson.M{ - "$multiply": []interface{}{ + "$multiply": []any{ p, - bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, + bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, }, }, 1, @@ -76,45 +76,45 @@ func percentileCalc(percent float64) bson.M { // "$project": bson.M{ // "values": "$values", // "val": bson.M{ -// "$add": []interface{}{ +// "$add": []any{ // bson.M{ -// "$arrayElemAt": []interface{}{ +// "$arrayElemAt": []any{ // "$values", // bson.M{ // "$floor": bson.M{ -// "$multiply": []interface{}{ +// "$multiply": []any{ // 0.95, -// bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, +// bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, // }, // }, // }, // }, // }, // bson.M{ -// "$multiply": []interface{}{ +// "$multiply": []any{ // bson.M{ -// "$subtract": []interface{}{ +// "$subtract": []any{ // bson.M{ -// "$arrayElemAt": []interface{}{ +// "$arrayElemAt": []any{ // "$values", // bson.M{ // "$ceil": bson.M{ -// "$multiply": []interface{}{ +// "$multiply": []any{ // 0.95, -// bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, +// bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, // }, // }, // }, // }, // }, // bson.M{ -// "$arrayElemAt": []interface{}{ +// "$arrayElemAt": []any{ // "$values", // bson.M{ // "$floor": bson.M{ -// "$multiply": []interface{}{ +// "$multiply": []any{ // 0.95, -// bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, +// bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, // }, // }, // }, @@ -124,11 +124,11 @@ func percentileCalc(percent float64) bson.M { // }, // bson.M{ -// "$mod": []interface{}{ +// "$mod": []any{ // bson.M{ -// "$multiply": []interface{}{ +// "$multiply": []any{ // 0.95, -// bson.M{"$subtract": []interface{}{bson.M{"$size": "$values"}, 1}}, +// bson.M{"$subtract": []any{bson.M{"$size": "$values"}, 1}}, // }, // }, // 1, diff --git a/mongo/processor.go b/mongo/processor.go index 4f2b72ddc..db3fb160a 100644 --- a/mongo/processor.go +++ b/mongo/processor.go @@ -3,6 +3,7 @@ package mongo import ( //"fmt" "context" + "encoding/json" "strconv" "strings" @@ -26,22 +27,25 @@ type Processor struct { aggTypes map[string]*gripql.Aggregate } -func getDataElement(result map[string]interface{}) *gdbi.DataElement { +func getDataElement(result map[string]any) *gdbi.DataElement { de := &gdbi.DataElement{} - if x, ok := result["_id"]; ok { + if x, ok := result[FIELD_ID]; ok { de.ID = x.(string) } - if x, ok := result["label"]; ok { + if x, ok := result[FIELD_LABEL]; ok { de.Label = x.(string) } - if x, ok := result["data"]; ok { - de.Data = removePrimatives(x).(map[string]interface{}) - de.Loaded = true + de.Data = map[string]any{} + for k, v := range removePrimatives(result).(map[string]any) { + if !IsNodeField(k) { + de.Data[k] = v + } } - if x, ok := result["to"]; ok { + de.Loaded = true + if x, ok := result[FIELD_TO]; ok { de.To = x.(string) } - if x, ok := result["from"]; ok { + if x, ok := result[FIELD_FROM]; ok { de.From = x.(string) } return de @@ -49,7 +53,9 @@ func getDataElement(result map[string]interface{}) *gdbi.DataElement { // Process runs the mongo aggregation pipeline func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.InPipe, out gdbi.OutPipe) context.Context { - plog := log.WithFields(log.Fields{"query_id": util.UUID(), "query": proc.query, "query_collection": proc.startCollection}) + queryStr, _ := json.MarshalIndent(proc.query, "", " ") + //queryStr, _ := bson.MarshalExtJSON(proc.query, false, false) + plog := log.WithFields(log.Fields{"query_id": util.UUID(), "query": string(queryStr), "query_collection": proc.startCollection}) plog.Debug("Running Mongo Processor") go func() { @@ -62,11 +68,11 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In trueVal := true cursor, err := initCol.Aggregate(ctx, proc.query, &options.AggregateOptions{AllowDiskUse: &trueVal}) if err != nil { - plog.Errorf("Query Error (%s) : %s", proc.query, err) + plog.Errorf("Query Error: %s", err) continue } //defer cursor.Close(context.TODO()) - result := map[string]interface{}{} + result := map[string]any{} for cursor.Next(ctx) { nResults++ select { @@ -90,9 +96,9 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In case gdbi.SelectionData: selections := map[string]*gdbi.DataElement{} if marks, ok := result["marks"]; ok { - if marks, ok := marks.(map[string]interface{}); ok { + if marks, ok := marks.(map[string]any); ok { for k, v := range marks { - if v, ok := v.(map[string]interface{}); ok { + if v, ok := v.(map[string]any); ok { de := getDataElement(v) selections[k] = de } @@ -112,19 +118,19 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In var lastBucket float64 for i, bucket := range buckets { - bucket, ok := bucket.(map[string]interface{}) + bucket, ok := bucket.(map[string]any) if !ok { plog.Errorf("Failed to convert Mongo aggregation result bucket: %+v", bucket) continue } - var term interface{} + var term any switch proc.aggTypes[k].GetAggregation().(type) { case *gripql.Aggregate_Term: - term = bucket["_id"] + term = bucket[FIELD_ID] case *gripql.Aggregate_Histogram: - term = bucket["_id"] - curPos := bucket["_id"].(float64) + term = bucket[FIELD_ID] + curPos := bucket[FIELD_ID].(float64) stepSize := float64(proc.aggTypes[k].GetHistogram().Interval) if i != 0 { for nv := lastBucket + stepSize; nv < curPos; nv += stepSize { @@ -134,7 +140,7 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In lastBucket = curPos case *gripql.Aggregate_Percentile: - bid := strings.Replace(bucket["_id"].(string), "_", ".", -1) + bid := strings.Replace(bucket[FIELD_ID].(string), "_", ".", -1) f, err := strconv.ParseFloat(bid, 64) if err != nil { plog.Errorf("failed to parse percentile aggregation result key: %v", err) @@ -142,11 +148,11 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In } term = f case *gripql.Aggregate_Field: - term = bucket["_id"] + term = bucket[FIELD_ID] case *gripql.Aggregate_Count: - term = bucket["_id"] + term = bucket[FIELD_ID] case *gripql.Aggregate_Type: - switch bucket["_id"] { + switch bucket[FIELD_ID] { case "double": term = "NUMERIC" case "null": @@ -176,6 +182,8 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In } default: + //Reconstruct the traveler + //Extract the path if path, ok := result["path"]; ok { if pathA, ok := path.(bson.A); ok { o := make([]gdbi.DataElementID, len(pathA)) @@ -192,10 +200,11 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In t = &gdbi.BaseTraveler{Path: o} } } + //Extract marks if marks, ok := result["marks"]; ok { - if marks, ok := marks.(map[string]interface{}); ok { - for k, v := range marks { - if v, ok := v.(map[string]interface{}); ok { + if markDict, ok := marks.(map[string]any); ok { + for k, v := range markDict { + if v, ok := v.(map[string]any); ok { de := getDataElement(v) t = t.AddMark(k, de) } @@ -203,23 +212,7 @@ func (proc *Processor) Process(ctx context.Context, man gdbi.Manager, in gdbi.In } } - de := &gdbi.DataElement{} - if x, ok := result["_id"]; ok { - de.ID = removePrimatives(x).(string) - } - if x, ok := result["label"]; ok { - de.Label = x.(string) - } - if x, ok := result["data"]; ok { - de.Data = removePrimatives(x).(map[string]interface{}) - de.Loaded = true - } - if x, ok := result["to"]; ok { - de.To = x.(string) - } - if x, ok := result["from"]; ok { - de.From = x.(string) - } + de := getDataElement(result[FIELD_CURRENT].(map[string]any)) out <- t.AddCurrent(de) } } diff --git a/mongo/schema.go b/mongo/schema.go index 261a9f06f..70e6fc419 100644 --- a/mongo/schema.go +++ b/mongo/schema.go @@ -73,7 +73,7 @@ func (ma *GraphDB) getVertexSchema(ctx context.Context, graph string, n uint32, pipe := []bson.M{ { "$match": bson.M{ - "label": bson.M{"$eq": label}, + FIELD_LABEL: bson.M{"$eq": label}, }, }, } @@ -84,9 +84,12 @@ func (ma *GraphDB) getVertexSchema(ctx context.Context, graph string, n uint32, pipe = append(pipe, bson.M{"$limit": n}) } - cursor, _ := ma.VertexCollection(graph).Aggregate(context.TODO(), pipe) - result := make(map[string]interface{}) - schema := make(map[string]interface{}) + cursor, err := ma.VertexCollection(graph).Aggregate(context.TODO(), pipe) + if err != nil { + log.Errorf("Vertex schema scan error: %s", err) + } + result := make(map[string]any) + schema := make(map[string]any) for cursor.Next(context.TODO()) { select { case <-ctx.Done(): @@ -94,8 +97,8 @@ func (ma *GraphDB) getVertexSchema(ctx context.Context, graph string, n uint32, default: if err := cursor.Decode(&result); err == nil { - if result["data"] != nil { - ds := gripql.GetDataFieldTypes(result["data"].(map[string]interface{})) + if result != nil { + ds := gripql.GetDataFieldTypes(result) util.MergeMaps(schema, ds) } } else { @@ -108,7 +111,7 @@ func (ma *GraphDB) getVertexSchema(ctx context.Context, graph string, n uint32, return err } sSchema, _ := structpb.NewStruct(schema) - vSchema := &gripql.Vertex{Gid: label, Label: "Vertex", Data: sSchema} + vSchema := &gripql.Vertex{Id: label, Label: "Vertex", Data: sSchema} schemaChan <- vSchema log.WithFields(log.Fields{"graph": graph, "label": label, "elapsed_time": time.Since(start).String()}).Debug("getVertexSchema: Finished schema build") return nil @@ -116,7 +119,7 @@ func (ma *GraphDB) getVertexSchema(ctx context.Context, graph string, n uint32, } output := []*gripql.Vertex{} - done := make(chan interface{}) + done := make(chan any) go func() { for s := range schemaChan { output = append(output, s) @@ -153,7 +156,7 @@ func (ma *GraphDB) getEdgeSchema(ctx context.Context, graph string, n uint32, ra pipe := []bson.M{ { "$match": bson.M{ - "label": bson.M{"$eq": label}, + FIELD_LABEL: bson.M{"$eq": label}, }, }, } @@ -166,8 +169,8 @@ func (ma *GraphDB) getEdgeSchema(ctx context.Context, graph string, n uint32, ra cursor, _ := ma.EdgeCollection(graph).Aggregate(context.TODO(), pipe) defer cursor.Close(context.TODO()) - result := make(map[string]interface{}) - schema := make(map[string]interface{}) + result := make(map[string]any) + schema := make(map[string]any) fromToPairs := make(fromto) for cursor.Next(context.TODO()) { @@ -177,9 +180,9 @@ func (ma *GraphDB) getEdgeSchema(ctx context.Context, graph string, n uint32, ra default: if err := cursor.Decode(&result); err == nil { - fromToPairs.Add(fromtokey{result["from"].(string), result["to"].(string)}) - if result["data"] != nil { - ds := gripql.GetDataFieldTypes(result["data"].(map[string]interface{})) + fromToPairs.Add(fromtokey{result[FIELD_FROM].(string), result[FIELD_TO].(string)}) + if result != nil { + ds := gripql.GetDataFieldTypes(result) util.MergeMaps(schema, ds) } } else { @@ -196,10 +199,10 @@ func (ma *GraphDB) getEdgeSchema(ctx context.Context, graph string, n uint32, ra from := fromToPairs.GetFrom() to := fromToPairs.GetTo() - for j := 0; j < len(from); j++ { + for j := range len(from) { sSchema, _ := structpb.NewStruct(schema) eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", from[j], label, to[j]), + Id: fmt.Sprintf("(%s)--%s->(%s)", from[j], label, to[j]), Label: label, From: from[j], To: to[j], @@ -214,7 +217,7 @@ func (ma *GraphDB) getEdgeSchema(ctx context.Context, graph string, n uint32, ra } output := []*gripql.Edge{} - done := make(chan interface{}) + done := make(chan any) go func() { for s := range schemaChan { output = append(output, s) @@ -232,7 +235,7 @@ type fromtokey struct { from, to string } -type fromto map[fromtokey]interface{} +type fromto map[fromtokey]any func (ft fromto) Add(k fromtokey) bool { if k.from != "" && k.to != "" { @@ -266,7 +269,7 @@ func (ma *GraphDB) resolveLabels(graph string, ft fromto) fromto { fromIDs := ft.GetFrom() toIDs := ft.GetTo() - for i := 0; i < len(fromIDs); i++ { + for i := range len(fromIDs) { i := i toID := toIDs[i] fromID := fromIDs[i] @@ -277,18 +280,18 @@ func (ma *GraphDB) resolveLabels(graph string, ft fromto) fromto { to := "" result := map[string]string{} opts := options.FindOne() - opts.SetProjection(bson.M{"_id": -1, "label": 1}) - cursor := v.FindOne(context.TODO(), bson.M{"_id": fromID}, opts) + opts.SetProjection(bson.M{FIELD_ID: -1, FIELD_LABEL: 1}) + cursor := v.FindOne(context.TODO(), bson.M{FIELD_ID: fromID}, opts) if cursor.Err() == nil { if nil == cursor.Decode(&result) { - from = result["label"] + from = result[FIELD_LABEL] } } result = map[string]string{} - cursor = v.FindOne(context.TODO(), bson.M{"_id": toID}, opts) + cursor = v.FindOne(context.TODO(), bson.M{FIELD_ID: toID}, opts) if cursor.Err() == nil { if nil == cursor.Decode(&result) { - to = result["label"] + to = result[FIELD_LABEL] } } if from != "" && to != "" { diff --git a/mongo/util.go b/mongo/util.go index 81e4965c7..c86fc0c14 100644 --- a/mongo/util.go +++ b/mongo/util.go @@ -19,7 +19,7 @@ func GetEdgeCollection(session *mgo.Client, database string, graph string) *mgo. func AddMongoGraph(client *mgo.Client, database string, graph string) error { graphs := client.Database(database).Collection("graphs") - _, err := graphs.InsertOne(context.Background(), bson.M{"_id": graph}) + _, err := graphs.InsertOne(context.Background(), bson.M{FIELD_ID: graph}) if err != nil { return fmt.Errorf("failed to insert graph %s: %v", graph, err) } @@ -29,7 +29,7 @@ func AddMongoGraph(client *mgo.Client, database string, graph string) error { _, err = eiv.CreateOne( context.Background(), mgo.IndexModel{ - Keys: bson.M{"from": 1}, + Keys: bson.M{FIELD_FROM: 1}, Options: options.Index().SetUnique(false).SetSparse(false).SetBackground(true), }) if err != nil { @@ -39,7 +39,7 @@ func AddMongoGraph(client *mgo.Client, database string, graph string) error { _, err = eiv.CreateOne( context.Background(), mgo.IndexModel{ - Keys: bson.M{"to": 1}, + Keys: bson.M{FIELD_TO: 1}, Options: options.Index().SetUnique(false).SetSparse(false).SetBackground(true), }) if err != nil { @@ -49,7 +49,7 @@ func AddMongoGraph(client *mgo.Client, database string, graph string) error { _, err = eiv.CreateOne( context.Background(), mgo.IndexModel{ - Keys: bson.M{"label": 1}, + Keys: bson.M{FIELD_LABEL: 1}, Options: options.Index().SetUnique(false).SetSparse(false).SetBackground(true), }) if err != nil { @@ -61,7 +61,7 @@ func AddMongoGraph(client *mgo.Client, database string, graph string) error { _, err = viv.CreateOne( context.Background(), mgo.IndexModel{ - Keys: bson.M{"label": 1}, + Keys: bson.M{FIELD_LABEL: 1}, Options: options.Index().SetUnique(false).SetSparse(false).SetBackground(true), }) if err != nil { diff --git a/psql/graph.go b/psql/graph.go index 80a4340e9..a6947c24e 100644 --- a/psql/graph.go +++ b/psql/graph.go @@ -43,9 +43,9 @@ func (g *Graph) AddVertex(vertices []*gdbi.Vertex) error { } s := fmt.Sprintf( - `INSERT INTO %s (gid, label, data) VALUES ($1, $2, $3) - ON CONFLICT (gid) DO UPDATE SET - gid = excluded.gid, + `INSERT INTO %s (id, label, data) VALUES ($1, $2, $3) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, label = excluded.label, data = excluded.data;`, g.v, @@ -79,6 +79,96 @@ func (g *Graph) AddVertex(vertices []*gdbi.Vertex) error { return nil } +// AddVertex adds a vertex to the database +func (g *Graph) StreamVertices(vertices <-chan *gdbi.Vertex, workers int) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("StreamVertices: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, data) VALUES ($1, $2, $3) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + data = excluded.data;`, + g.v, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("StreamVertices: Prepare Stmt: %v", err) + } + + for v := range vertices { + js, err := json.Marshal(v.Data) + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(v.ID, v.Label, js) + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Exec: %v", err) + } + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("StreamVertices: Txn.Commit: %v", err) + } + + return nil +} + +// AddEdge adds an edge to the database +func (g *Graph) StreamEdges(edges <-chan *gdbi.Edge, workers int) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("StreamEdges: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, "from", "to", data) VALUES ($1, $2, $3, $4, $5) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + "from" = excluded."from", + "to" = excluded."to", + data = excluded.data;`, + g.e, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("StreamEdges: Prepare Stmt: %v", err) + } + + for e := range edges { + js, err := json.Marshal(e.Data) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(e.ID, e.Label, e.From, e.To, js) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("StreamEdges: Txn.Commit: %v", err) + } + + return nil +} + // AddEdge adds an edge to the database func (g *Graph) AddEdge(edges []*gdbi.Edge) error { txn, err := g.db.Begin() @@ -87,9 +177,9 @@ func (g *Graph) AddEdge(edges []*gdbi.Edge) error { } s := fmt.Sprintf( - `INSERT INTO %s (gid, label, "from", "to", data) VALUES ($1, $2, $3, $4, $5) - ON CONFLICT (gid) DO UPDATE SET - gid = excluded.gid, + `INSERT INTO %s (id, label, "from", "to", data) VALUES ($1, $2, $3, $4, $5) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, label = excluded.label, "from" = excluded.from, "to" = excluded.to, @@ -126,12 +216,26 @@ func (g *Graph) AddEdge(edges []*gdbi.Edge) error { } func (g *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { - return util.StreamBatch(stream, 50, g.graph, g.AddVertex, g.AddEdge) + return util.StreamBatch(stream, 50, g.graph, g.StreamVertices, g.StreamEdges) +} + +func (g *Graph) BulkDel(Data *gdbi.DeleteData) error { + for _, v := range Data.Edges { + if err := g.DelEdge(v); err != nil { + return err + } + } + for _, v := range Data.Vertices { + if err := g.DelVertex(v); err != nil { + return err + } + } + return nil } // DelVertex is not implemented in the SQL driver func (g *Graph) DelVertex(key string) error { - stmt := fmt.Sprintf("DELETE FROM %s WHERE gid='%s'", g.v, key) + stmt := fmt.Sprintf("DELETE FROM %s WHERE id='%s'", g.v, key) _, err := g.db.Exec(stmt) if err != nil { return fmt.Errorf("deleting vertex: %v", err) @@ -154,7 +258,7 @@ func (g *Graph) DelVertex(key string) error { // DelEdge is not implemented in the SQL driver func (g *Graph) DelEdge(key string) error { - stmt := fmt.Sprintf("DELETE FROM %s WHERE gid='%s'", g.e, key) + stmt := fmt.Sprintf("DELETE FROM %s WHERE id='%s'", g.e, key) _, err := g.db.Exec(stmt) if err != nil { return fmt.Errorf("deleting edge: %v", err) @@ -172,18 +276,18 @@ func (g *Graph) GetTimestamp() string { } // GetVertex loads a vertex given an id. It returns a nil if not found. -func (g *Graph) GetVertex(gid string, load bool) *gdbi.Vertex { - q := fmt.Sprintf(`SELECT gid, label FROM %s WHERE gid='%s'`, g.v, gid) +func (g *Graph) GetVertex(id string, load bool) *gdbi.Vertex { + q := fmt.Sprintf(`SELECT id, label FROM %s WHERE id='%s'`, g.v, id) if load { - q = fmt.Sprintf(`SELECT * FROM %s WHERE gid='%s'`, g.v, gid) + q = fmt.Sprintf(`SELECT * FROM %s WHERE id='%s'`, g.v, id) } - vrow := &row{} + vrow := &Row{} err := g.db.QueryRowx(q).StructScan(vrow) if err != nil { log.WithFields(log.Fields{"error": err, "query": q}).Error("GetVertex: StructScan") return nil } - vertex, err := convertVertexRow(vrow, load) + vertex, err := ConvertVertexRow(vrow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertex: convertVertexRow") return nil @@ -192,18 +296,18 @@ func (g *Graph) GetVertex(gid string, load bool) *gdbi.Vertex { } // GetEdge loads an edge given an id. It returns a nil if not found. -func (g *Graph) GetEdge(gid string, load bool) *gdbi.Edge { - q := fmt.Sprintf(`SELECT gid, label, "from", "to" FROM %s WHERE gid='%s'`, g.e, gid) +func (g *Graph) GetEdge(id string, load bool) *gdbi.Edge { + q := fmt.Sprintf(`SELECT id, label, "from", "to" FROM %s WHERE id='%s'`, g.e, id) if load { - q = fmt.Sprintf(`SELECT * FROM %s WHERE gid='%s'`, g.e, gid) + q = fmt.Sprintf(`SELECT * FROM %s WHERE id='%s'`, g.e, id) } - erow := &row{} + erow := &Row{} err := g.db.QueryRowx(q).StructScan(erow) if err != nil { log.WithFields(log.Fields{"error": err, "query": q}).Error("GetEdge: StructScan") return nil } - edge, err := convertEdgeRow(erow, load) + edge, err := ConvertEdgeRow(erow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetEdge: convertEdgeRow") return nil @@ -216,7 +320,7 @@ func (g *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Verte o := make(chan *gdbi.Vertex, 100) go func() { defer close(o) - q := fmt.Sprintf("SELECT gid, label FROM %s", g.v) + q := fmt.Sprintf("SELECT id, label FROM %s", g.v) if load { q = fmt.Sprintf(`SELECT * FROM %s`, g.v) } @@ -227,12 +331,12 @@ func (g *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Verte } defer rows.Close() for rows.Next() { - vrow := &row{} + vrow := &Row{} if err := rows.StructScan(vrow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexList: StructScan") continue } - v, err := convertVertexRow(vrow, load) + v, err := ConvertVertexRow(vrow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexList: convertVertexRow") continue @@ -251,7 +355,7 @@ func (g *Graph) VertexLabelScan(ctx context.Context, label string) chan string { o := make(chan string, 100) go func() { defer close(o) - q := fmt.Sprintf("SELECT gid FROM %s WHERE label='%s'", g.v, label) + q := fmt.Sprintf("SELECT id FROM %s WHERE label='%s'", g.v, label) rows, err := g.db.QueryxContext(ctx, q) if err != nil { log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: QueryxContext") @@ -259,12 +363,12 @@ func (g *Graph) VertexLabelScan(ctx context.Context, label string) chan string { } defer rows.Close() for rows.Next() { - var gid string - if err := rows.Scan(&gid); err != nil { + var id string + if err := rows.Scan(&id); err != nil { log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: Scan") continue } - o <- gid + o <- id } if err := rows.Err(); err != nil { log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: iterating") @@ -278,7 +382,7 @@ func (g *Graph) GetEdgeList(ctx context.Context, load bool) <-chan *gdbi.Edge { o := make(chan *gdbi.Edge, 100) go func() { defer close(o) - q := fmt.Sprintf(`SELECT gid, label, "from", "to" FROM %s`, g.e) + q := fmt.Sprintf(`SELECT id, label, "from", "to" FROM %s`, g.e) if load { q = fmt.Sprintf(`SELECT * FROM %s`, g.e) } @@ -289,12 +393,12 @@ func (g *Graph) GetEdgeList(ctx context.Context, load bool) <-chan *gdbi.Edge { } defer rows.Close() for rows.Next() { - erow := &row{} + erow := &Row{} if err := rows.StructScan(erow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: StructScan") continue } - e, err := convertEdgeRow(erow, load) + e, err := ConvertEdgeRow(erow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: convertEdgeRow") continue @@ -327,10 +431,10 @@ func (g *Graph) GetVertexChannel(ctx context.Context, reqChan chan gdbi.ElementL } if len(idBatch) > 0 { ids := strings.Join(idBatch, ", ") - q := fmt.Sprintf("SELECT gid, label FROM %s WHERE gid IN (%s)", g.v, ids) - if load { - q = fmt.Sprintf("SELECT * FROM %s WHERE gid IN (%s)", g.v, ids) - } + //q := fmt.Sprintf("SELECT id, label FROM %s WHERE id IN (%s)", g.v, ids) + //if load { + q := fmt.Sprintf("SELECT * FROM %s WHERE id IN (%s)", g.v, ids) + //} rows, err := g.db.Queryx(q) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: Queryx") @@ -338,12 +442,12 @@ func (g *Graph) GetVertexChannel(ctx context.Context, reqChan chan gdbi.ElementL } chunk := map[string]*gdbi.Vertex{} for rows.Next() { - vrow := &row{} + vrow := &Row{} if err := rows.StructScan(vrow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: StructScan") continue } - v, err := convertVertexRow(vrow, load) + v, err := ConvertVertexRow(vrow, true) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: convertVertexRow") continue @@ -392,8 +496,9 @@ func (g *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLook } if len(idBatch) > 0 { ids := strings.Join(idBatch, ", ") + /* Todo: pass load = true when pivot in graph statements q := fmt.Sprintf( - "SELECT %s.gid, %s.label, %s.from FROM %s INNER JOIN %s ON %s.to=%s.gid WHERE %s.from IN (%s)", + "SELECT %s.id, %s.label, %s.from FROM %s INNER JOIN %s ON %s.to=%s.id WHERE %s.from IN (%s)", // SELECT g.v, g.v, g.e, // FROM @@ -406,24 +511,23 @@ func (g *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLook g.e, // IN ids, + )*/ + q := fmt.Sprintf( + "SELECT %s.*, %s.from FROM %s INNER JOIN %s ON %s.to=%s.id WHERE %s.from IN (%s)", + // SELECT + g.v, g.e, + // FROM + g.v, + // INNER JOIN + g.e, + // ON + g.e, g.v, + // WHERE + g.e, + // IN + ids, ) - if load { - q = fmt.Sprintf( - "SELECT %s.*, %s.from FROM %s INNER JOIN %s ON %s.to=%s.gid WHERE %s.from IN (%s)", - // SELECT - g.v, g.e, - // FROM - g.v, - // INNER JOIN - g.e, - // ON - g.e, g.v, - // WHERE - g.e, - // IN - ids, - ) - } + if len(edgeLabels) > 0 { labels := make([]string, len(edgeLabels)) for i := range edgeLabels { @@ -437,12 +541,13 @@ func (g *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLook return } for rows.Next() { - vrow := &row{} + vrow := &Row{} if err := rows.StructScan(vrow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetOutChannel: StructScan") continue } - v, err := convertVertexRow(vrow, load) + //v, err := ConvertVertexRow(vrow, load) + v, err := ConvertVertexRow(vrow, true) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetOutChannel: convertVertexRow") continue @@ -502,7 +607,7 @@ func (g *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLooku if len(idBatch) > 0 { ids := strings.Join(idBatch, ", ") q := fmt.Sprintf( - "SELECT %s.gid, %s.label, %s.to FROM %s INNER JOIN %s ON %s.from=%s.gid WHERE %s.to IN (%s)", + "SELECT %s.id, %s.label, %s.to FROM %s INNER JOIN %s ON %s.from=%s.id WHERE %s.to IN (%s)", // SELECT g.v, g.v, g.e, // FROM @@ -518,7 +623,7 @@ func (g *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLooku ) if load { q = fmt.Sprintf( - "SELECT %s.*, %s.to FROM %s INNER JOIN %s ON %s.from=%s.gid WHERE %s.to IN (%s)", + "SELECT %s.*, %s.to FROM %s INNER JOIN %s ON %s.from=%s.id WHERE %s.to IN (%s)", // SELECT g.v, g.e, // FROM @@ -546,12 +651,12 @@ func (g *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLooku return } for rows.Next() { - vrow := &row{} + vrow := &Row{} if err := rows.StructScan(vrow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetInChannel: StructScan") continue } - v, err := convertVertexRow(vrow, load) + v, err := ConvertVertexRow(vrow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetInChannel: convertVertexRow") continue @@ -611,7 +716,7 @@ func (g *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.Element if len(idBatch) > 0 { ids := strings.Join(idBatch, ", ") q := fmt.Sprintf( - `SELECT gid, label, "from", "to" FROM %s WHERE %s.from IN (%s)`, + `SELECT id, label, "from", "to" FROM %s WHERE %s.from IN (%s)`, // FROM g.e, // WHERE @@ -643,12 +748,12 @@ func (g *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.Element return } for rows.Next() { - erow := &row{} + erow := &Row{} if err := rows.StructScan(erow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel: StructScan") continue } - e, err := convertEdgeRow(erow, load) + e, err := ConvertEdgeRow(erow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel: convertEdgeRow") continue @@ -708,7 +813,7 @@ func (g *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementL if len(idBatch) > 0 { ids := strings.Join(idBatch, ", ") q := fmt.Sprintf( - `SELECT gid, label, "from", "to" FROM %s WHERE %s.to IN (%s)`, + `SELECT id, label, "from", "to" FROM %s WHERE %s.to IN (%s)`, // FROM g.e, // WHERE @@ -740,12 +845,12 @@ func (g *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementL return } for rows.Next() { - erow := &row{} + erow := &Row{} if err := rows.StructScan(erow); err != nil { log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel: StructScan") continue } - e, err := convertEdgeRow(erow, load) + e, err := ConvertEdgeRow(erow, load) if err != nil { log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel: convertEdgeRow") continue diff --git a/psql/graphdb.go b/psql/graphdb.go index 79bac26b6..245988e09 100644 --- a/psql/graphdb.go +++ b/psql/graphdb.go @@ -90,7 +90,7 @@ func (db *GraphDB) AddGraph(graph string) error { return fmt.Errorf("inserting row into graphs table: %v", err) } - stmt = fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s (gid varchar PRIMARY KEY, label varchar NOT NULL, data jsonb)", vertexTable) + stmt = fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s (id varchar PRIMARY KEY, label varchar NOT NULL, data jsonb)", vertexTable) _, err = db.db.Exec(stmt) if err != nil { return fmt.Errorf("creating vertex table: %v", err) @@ -104,7 +104,7 @@ func (db *GraphDB) AddGraph(graph string) error { } } - stmt = fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s (gid varchar PRIMARY KEY, label varchar NOT NULL, "from" varchar NOT NULL, "to" varchar NOT NULL, data jsonb)`, edgeTable) + stmt = fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s (id varchar PRIMARY KEY, label varchar NOT NULL, "from" varchar NOT NULL, "to" varchar NOT NULL, data jsonb)`, edgeTable) _, err = db.db.Exec(stmt) if err != nil { return fmt.Errorf("creating edge table: %v", err) diff --git a/psql/index.go b/psql/index.go index 23cf5fec4..1d6eff01a 100644 --- a/psql/index.go +++ b/psql/index.go @@ -1,24 +1,102 @@ package psql import ( - "errors" + "fmt" + "strings" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/lib/pq" ) -// AddVertexIndex add index to vertices -func (g *Graph) AddVertexIndex(label string, field string) error { - return errors.New("not implemented") +func (g *Graph) AddVertexIndex(vertexLabel string, field string) error { + indexName := fmt.Sprintf("%s_%s_%s", g.graph, vertexLabel, field) + query := fmt.Sprintf( + "CREATE INDEX IF NOT EXISTS %s ON %s ((data->>'%s')) WHERE label = '%s'", + pq.QuoteIdentifier(indexName), + pq.QuoteIdentifier(g.v), + field, + vertexLabel, + ) + _, err := g.db.Exec(query) + if err != nil { + log.Errorf("Error adding index %s: %v", indexName, err) + return fmt.Errorf("failed to add index %s: %w", indexName, err) + } + log.Infof("Successfully added index %s for vertex label %s field %s", indexName, vertexLabel, field) + return nil } -// DeleteVertexIndex delete index from vertices -func (g *Graph) DeleteVertexIndex(label string, field string) error { - return errors.New("not implemented") +// DeleteVertexIndex drops the specified index. +func (g *Graph) DeleteVertexIndex(vertexLabel string, field string) error { + indexName := fmt.Sprintf("%s_%s_%s", g.graph, vertexLabel, field) + query := fmt.Sprintf("DROP INDEX IF EXISTS %s", pq.QuoteIdentifier(indexName)) + _, err := g.db.Exec(query) + if err != nil { + log.Errorf("Error deleting index %s: %v", indexName, err) + return fmt.Errorf("failed to delete index %s: %w", indexName, err) + } + log.Infof("Successfully deleted index %s", indexName) + return nil } // GetVertexIndexList lists indices func (g *Graph) GetVertexIndexList() <-chan *gripql.IndexID { - o := make(chan *gripql.IndexID) - defer close(o) + o := make(chan *gripql.IndexID, 100) + go func() { + defer close(o) + // Query indices only on the vertex table (g.v) + query := ` + SELECT i.relname AS index_name + FROM pg_class t, + pg_class i, + pg_index ix + WHERE t.oid = ix.indrelid + AND i.oid = ix.indexrelid + AND t.relkind = 'r' + AND i.relkind = 'i' + AND NOT ix.indisprimary + AND NOT ix.indisunique + AND t.relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) + AND t.relname = $1 + ` + rows, err := g.db.Queryx(query, g.v) + if err != nil { + log.Errorf("Error getting index list: %v", err) + return + } + defer rows.Close() + + prefix := fmt.Sprintf("%s_", g.graph) + for rows.Next() { + var indexName string + if err := rows.Scan(&indexName); err != nil { + log.Errorf("Error scanning index row: %v", err) + continue + } + if !strings.HasPrefix(indexName, prefix) { + log.Infof("Skipping index '%s': does not match graph '%s'", indexName, g.graph) + continue + } + rest := strings.TrimPrefix(indexName, prefix) + if strings.HasPrefix(rest, "vertices_") { + continue + } else { + parts := strings.SplitN(rest, "_", 2) + if len(parts) == 2 { + o <- &gripql.IndexID{ + Graph: g.graph, + Label: parts[0], // Vertex label, e.g., "Person" + Field: parts[1], // Field, e.g., "age" + } + } else { + log.Infof("Skipping index '%s': unrecognized format", indexName) + } + } + } + if err := rows.Err(); err != nil { + log.Errorf("Error during index row iteration: %v", err) + } + }() return o } diff --git a/psql/schema.go b/psql/schema.go index 5b892ef9a..0fdc9a10b 100644 --- a/psql/schema.go +++ b/psql/schema.go @@ -46,12 +46,12 @@ func (db *GraphDB) BuildSchema(ctx context.Context, graphID string, sampleN uint defer rows.Close() schema := make(map[string]interface{}) for rows.Next() { - vrow := &row{} + vrow := &Row{} if err := rows.StructScan(vrow); err != nil { log.WithFields(log.Fields{"error": err}).Error("BuildSchema: StructScan") continue } - v, err := convertVertexRow(vrow, true) + v, err := ConvertVertexRow(vrow, true) if err != nil { log.WithFields(log.Fields{"error": err}).Error("BuildSchema: convertVertexRow") continue @@ -60,7 +60,7 @@ func (db *GraphDB) BuildSchema(ctx context.Context, graphID string, sampleN uint } sSchema, _ := structpb.NewStruct(schema) - vSchema := &gripql.Vertex{Gid: label, Label: "Vertex", Data: sSchema} + vSchema := &gripql.Vertex{Id: label, Label: "Vertex", Data: sSchema} vSchemaChan <- vSchema return nil @@ -80,7 +80,7 @@ func (db *GraphDB) BuildSchema(ctx context.Context, graphID string, sampleN uint g.Go(func() error { q := fmt.Sprintf( - "SELECT a.label, b.label, c.label, b.data FROM %s as a INNER JOIN %s as b ON b.to=a.gid INNER JOIN %s as c on b.from = c.gid WHERE b.label = '%s' limit %d", + "SELECT a.label, b.label, c.label, b.data FROM %s as a INNER JOIN %s as b ON b.to=a.id INNER JOIN %s as c on b.from = c.id WHERE b.label = '%s' limit %d", graph.v, graph.e, graph.v, label, sampleN, ) @@ -98,7 +98,7 @@ func (db *GraphDB) BuildSchema(ctx context.Context, graphID string, sampleN uint continue } else { eSchema := &gripql.Edge{ - Gid: fmt.Sprintf("(%s)--%s->(%s)", row[0], row[1], row[2]), + Id: fmt.Sprintf("(%s)--%s->(%s)", row[0], row[1], row[2]), Label: label, From: row[0].(string), To: row[2].(string), diff --git a/psql/util.go b/psql/util.go index 38c3d2c0c..7a823a69b 100644 --- a/psql/util.go +++ b/psql/util.go @@ -8,15 +8,15 @@ import ( "github.com/bmeg/grip/gdbi" ) -type row struct { - Gid string +type Row struct { + Id string Label string From string To string Data []byte } -func convertVertexRow(row *row, load bool) (*gdbi.Vertex, error) { +func ConvertVertexRow(row *Row, load bool) (*gdbi.Vertex, error) { props := make(map[string]interface{}) if load { err := json.Unmarshal(row.Data, &props) @@ -25,7 +25,7 @@ func convertVertexRow(row *row, load bool) (*gdbi.Vertex, error) { } } v := &gdbi.Vertex{ - ID: row.Gid, + ID: row.Id, Label: row.Label, Data: props, Loaded: load, @@ -33,7 +33,7 @@ func convertVertexRow(row *row, load bool) (*gdbi.Vertex, error) { return v, nil } -func convertEdgeRow(row *row, load bool) (*gdbi.Edge, error) { +func ConvertEdgeRow(row *Row, load bool) (*gdbi.Edge, error) { props := make(map[string]interface{}) if load { err := json.Unmarshal(row.Data, &props) @@ -42,7 +42,7 @@ func convertEdgeRow(row *row, load bool) (*gdbi.Edge, error) { } } e := &gdbi.Edge{ - ID: row.Gid, + ID: row.Id, Label: row.Label, From: row.From, To: row.To, diff --git a/schema/graph.go b/schema/graph.go new file mode 100644 index 000000000..725b34221 --- /dev/null +++ b/schema/graph.go @@ -0,0 +1,381 @@ +package schema + +import ( + "encoding/json" + "fmt" + "io" + "os" + "path/filepath" + "strings" + + "github.com/bmeg/grip/log" + + "github.com/bmeg/grip/gripql" + "google.golang.org/protobuf/encoding/protojson" + "sigs.k8s.io/yaml" +) + +func ParseYAMLSchemaGraphs(source []byte, graphName string) ([]*gripql.Graph, error) { + return nil, nil +} + +// ParseYAMLGraph parses a YAML doc into the given Graph instance. +func ParseYAMLGraph(raw []byte) (*gripql.Graph, error) { + tmp := map[string]interface{}{} + err := yaml.Unmarshal(raw, &tmp) + if err != nil { + return nil, err + } + part, err := json.Marshal(tmp) + if err != nil { + return nil, err + } + g := &gripql.Graph{} + err = protojson.Unmarshal(part, g) + if err != nil { + return nil, err + } + return g, nil +} + +func ParseYAMLGraphPath(relpath string) (*gripql.Graph, error) { + // Try to get absolute path. If it fails, fall back to relative path. + path, err := filepath.Abs(relpath) + if err != nil { + path = relpath + } + // Read file + source, err := os.ReadFile(path) + if err != nil { + return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err) + } + return ParseYAMLGraph(source) +} + +// ParseYAMLGraph parses a YAML doc into the given Graph instance. +func ParseYAMLGraphs(raw []byte) ([]*gripql.Graph, error) { + graphs := []*gripql.Graph{} + tmp := []interface{}{} + err := yaml.Unmarshal(raw, &tmp) + if err != nil { + var tmp2 interface{} + err := yaml.Unmarshal(raw, &tmp2) + if err != nil { + return nil, err + } + tmp = append(tmp, tmp2) + } + for _, s := range tmp { + part, err := json.Marshal(s) + if err != nil { + return nil, err + } + g := &gripql.Graph{} + err = protojson.Unmarshal(part, g) + if err != nil { + return nil, err + } + if g.Graph == "" { + return nil, fmt.Errorf("missing graph name") + } + graphs = append(graphs, g) + } + return graphs, nil +} + +// ParseJSONGraph parses a JSON doc into the given Graph instance. +func ParseJSONGraphs(raw []byte) ([]*gripql.Graph, error) { + graphs := []*gripql.Graph{} + tmp := []interface{}{} + err := json.Unmarshal(raw, &tmp) + if err != nil { + var tmp2 interface{} + err := json.Unmarshal(raw, &tmp2) + if err != nil { + return nil, err + } + tmp = append(tmp, tmp2) + } + for _, s := range tmp { + part, err := json.Marshal(s) + if err != nil { + return nil, err + } + g := &gripql.Graph{} + err = protojson.Unmarshal(part, g) + if err != nil { + return nil, err + } + if g.Graph == "" { + return nil, fmt.Errorf("missing graph name") + } + graphs = append(graphs, g) + } + return graphs, nil +} + +// ParseGraphYAMLFile parses a graph file, which is formatted in YAML, +// and returns a slice of graph objects. +func parseGraphFile(relpath string, format string, graphName string) ([]*gripql.Graph, error) { + var graphs []*gripql.Graph + var err error + + if relpath == "" { + return nil, fmt.Errorf("path is empty") + } + + // Try to get absolute path. If it fails, fall back to relative path. + path, err := filepath.Abs(relpath) + if err != nil { + path = relpath + } + + var source []byte + if format == "yaml" || format == "json" { + source, err = os.ReadFile(path) + if err != nil { + return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err) + } + } + + // Parse file contents + switch format { + case "yaml": + graphs, err = ParseYAMLGraphs(source) + case "json": + graphs, err = ParseJSONGraphs(source) + case "ySchema": + // determine if file or directory + info, err := os.Stat(path) + if err != nil { + if os.IsNotExist(err) { + return nil, fmt.Errorf("path does not exist: %s", path) + } + return nil, fmt.Errorf("error accessing path: %v", err) + } + graphSchema := map[string]any{ + "vertices": []map[string]any{}, + "edges": []map[string]any{}, // Optional: if there are no edges from YAML files + "graph": graphName, + } + if info.IsDir() { + files, err := os.ReadDir(path) + if err != nil { + return nil, fmt.Errorf("failed to read directory: %v", err) + } + + for _, file := range files { + if file.IsDir() || filepath.Ext(file.Name()) != ".yaml" && filepath.Ext(file.Name()) != ".yml" { + continue + } + filePath := filepath.Join(path, file.Name()) + content, err := os.ReadFile(filePath) + if err != nil { + return nil, fmt.Errorf("failed to read file %s: %v", file.Name(), err) + } + vertex, err := ParseYSchemaToVertex(content) + if err != nil { + return nil, fmt.Errorf("failed to parse file %s: %v", file.Name(), err) + } + graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex) + } + + if len(graphSchema["vertices"].([]map[string]any)) == 0 { + return nil, fmt.Errorf("no valid YAML files found in directory: %s", path) + } + + expandedGraph, err := json.Marshal(graphSchema) + if err != nil { + return nil, fmt.Errorf("failed to marshal expanded graph: %v", err) + } + + graph := gripql.Graph{} + if err := json.Unmarshal(expandedGraph, &graph); err != nil { + return nil, fmt.Errorf("failed to unmarshal expanded graph: %v", err) + } + + return []*gripql.Graph{&graph}, nil + } else { + content, err := os.ReadFile(path) + if err != nil { + return nil, fmt.Errorf("failed to read file %s: %v", path, err) + } + vertex, err := ParseYSchemaToVertex(content) + if err != nil { + return nil, fmt.Errorf("failed to parse file %s: %v", path, err) + } + graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex) + if len(graphSchema["vertices"].([]map[string]any)) == 0 { + return nil, fmt.Errorf("%s is not a parsable YAML schema", path) + } + + expandedGraph, err := json.Marshal(graphSchema) + if err != nil { + return nil, fmt.Errorf("failed to marshal expanded graph: %v", err) + } + + graph := gripql.Graph{} + if err := json.Unmarshal(expandedGraph, &graph); err != nil { + return nil, fmt.Errorf("failed to unmarshal expanded graph: %v", err) + } + + return []*gripql.Graph{&graph}, nil + } + + case "jSchema": + file, err := os.Open(path) + if err != nil { + return nil, fmt.Errorf("failed to open file: %v", err) + } + defer file.Close() + + // Read the entire file content + bytes, err := io.ReadAll(file) + if err != nil { + return nil, fmt.Errorf("failed to read file: %v", err) + } + graphs, err = ParseJSchema(bytes, graphName) + default: + err = fmt.Errorf("unknown file format: %s", format) + } + if err != nil { + return nil, fmt.Errorf("failed to parse graph at path %s: \n%v", path, err) + } + return graphs, nil +} + +func traverseAndModify(data map[string]any, targetKey string) { + /* Since existing jsonschema lib doesn't like no url paths, convert refs to url basepath + resourceName*/ + for key, value := range data { + if key == targetKey { + if strValue, ok := value.(string); ok { + strValue = strings.TrimSuffix(strValue, ".yaml") + if !(strings.HasPrefix(strValue, "http://") || strings.HasPrefix(strValue, "https://")) { + data[key] = "http://grip-schema.io/schema/0.0.1/" + strValue + } + } + } + switch v := value.(type) { + case map[string]any: + traverseAndModify(v, targetKey) + case []any: + for _, item := range v { + if nestedMap, ok := item.(map[string]any); ok { + traverseAndModify(nestedMap, targetKey) + } + } + } + } +} + +func ParseYSchemaToVertex(bytes []byte) (map[string]any, error) { + var data map[string]any + if err := yaml.Unmarshal(bytes, &data); err != nil { + return nil, fmt.Errorf("failed to unmarshal YAML: %v", err) + } + id, ok := data["$id"] + if !ok { + return nil, fmt.Errorf("missing $id field in YAML document") + } + data["id"] = "http://grip-schema.io/schema/0.0.1/" + id.(string) + delete(data, "$id") + + traverseAndModify(data, "$ref") + vertex := map[string]any{ + "data": data, + "label": id.(string), + "id": "http://grip-schema.io/schema/0.0.1/" + id.(string), + } + + return vertex, nil +} + +func ParseJSchema(bytes []byte, graphName string) ([]*gripql.Graph, error) { + graphSchema := map[string]any{ + "vertices": []map[string]any{}, + "edges": []map[string]any{}, + "graph": graphName, + } + + // Parse JSON into a map + var data map[string]any + if err := json.Unmarshal(bytes, &data); err != nil { + return nil, fmt.Errorf("failed to unmarshal JSON: %v", err) + } + for key, values := range data["$defs"].(map[string]any) { + vals := values.(map[string]any) + if idVal, exists := vals["$id"]; exists { + delete(vals, "$id") + vals["id"] = idVal + } + + vertex := map[string]any{"data": values, "label": key, "id": data["$id"].(string) + "/" + key} + graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex) + } + + expandedJSON, err := json.Marshal(graphSchema) + if err != nil { + log.Errorf("Failed to marshal expanded schema: %v", err) + } + graphs := gripql.Graph{} + json.Unmarshal(expandedJSON, &graphs) + return []*gripql.Graph{&graphs}, nil +} + +// ParseYAMLGraphFile parses a graph file, which is formatted in YAML, +// and returns a slice of graph objects. +func ParseYAMLGraphsFile(relpath string) ([]*gripql.Graph, error) { + return parseGraphFile(relpath, "yaml", "") +} + +// ParseJSONGraphFile parses a graph file, which is formatted in JSON, +// and returns a slice of graph objects. +func ParseJSONGraphsFile(relpath string) ([]*gripql.Graph, error) { + return parseGraphFile(relpath, "json", "") +} + +func ParseJsonSchema(relpath string, graphName string) ([]*gripql.Graph, error) { + return parseGraphFile(relpath, "jSchema", graphName) +} + +func ParseYamlSchemaPath(relpath string, graphName string) ([]*gripql.Graph, error) { + return parseGraphFile(relpath, "ySchema", graphName) +} + +// GraphToYAMLString returns a graph formatted as a YAML string +func GraphToYAMLString(graph *gripql.Graph) (string, error) { + out, err := protojson.Marshal(graph) + if err != nil { + return "", fmt.Errorf("failed to marshal graph: %v", err) + } + sb, err := yaml.JSONToYAML(out) + if err != nil { + return "", fmt.Errorf("failed to marshal graph: %v", err) + } + return string(sb), nil +} + +// GraphToJSONString returns a graph formatted as a JSON string +func GraphToJSONString(graph *gripql.Graph) (string, error) { + m := protojson.MarshalOptions{ + UseEnumNumbers: false, + EmitUnpopulated: false, + Indent: " ", + UseProtoNames: false, + } + txt := m.Format(graph) + return txt, nil +} + +func GraphMapToProto(data map[string]interface{}) (*gripql.Graph, error) { + part, err := json.Marshal(data) + if err != nil { + return nil, err + } + g := &gripql.Graph{} + err = protojson.Unmarshal(part, g) + if err != nil { + return nil, err + } + return g, nil +} diff --git a/gripql/graph_test.go b/schema/graph_test.go similarity index 59% rename from gripql/graph_test.go rename to schema/graph_test.go index bf7c2eef3..6d04d6f81 100644 --- a/gripql/graph_test.go +++ b/schema/graph_test.go @@ -1,4 +1,4 @@ -package gripql +package schema import ( "reflect" @@ -8,65 +8,62 @@ import ( var testGraph = ` - graph: example1 vertices: - - gid: Human - label: Human - data: - name: STRING - height: NUMERIC - mass: NUMERIC - age: NUMERIC - homePlanet: STRING - - gid: Droid - label: Droid - data: - name: STRING - primaryFunction: STRING + - _id: Human + _label: Human + name: STRING + height: NUMERIC + mass: NUMERIC + age: NUMERIC + homePlanet: STRING + - _id: Droid + _label: Droid + name: STRING + primaryFunction: STRING edges: - - gid: (Human)--Owns->(Droid) - label: Owns - from: Human - to: Droid - data: - years: NUMERIC + - _id: (Human)--Owns->(Droid) + _label: Owns + _from: Human + _to: Droid + years: NUMERIC - graph: example2 vertices: - - gid: V1 - label: V1 - - gid: V2 - label: V2 + - _id: V1 + _label: V1 + - _id: V2 + _label: V2 edges: - - gid: (V1)--E1->(V2) - label: E1 - from: V1 - to: V2 + - _id: (V1)--E1->(V2) + _label: E1 + _from: V1 + _to: V2 ` var testGraph2 = ` graph: example2 vertices: - - gid: V1 - label: V1 - - gid: V2 - label: V2 + - _id: V1 + _label: V1 + - _id: V2 + _label: V2 edges: - - gid: (V1)--E1->(V2) - label: E1 - from: V1 - to: V2 + - _id: (V1)--E1->(V2) + _label: E1 + _from: V1 + _to: V2 ` // missing graph name var testGraph3 = ` vertices: - - gid: V1 - label: V1 - - gid: V2 - label: V2 + - _id: V1 + _label: V1 + - _id: V2 + _label: V2 edges: - - gid: (V1)--E1->(V2) - label: E1 - from: V1 - to: V2 + - _id: (V1)--E1->(V2) + _label: E1 + _from: V1 + _to: V2 ` func TestParseYAMLGraph(t *testing.T) { @@ -111,27 +108,24 @@ func TestGraphToYAML(t *testing.T) { } expected := `edges: -- data: - years: NUMERIC +- years: NUMERIC from: Human - gid: (Human)--Owns->(Droid) - label: Owns - to: Droid + _id: (Human)--Owns->(Droid) + _label: Owns + _to: Droid graph: example1 vertices: -- data: - age: NUMERIC - height: NUMERIC - homePlanet: STRING - mass: NUMERIC - name: STRING - gid: Human - label: Human -- data: - name: STRING - primaryFunction: STRING - gid: Droid - label: Droid +- _id: Human + _label: Human + age: NUMERIC + height: NUMERIC + homePlanet: STRING + mass: NUMERIC + name: STRING +- _id: Droid + _label: Droid + name: STRING + primaryFunction: STRING ` actual, err := GraphToYAMLString(graphs[0]) @@ -167,34 +161,30 @@ func TestGraphToJSON(t *testing.T) { "graph": "example1", "vertices": [ { - "gid": "Human", - "label": "Human", - "data": { - "age": "NUMERIC", - "height": "NUMERIC", - "homePlanet": "STRING", - "mass": "NUMERIC", - "name": "STRING" - } + "_id": "Human", + "_label": "Human", + "age": "NUMERIC", + "height": "NUMERIC", + "homePlanet": "STRING", + "mass": "NUMERIC", + "name": "STRING" + }, { - "gid": "Droid", - "label": "Droid", - "data": { - "name": "STRING", - "primaryFunction": "STRING" - } + "_id": "Droid", + "_label": "Droid", + "name": "STRING", + "primaryFunction": "STRING" + } ], "edges": [ { - "gid": "(Human)--Owns-\u003e(Droid)", - "label": "Owns", - "from": "Human", - "to": "Droid", - "data": { - "years": "NUMERIC" - } + "_id": "(Human)--Owns-\u003e(Droid)", + "_label": "Owns", + "_from": "Human", + "_to": "Droid", + "years": "NUMERIC" } ] }` diff --git a/schema/scan.go b/schema/scan.go new file mode 100644 index 000000000..4b9a629f1 --- /dev/null +++ b/schema/scan.go @@ -0,0 +1,104 @@ +package schema + +import ( + "context" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/util" + "google.golang.org/protobuf/types/known/structpb" +) + +type edgeKey struct { + label, to, from string +} + +type edgeMap map[edgeKey]any + +func stringInSlice(a string, list []string) bool { + for _, b := range list { + if b == a { + return true + } + } + return false +} + +// ScanSchema attempts to construct a schema of a graph by sampling vertices and edges +// This version of the schema scanner (vs the ones found in the drivers) can be run +// via the client library +func ScanSchema(conn gripql.Client, graph string, sampleCount uint32, exclude []string) (*gripql.Graph, error) { + + labelRes, err := conn.ListLabels(graph) + if err != nil { + return nil, err + } + + vList := []*gripql.Vertex{} + for _, label := range labelRes.VertexLabels { + if stringInSlice(label, exclude) { + continue + } + schema := map[string]any{} + log.Infof("Scanning %s\n", label) + nodeQuery := gripql.V().HasLabel(label).Limit(sampleCount) + nodeRes, err := conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: nodeQuery.Statements}) + if err == nil { + for row := range nodeRes { + v := row.GetVertex() + data := v.Data.AsMap() + ds := gripql.GetDataFieldTypes(data) + util.MergeMaps(schema, ds) + } + sValue, err := structpb.NewStruct(schema) + if err != nil { + log.Error(err) + } + vList = append(vList, &gripql.Vertex{Id: label, Label: "Vertex", Data: sValue}) + } else { + log.Errorf("Traversal error: %s", err) + } + } + + //TODO: fix this bit + eList := []*gripql.Edge{} + /* + for _, elabel := range labelRes.EdgeLabels { + if stringInSlice(elabel, exclude) { + continue + } + log.Infof("Scanning edge %s\n", elabel) + edgeQuery := gripql.E().HasLabel(elabel).Limit(sampleCount).As("edge").Out().Fields().As("to").Select("edge").In().Fields().As("from").Select("edge", "from", "to") + edgeRes, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: edgeQuery.Statements}) + if err == nil { + labelSchema := edgeMap{} + for row := range edgeRes { + sel := row.GetSelections().Selections + edge := sel["edge"].GetEdge() + src := sel["from"].GetVertex() + dst := sel["to"].GetVertex() + ds := gripql.GetDataFieldTypes(edge.Data.AsMap()) + k := edgeKey{to: dst.Label, from: src.Label, label: edge.Label} + if p, ok := labelSchema[k]; ok { + labelSchema[k] = util.MergeMaps(p, ds) + } else { + labelSchema[k] = ds + } + } + for k, v := range labelSchema { + sValue, _ := structpb.NewStruct(v.(map[string]interface{})) + eSchema := &gripql.Edge{ + Id: fmt.Sprintf("(%s)-%s->(%s)", k.from, k.label, k.to), + Label: k.label, + From: k.from, + To: k.to, + Data: sValue, + } + eList = append(eList, eSchema) + } + } + } + */ + + return &gripql.Graph{Graph: graph, Vertices: vList, Edges: eList}, nil +} diff --git a/server/api.go b/server/api.go index c3498e19d..4d9b38b3c 100644 --- a/server/api.go +++ b/server/api.go @@ -1,19 +1,28 @@ package server import ( + "errors" "fmt" "io" + "runtime" + "strings" "sync" + "sync/atomic" "github.com/bmeg/grip/engine/pipeline" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripper" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/schema" "github.com/bmeg/grip/util" + "github.com/bmeg/jsonschema/v6" + "github.com/bmeg/jsonschemagraph/graph" "golang.org/x/net/context" + "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/encoding/protojson" ) // Traversal parses a traversal request and streams the results back @@ -181,7 +190,7 @@ func (server *GripServer) addVertex(ctx context.Context, elem *gripql.GraphEleme if err != nil { return nil, err } - return &gripql.EditResult{Id: elem.Vertex.Gid}, nil + return &gripql.EditResult{Id: elem.Vertex.Id}, nil } // AddEdge adds an edge to the graph @@ -203,8 +212,8 @@ func (server *GripServer) addEdge(ctx context.Context, elem *gripql.GraphElement } edge := elem.Edge - if edge.Gid == "" { - edge.Gid = util.UUID() + if edge.Id == "" { + edge.Id = util.UUID() } err = edge.Validate() if err != nil { @@ -215,101 +224,310 @@ func (server *GripServer) addEdge(ctx context.Context, elem *gripql.GraphElement if err != nil { return nil, err } - return &gripql.EditResult{Id: edge.Gid}, nil + return &gripql.EditResult{Id: edge.Id}, nil +} + +func (server *GripServer) BulkAddRaw(stream gripql.Edit_BulkAddRawServer) error { + ctx := stream.Context() + inputCh := make(chan *gripql.RawJson, 100) + elementCh := make(chan *gdbi.GraphElement, 1000) + errCh := make(chan error, 100) + var insertCount int32 + var once sync.Once + var schema *graph.GraphSchema + var schemaErr error + var wg sync.WaitGroup + var producerWG sync.WaitGroup + + // Receive first class + firstClass, err := stream.Recv() + if err != nil { + return fmt.Errorf("initial receive failed: %w", err) + } + + graphName := firstClass.Graph + gdb, err := server.getGraphDB(graphName) + if err != nil { + return fmt.Errorf("get graph DB failed: %w", err) + } + + gdbiGraph, err := gdb.Graph(graphName) + if err != nil { + return fmt.Errorf("get graph failed: %w", err) + } + + // Load schema once + loadSchema := func() { + sch, err := server.getGraph(graphName + "__schema__") + if err != nil { + schemaErr = fmt.Errorf("get schema failed: %w", err) + return + } + schema, err = server.LoadSchemas(sch, &graph.GraphSchema{Classes: map[string]*jsonschema.Schema{}, Compiler: nil}) + if err != nil { + schemaErr = fmt.Errorf("load schema failed: %w", err) + } + } + + // Start bulk add goroutine + wg.Add(1) + go func() { + defer wg.Done() + if err := gdbiGraph.BulkAdd(elementCh); err != nil { + log.WithFields(log.Fields{"graph": graphName, "error": err}).Error("BulkAddRaw: bulk add error") + errCh <- fmt.Errorf("bulk add failed: %w", err) + } + }() + + // Start worker goroutines + for range runtime.NumCPU() { + producerWG.Add(1) + go func() { + defer producerWG.Done() + for class := range inputCh { + select { + case <-ctx.Done(): + errCh <- ctx.Err() + return + default: + } + + once.Do(loadSchema) + if schemaErr != nil { + errCh <- schemaErr + continue + } + + classData := class.Data.AsMap() + resourceType, ok := classData["resourceType"].(string) + if !ok { + err := fmt.Errorf("row %v does not have required field resourceType", classData) + log.WithFields(log.Fields{"error": err}).Error("BulkAddRaw: streaming error") + errCh <- err + continue + } + + result, err := schema.Generate(resourceType, classData, class.ExtraArgs.AsMap()) + if err != nil { + log.WithFields(log.Fields{"error": err}).Errorf("BulkAddRaw: validation error for %s: %v", resourceType, classData) + errCh <- fmt.Errorf("validation failed for %s: %w", resourceType, err) + continue + } + + for _, element := range result { + if element.Vertex != nil { + elementCh <- &gdbi.GraphElement{ + Vertex: &gdbi.Vertex{ + ID: element.Vertex.Id, + Data: element.Vertex.Data.AsMap(), + Label: element.Vertex.Label, + }, + Graph: graphName, + } + } else if element.Edge != nil { + elementCh <- &gdbi.GraphElement{ + Edge: &gdbi.Edge{ + ID: element.Edge.Id, + Label: element.Edge.Label, + From: element.Edge.From, + To: element.Edge.To, + Data: element.Edge.Data.AsMap(), + }, + Graph: graphName, + } + } + atomic.AddInt32(&insertCount, 1) + } + } + }() + } + + // Receiver goroutine + inputCh <- firstClass + producerWG.Add(1) + go func() { + defer producerWG.Done() + defer close(inputCh) + for { + class, err := stream.Recv() + if err == io.EOF { + break + } + if err != nil { + errCh <- fmt.Errorf("receive failed: %w", err) + break + } + select { + case <-ctx.Done(): + errCh <- ctx.Err() + return + case inputCh <- class: + } + } + }() + + // Collect errors + var retErrs []string + doneCollecting := make(chan struct{}) + go func() { + defer close(doneCollecting) + for err := range errCh { + retErrs = append(retErrs, err.Error()) + } + }() + + // Wait for completion + producerWG.Wait() + close(elementCh) + wg.Wait() + close(errCh) + <-doneCollecting + + // Return result with all collected errors + return stream.SendAndClose(&gripql.BulkJsonEditResult{ + InsertCount: insertCount, + Errors: retErrs, + }) } -// BulkAdd a stream of inputs and loads them into the graph func (server *GripServer) BulkAdd(stream gripql.Edit_BulkAddServer) error { - var graphName string var insertCount int32 var errorCount int32 - - elementStream := make(chan *gdbi.GraphElement, 100) - wg := &sync.WaitGroup{} + currentGraph := "" + var elementStream chan *gdbi.GraphElement + var processErr error + + ctx := stream.Context() + eg, opCtx := errgroup.WithContext(ctx) + + // Function to start a new BulkAdd goroutine for a graph + startBulkAdd := func(graphName string, gdb gdbi.GraphInterface) chan *gdbi.GraphElement { + newStream := make(chan *gdbi.GraphElement, 100) + eg.Go(func() error { + log.WithFields(log.Fields{"graph": graphName}).Info("BulkAdd: streaming elements to graph") + if err := gdb.BulkAdd(newStream); err != nil { + log.WithFields(log.Fields{"graph": graphName, "error": err}).Error("BulkAdd: error") + atomic.AddInt32(&errorCount, 1) + return err + } + return nil + }) + return newStream + } for { + // Check if context is done (client cancellation or goroutine error) + select { + case <-opCtx.Done(): + break + default: + // Continue processing + } + element, err := stream.Recv() if err == io.EOF { break } if err != nil { log.WithFields(log.Fields{"error": err}).Error("BulkAdd: streaming error") - errorCount++ + atomic.AddInt32(&errorCount, 1) + processErr = err break } if isSchema(element.Graph) { - err := "cannot add element to schema graph" + err := errors.New("cannot add element to schema graph") log.WithFields(log.Fields{"error": err}).Error("BulkAdd: error") - errorCount++ + atomic.AddInt32(&errorCount, 1) continue } - // create a BulkAdd stream per graph - // close and switch when a new graph is encountered - if element.Graph != graphName { - close(elementStream) + // Switch graphs if needed + if element.Graph != currentGraph { + if elementStream != nil { + close(elementStream) + } + gdb, err := server.getGraphDB(element.Graph) if err != nil { - errorCount++ + log.WithFields(log.Fields{"error": err}).Error("BulkAdd: error getting graph DB") + atomic.AddInt32(&errorCount, 1) continue } graph, err := gdb.Graph(element.Graph) if err != nil { log.WithFields(log.Fields{"error": err}).Error("BulkAdd: error") - errorCount++ + atomic.AddInt32(&errorCount, 1) continue } - graphName = element.Graph - elementStream = make(chan *gdbi.GraphElement, 100) - - wg.Add(1) - go func() { - log.WithFields(log.Fields{"graph": element.Graph}).Info("BulkAdd: streaming elements to graph") - err := graph.BulkAdd(elementStream) - if err != nil { - log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Error("BulkAdd: error") - // not a good representation of the true number of errors - errorCount++ - } - wg.Done() - }() + currentGraph = element.Graph + elementStream = startBulkAdd(currentGraph, graph) } if element.Vertex != nil { - err := element.Vertex.Validate() - if err != nil { - errorCount++ - log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: vertex validation failed") + if err := element.Vertex.Validate(); err != nil { + log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: vertex validation failed for vertex: %#v", element.Vertex) + atomic.AddInt32(&errorCount, 1) } else { - insertCount++ - elementStream <- gdbi.NewGraphElement(element) + select { + case <-opCtx.Done(): + // Context done, stop processing + case elementStream <- gdbi.NewGraphElement(element): + atomic.AddInt32(&insertCount, 1) + } } } - if element.Edge != nil { - if element.Edge.Gid == "" { - element.Edge.Gid = util.UUID() + if element.Edge.Id == "" { + element.Edge.Id = util.UUID() } - err := element.Edge.Validate() - if err != nil { - errorCount++ - log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: edge validation failed") + if err := element.Edge.Validate(); err != nil { + log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: edge validation failed for edge: %#v", element.Edge) + atomic.AddInt32(&errorCount, 1) } else { - insertCount++ - elementStream <- gdbi.NewGraphElement(element) + select { + case <-opCtx.Done(): + // Context done, stop processing + case elementStream <- gdbi.NewGraphElement(element): + atomic.AddInt32(&insertCount, 1) + } } } } - close(elementStream) - wg.Wait() - + if elementStream != nil { + close(elementStream) + } + egErr := eg.Wait() + if processErr != nil { + return processErr + } + if egErr != nil { + return egErr + } return stream.SendAndClose(&gripql.BulkEditResult{InsertCount: insertCount, ErrorCount: errorCount}) } +func (server *GripServer) BulkDelete(ctx context.Context, delete *gripql.DeleteData) (*gripql.EditResult, error) { + gdb, err := server.getGraphDB(delete.Graph) + if err != nil { + return nil, err + } + graph, err := gdb.Graph(delete.Graph) + if err != nil { + return nil, err + } + + err = graph.BulkDel(&gdbi.DeleteData{Graph: delete.Graph, Vertices: delete.Vertices, Edges: delete.Edges}) + if err != nil { + log.WithFields(log.Fields{"graph": delete.Graph, "error": err}) + return nil, err + } + return &gripql.EditResult{Id: util.UUID()}, nil +} + // DeleteVertex deletes a vertex from the server func (server *GripServer) DeleteVertex(ctx context.Context, elem *gripql.ElementID) (*gripql.EditResult, error) { if isSchema(elem.Graph) { @@ -440,7 +658,6 @@ func (server *GripServer) GetSchema(ctx context.Context, elem *gripql.GraphID) ( } return nil, status.Errorf(codes.NotFound, fmt.Sprintf("graph %s: schema not found", elem.Graph)) } - if schema.Graph == "" { schema.Graph = elem.Graph } @@ -471,10 +688,34 @@ func (server *GripServer) AddSchema(ctx context.Context, req *gripql.Graph) (*gr if err != nil { return nil, fmt.Errorf("failed to store new schema: %v", err) } - server.schemas[req.Graph] = req + if !strings.HasSuffix(req.Graph, schemaSuffix) { + req.Graph = req.Graph + schemaSuffix + } + schema, err := server.getGraph(req.Graph) + if err != nil { + log.Errorln("Error in server.getGraph: ", err) + } else { + server.schemas[strings.TrimSuffix(req.Graph, schemaSuffix)] = schema + } return &gripql.EditResult{Id: req.Graph}, nil } +// AddJsonSchema adds a jsonschema to grip as a graph +func (server *GripServer) AddJsonSchema(ctx context.Context, rawjson *gripql.RawJson) (*gripql.EditResult, error) { + bytes, err := protojson.Marshal(rawjson.Data) + if err != nil { + fmt.Printf("Failed to marshal data to bytes: %v\n", err) + return nil, err + } + req, err := schema.ParseJSchema(bytes, rawjson.Graph) + if err != nil { + log.Errorf("Failed to parse schema data: %v\n", err) + return nil, err + } + res, err := server.AddSchema(ctx, req[0]) + return res, err +} + // GetMapping returns the schema of a specific graph in the database func (server *GripServer) GetMapping(ctx context.Context, elem *gripql.GraphID) (*gripql.Graph, error) { if !server.graphExists(elem.Graph) { diff --git a/server/endpoints.go b/server/endpoints.go index 605924978..4adff8840 100644 --- a/server/endpoints.go +++ b/server/endpoints.go @@ -9,11 +9,12 @@ import ( "github.com/bmeg/grip/log" ) -type EndpointSetupFunc func(client gripql.Client) (http.Handler, error) +type EndpointSetupFunc func(client gripql.Client, config map[string]string) (http.Handler, error) var endpointMap = map[string]EndpointSetupFunc{} +var endpointConfig = map[string]map[string]string{} -func (server *GripServer) AddEndpoint(name string, path string) error { +func (server *GripServer) AddEndpoint(name string, path string, config map[string]string) error { plg, err := plugin.Open(path) if err != nil { @@ -25,9 +26,10 @@ func (server *GripServer) AddEndpoint(name string, path string) error { return err } fmt.Printf("Method: %#v\n", gen) - if x, ok := (gen).(func(client gripql.Client) (http.Handler, error)); ok { + if x, ok := (gen).(func(client gripql.Client, config map[string]string) (http.Handler, error)); ok { log.Infof("Plugin %s loaded", path) endpointMap[name] = x + endpointConfig[name] = config return nil } return fmt.Errorf("unable to call NewHTTPHandler method") diff --git a/server/job_manager.go b/server/job_manager.go index 081b85549..a2339c50f 100644 --- a/server/job_manager.go +++ b/server/job_manager.go @@ -22,7 +22,7 @@ func (server *GripServer) Submit(ctx context.Context, query *gripql.GraphQuery) return nil, err } compiler := graph.Compiler() - pipe, err := compiler.Compile(query.Query, nil) + pipe, err := compiler.Compile(query.Query, &gdbi.CompileOptions{StoreMarks: true}) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (server *GripServer) Submit(ctx context.Context, query *gripql.GraphQuery) &jobstorage.Stream{ DataType: dataType, MarkTypes: markTypes, - Pipe: res, + Pipe: res.Outputs, Query: query.Query, }) return &gripql.QueryJob{ @@ -125,9 +125,12 @@ func (server *GripServer) ResumeJob(query *gripql.ExtendQuery, srv gripql.Job_Re return err } compiler := graph.Compiler() - log.Infof("Compiling resume pipeline: %s", stream.DataType) - pipe, err := compiler.Compile(query.Query, &gdbi.CompileOptions{PipelineExtension: stream.DataType, ExtensionMarkTypes: stream.MarkTypes}) + log.Debugf("Compiling resume pipeline: %s -> %s", stream.DataType, query.String()) + pipe, err := compiler.Compile(query.Query, + &gdbi.CompileOptions{Extends: &gdbi.PipelineExtension{StartType: stream.DataType, MarksTypes: stream.MarkTypes}}, + ) if err != nil { + log.Debugf("User query compile error: %s", err) cancel() go func() { for range stream.Pipe { diff --git a/server/marshaler.go b/server/marshaler.go index af9489e5c..a25c89f94 100644 --- a/server/marshaler.go +++ b/server/marshaler.go @@ -3,8 +3,11 @@ package server import ( "io" + "github.com/bmeg/grip/gripql" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "golang.org/x/net/context" "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/proto" ) // MarshalClean is a shim class to 'fix' outgoing streamed messages @@ -18,8 +21,8 @@ type MarshalClean struct { func NewMarshaler() runtime.Marshaler { return &MarshalClean{ m: &runtime.JSONPb{ - protojson.MarshalOptions{EmitUnpopulated: true}, - protojson.UnmarshalOptions{}, + MarshalOptions: protojson.MarshalOptions{EmitUnpopulated: true}, + UnmarshalOptions: protojson.UnmarshalOptions{}, //EnumsAsInts: false, //EmitDefaults: true, //OrigName: true, @@ -39,7 +42,7 @@ func (mclean *MarshalClean) ContentType(i interface{}) string { func (mclean *MarshalClean) Marshal(v interface{}) ([]byte, error) { if x, ok := v.(map[string]interface{}); ok { if val, ok := x["result"]; ok { - return mclean.m.Marshal(val) + return mclean.Marshal(val) } } return mclean.m.Marshal(v) @@ -59,3 +62,37 @@ func (mclean *MarshalClean) NewEncoder(w io.Writer) runtime.Encoder { func (mclean *MarshalClean) Unmarshal(data []byte, v interface{}) error { return mclean.m.Unmarshal(data, v) } + +func FlattenRewriter(_ context.Context, response proto.Message) (interface{}, error) { + //fmt.Printf("Calling re-writer\n") + switch v := response.(type) { + case *gripql.Vertex: + out := v.Data.AsMap() + out["_id"] = v.Id + out["_label"] = v.Label + return out, nil + case *gripql.Edge: + out := v.Data.AsMap() + out["_id"] = v.Id + out["_label"] = v.Label + out["_to"] = v.To + out["_from"] = v.From + return out, nil + case *gripql.QueryResult: + if e := v.GetVertex(); e != nil { + out := e.Data.AsMap() + out["_id"] = e.Id + out["_label"] = e.Label + return map[string]any{"vertex": out}, nil + } else if e := v.GetEdge(); e != nil { + out := e.Data.AsMap() + out["_id"] = e.Id + out["_label"] = e.Label + out["_to"] = e.To + out["_from"] = e.From + return map[string]any{"edge": out}, nil + + } + } + return response, nil +} diff --git a/server/metagraphs.go b/server/metagraphs.go index f0cdc44b6..7f56cef74 100644 --- a/server/metagraphs.go +++ b/server/metagraphs.go @@ -11,6 +11,9 @@ import ( "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" "github.com/bmeg/grip/util/rpc" + "github.com/bmeg/jsonschema/v6" + "github.com/bmeg/jsonschemagraph/compile" + "github.com/bmeg/jsonschemagraph/graph" ) var schemaSuffix = "__schema__" @@ -30,7 +33,7 @@ func (server *GripServer) getGraph(graph string) (*gripql.Graph, error) { if err != nil { return nil, fmt.Errorf("failed to load existing schema: %v", err) } - res, err := conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: gripql.NewQuery().V().Statements}) + res, err := conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: gripql.NewQuery().V().Statements}) if err != nil { return nil, fmt.Errorf("failed to load existing schema: %v", err) } @@ -38,7 +41,7 @@ func (server *GripServer) getGraph(graph string) (*gripql.Graph, error) { for row := range res { vertices = append(vertices, row.GetVertex()) } - res, err = conn.Traversal(&gripql.GraphQuery{Graph: graph, Query: gripql.NewQuery().E().Statements}) + res, err = conn.Traversal(context.Background(), &gripql.GraphQuery{Graph: graph, Query: gripql.NewQuery().V().OutE().Statements}) if err != nil { return nil, fmt.Errorf("failed to load existing schema: %v", err) } @@ -137,16 +140,12 @@ func (server *GripServer) addFullGraph(ctx context.Context, graphName string, sc if graphName == "" { return fmt.Errorf("graph name is an empty string") } - if server.graphExists(graphName) { - _, err := server.DeleteGraph(ctx, &gripql.GraphID{Graph: graphName}) + if !server.graphExists(graphName) { + _, err := server.AddGraph(ctx, &gripql.GraphID{Graph: graphName}) if err != nil { - return fmt.Errorf("failed to remove previous schema: %v", err) + return fmt.Errorf("error creating graph '%s': %v", graphName, err) } } - _, err := server.AddGraph(ctx, &gripql.GraphID{Graph: graphName}) - if err != nil { - return fmt.Errorf("error creating graph '%s': %v", graphName, err) - } for _, v := range schema.Vertices { _, err := server.addVertex(ctx, &gripql.GraphElement{Graph: graphName, Vertex: v}) if err != nil { @@ -161,3 +160,29 @@ func (server *GripServer) addFullGraph(ctx context.Context, graphName string, sc } return nil } + +func (server *GripServer) LoadSchemas(sch *gripql.Graph, out *graph.GraphSchema) (*graph.GraphSchema, error) { + compiler := jsonschema.NewCompiler() + compiler.AssertVocabs() + vc, err := compile.GetHyperMediaVocab() + if err != nil { + return nil, fmt.Errorf("Hypermedia Vocab loading err %s", err) + } + compiler.RegisterVocabulary(vc) + out.Compiler = compiler + + for _, v := range sch.Vertices { + err = compiler.AddResource(v.Id, v.Data.AsMap()) + if err != nil { + return nil, fmt.Errorf("error adding resource for '%s': %w", v, err) + } + } + for _, v := range sch.Vertices { + sch, err := compiler.Compile(v.Id) + if err != nil { + return nil, fmt.Errorf("error compiling schema for '%s': %w", v.Id, err) + } + out.Classes[v.Label] = sch + } + return out, nil +} diff --git a/server/plugins.go b/server/plugins.go index 01c3552c1..07d1fb29b 100644 --- a/server/plugins.go +++ b/server/plugins.go @@ -3,7 +3,7 @@ package server import ( "context" "fmt" - "io/ioutil" + "os" "path/filepath" "strings" @@ -27,7 +27,7 @@ func (server *GripServer) StartPlugin(ctx context.Context, config *gripql.Plugin if _, ok := server.plugins[config.Name]; ok { return nil, fmt.Errorf("Plugin named %s already running", config.Name) } - workdir, err := ioutil.TempDir(server.conf.Server.WorkDir, "gripper-") + workdir, err := os.MkdirTemp(server.conf.Server.WorkDir, "gripper-") if err != nil { return nil, err } @@ -68,10 +68,8 @@ func (server *GripServer) ListDrivers(context.Context, *gripql.Empty) (*gripql.L return &gripql.ListDriversResponse{Drivers: out}, nil } - //------------- - type nullPluginServer struct { gripql.UnimplementedConfigureServer } diff --git a/server/server.go b/server/server.go index a693efa71..d35283ff2 100644 --- a/server/server.go +++ b/server/server.go @@ -4,7 +4,8 @@ package server import ( "bytes" "fmt" - "io/ioutil" + "io" + "maps" "net" "net/http" "os" @@ -12,18 +13,19 @@ import ( "strings" "time" + "github.com/IBM/sarama" "github.com/bmeg/grip/config" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/jobstorage" "github.com/bmeg/grip/log" + "github.com/bmeg/grip/sqlite" "github.com/felixge/httpsnoop" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "golang.org/x/net/context" "google.golang.org/grpc" - "github.com/bmeg/grip/elastic" esql "github.com/bmeg/grip/existing-sql" "github.com/bmeg/grip/grids" "github.com/bmeg/grip/gripper" @@ -31,7 +33,7 @@ import ( _ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself _ "github.com/bmeg/grip/kvi/boltdb" // import so bolt will register itself _ "github.com/bmeg/grip/kvi/leveldb" // import so level will register itself - _ "github.com/bmeg/grip/kvi/pebbledb" // import so level will register itself + _ "github.com/bmeg/grip/kvi/pebbledb" // import so pebbledb will register itself "github.com/bmeg/grip/mongo" "github.com/bmeg/grip/psql" ) @@ -42,15 +44,16 @@ type GripServer struct { gripql.UnimplementedEditServer gripql.UnimplementedJobServer gripql.UnimplementedConfigureServer - dbs map[string]gdbi.GraphDB //graph database drivers - graphMap map[string]string //mapping from graph name to graph database driver - conf *config.Config //global configuration - schemas map[string]*gripql.Graph //cached schemas - mappings map[string]*gripql.Graph //cached gripper graph mappings - plugins map[string]*Plugin - sources map[string]gripper.GRIPSourceClient - baseDir string - jStorage jobstorage.JobStorage + dbs map[string]gdbi.GraphDB //graph database drivers + graphMap map[string]string //mapping from graph name to graph database driver + conf *config.Config //global configuration + schemas map[string]*gripql.Graph //cached schemas + mappings map[string]*gripql.Graph //cached gripper graph mappings + plugins map[string]*Plugin + sources map[string]gripper.GRIPSourceClient + baseDir string + jStorage jobstorage.JobStorage + kafkaProducer sarama.SyncProducer } // NewGripServer initializes a GRPC server to connect to the graph store @@ -66,9 +69,7 @@ func NewGripServer(conf *config.Config, baseDir string, drivers map[string]gdbi. gdbs := map[string]gdbi.GraphDB{} if drivers != nil { - for i, d := range drivers { - gdbs[i] = d - } + maps.Copy(gdbs, drivers) } sources := map[string]gripper.GRIPSourceClient{} @@ -86,6 +87,8 @@ func NewGripServer(conf *config.Config, baseDir string, drivers map[string]gdbi. g, err := StartDriver(dConfig, sources) if err == nil { gdbs[name] = g + } else { + log.Errorf("Driver start error: %s", err) } } } @@ -99,6 +102,59 @@ func NewGripServer(conf *config.Config, baseDir string, drivers map[string]gdbi. sources: sources, } + if conf.Kafka.Username != nil && + conf.Kafka.Password != nil && + conf.Kafka.Hostname != nil && + conf.Kafka.Topic != nil { + + brokers := []string{*conf.Kafka.Hostname} + + config := sarama.NewConfig() + config.Version = sarama.V2_8_0_0 + config.Net.SASL.Enable = true + config.Net.SASL.User = *conf.Kafka.Username + config.Net.SASL.Password = *conf.Kafka.Password + config.Net.SASL.Mechanism = sarama.SASLTypePlaintext + config.Producer.Return.Successes = true + config.Net.SASL.Handshake = true + config.Net.TLS.Enable = false + + // Validate brokers are reachable + admin, err := sarama.NewClusterAdmin(brokers, config) + if err != nil { + log.Errorf("Error creating cluster admin: %v", err) + return nil, fmt.Errorf("failed to create Kafka cluster admin: %w", err) + } + + topics, err := admin.ListTopics() + if err != nil { + log.Errorf("Error listing topics: %v", err) + admin.Close() + return nil, fmt.Errorf("failed to list Kafka topics: %w", err) + } + + // Verify all configured topics exist + if _, exists := topics[*conf.Kafka.Topic]; !exists { + admin.Close() + return nil, fmt.Errorf("Kafka topic '%s' not found", *conf.Kafka.Topic) + } + + err = admin.Close() + if err != nil { + log.Errorf("Error closing Kafka admin client: %v", err) + return nil, fmt.Errorf("failed to close Kafka admin client: %w", err) + } + + // Create producer + producer, err := sarama.NewSyncProducer(brokers, config) + if err != nil { + log.Errorf("Failed to create Kafka producer: %v", err) + return nil, fmt.Errorf("failed to create Kafka producer: %w", err) + } + server.kafkaProducer = producer + log.Infof("Kafka producer initialized for brokers: %v, topic: %s", brokers, *conf.Kafka.Topic) + } + if conf.Default == "" { //if no default is found set it to the first driver found for i := range gdbs { @@ -126,14 +182,14 @@ func StartDriver(d config.DriverConfig, sources map[string]gripper.GRIPSourceCli return kvgraph.NewKVGraphDB("pebble", *d.Pebble) } else if d.Grids != nil { return grids.NewGraphDB(*d.Grids) - } else if d.Elasticsearch != nil { - return elastic.NewGraphDB(*d.Elasticsearch) } else if d.MongoDB != nil { return mongo.NewGraphDB(*d.MongoDB) } else if d.PSQL != nil { return psql.NewGraphDB(*d.PSQL) } else if d.ExistingSQL != nil { return esql.NewGraphDB(*d.ExistingSQL) + } else if d.Sqlite != nil { + return sqlite.NewGraphDB(*d.Sqlite) } else if d.Gripper != nil { return gripper.NewGDBFromConfig(d.Gripper.Graph, d.Gripper.Mapping, sources) } @@ -190,7 +246,10 @@ func (server *GripServer) Serve(pctx context.Context) error { // Setup RESTful proxy marsh := NewMarshaler() - grpcMux := runtime.NewServeMux(runtime.WithMarshalerOption("*/*", marsh)) + grpcMux := runtime.NewServeMux( + runtime.WithForwardResponseRewriter(FlattenRewriter), + runtime.WithMarshalerOption(runtime.MIMEWildcard, marsh), + ) mux := http.NewServeMux() // Setup GraphQL handler @@ -229,13 +288,25 @@ func (server *GripServer) Serve(pctx context.Context) error { gripql.DirectUnaryInterceptor(unaryAuthInt), gripql.DirectStreamInterceptor(streamAuthInt), ) - handler, err := setup(gripql.WrapClient(queryClient, writeClient, nil, nil)) + jobClient := gripql.NewJobDirectClient( + server, + gripql.DirectUnaryInterceptor(unaryAuthInt), + gripql.DirectStreamInterceptor(streamAuthInt), + ) + configureClient := gripql.NewConfigureDirectClient( + server, + gripql.DirectUnaryInterceptor(unaryAuthInt), + gripql.DirectStreamInterceptor(streamAuthInt), + ) + + cfg := endpointConfig[name] + handler, err := setup(gripql.WrapClient(queryClient, writeClient, jobClient, configureClient), cfg) if err == nil { log.Infof("Plugin added to /%s/", name) prefix := fmt.Sprintf("/%s/", name) mux.Handle(prefix, http.StripPrefix(prefix, handler)) } else { - log.Errorf("Unable to load plugin %s", name) + log.Errorf("Unable to load plugin %s: %s", name, err) } } @@ -251,7 +322,6 @@ func (server *GripServer) Serve(pctx context.Context) error { // HTTP middleware is injected here as well mux.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) { start := time.Now() - /* if len(server.conf.Server.BasicAuth) > 0 { resp.Header().Set("WWW-Authenticate", "Basic") @@ -281,9 +351,27 @@ func (server *GripServer) Serve(pctx context.Context) error { // copy body and return it to request var body []byte - if server.conf.Server.RequestLogging.Enable { - body, _ = ioutil.ReadAll(req.Body) - req.Body = ioutil.NopCloser(bytes.NewBuffer(body)) + if server.conf.Server.RequestLogging.Enable || server.kafkaProducer != nil { + body, _ = io.ReadAll(req.Body) + req.Body = io.NopCloser(bytes.NewBuffer(body)) + if server.kafkaProducer != nil { + // This should cover BulkAdd, Addvertex, Addedge, BulkDelete, DeleteVertex, DeleteEdge + // Metadata used on replication side to determine what action to do with message + msg := &sarama.ProducerMessage{ + Headers: []sarama.RecordHeader{ + {Key: []byte("PATH"), Value: []byte(req.URL.Path)}, + {Key: []byte("METHOD"), Value: []byte(req.Method)}}, + Topic: "gripHistory", + Value: sarama.ByteEncoder(body), + } + partition, offset, err := server.kafkaProducer.SendMessage(msg) + if err != nil { + log.Errorf("Failed to send Kafka message to topic %#v: %v", *&server.conf.Kafka.Topic, err) + } else { + log.Infof("Message sent to Kafka topic %s [partition %d, offset %d]", *server.conf.Kafka.Topic, partition, offset) + } + + } } // handle the request @@ -407,7 +495,9 @@ func (server *GripServer) Serve(pctx context.Context) error { if isSchema(graph) { log.WithFields(log.Fields{"graph": graph}).Debug("Loading existing schema into cache") schema, err := server.getGraph(graph) - if err == nil { + if err != nil { + log.Errorln("Error in server.getGraph: ", err) + } else { server.schemas[strings.TrimSuffix(graph, schemaSuffix)] = schema } } else if isMapping(graph) { @@ -422,11 +512,14 @@ func (server *GripServer) Serve(pctx context.Context) error { server.updateGraphMap() - if server.conf.Server.AutoBuildSchemas { - go func() { - server.cacheSchemas(ctx) - }() - } + /* + * Deprecate / remove this for now. Add support for autogenerated schema another time + if server.conf.Server.AutoBuildSchemas { + go func() { + server.cacheSchemas(ctx) + }() + } + */ <-ctx.Done() //This will hold until canceled, usually from kill signal log.Infoln("shutting down RPC server...") @@ -445,6 +538,15 @@ func (server *GripServer) Serve(pctx context.Context) error { } } + if server.kafkaProducer != nil { + if err := server.kafkaProducer.Close(); err != nil { + log.Errorf("Error closing Kafka producer: %v", err) + return fmt.Errorf("failed to close Kafka producer: %w", err) + } + server.kafkaProducer = nil + log.Infof("Kafka producer closed") + } + server.ClosePlugins() if grpcErr != nil || httpErr != nil { diff --git a/sqlite/graph.go b/sqlite/graph.go new file mode 100644 index 000000000..0fa117a7b --- /dev/null +++ b/sqlite/graph.go @@ -0,0 +1,923 @@ +package sqlite + +import ( + "context" + "encoding/json" + "fmt" + "strings" + "time" + + "github.com/bmeg/grip/engine/core" + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/psql" + "github.com/bmeg/grip/timestamp" + "github.com/bmeg/grip/util" + "github.com/jmoiron/sqlx" + + _ "github.com/mattn/go-sqlite3" +) + +const batchSize int = 100 + +type Graph struct { + db *sqlx.DB + ts *timestamp.Timestamp + v string + e string + graph string +} + +// GetTimestamp gets the timestamp of last update +func (g *Graph) GetTimestamp() string { + return g.ts.Get(g.graph) +} + +// AddVertex adds a vertex to the database +func (g *Graph) AddVertex(vertices []*gdbi.Vertex) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("AddVertex: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, data) VALUES ($1, $2, $3) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + data = excluded.data;`, + g.v, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("AddVertex: Prepare Stmt: %v", err) + } + + for _, v := range vertices { + js, err := json.Marshal(v.Data) + if err != nil { + return fmt.Errorf("AddVertex: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(v.ID, v.Label, js) + if err != nil { + return fmt.Errorf("AddVertex: Stmt.Exec: %v", err) + } + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("AddVertex: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("AddVertex: Txn.Commit: %v", err) + } + + return nil +} + +func (g *Graph) StreamVertices(vertices <-chan *gdbi.Vertex, workers int) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("StreamVertices: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, data) VALUES ($1, $2, $3) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + data = excluded.data;`, + g.v, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("StreamVertices: Prepare Stmt: %v", err) + } + + for v := range vertices { + js, err := json.Marshal(v.Data) + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(v.ID, v.Label, js) + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Exec: %v", err) + } + + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("StreamVertices: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("StreamVertices: Txn.Commit: %v", err) + } + + return nil +} + +func (g *Graph) StreamEdges(edges <-chan *gdbi.Edge, workers int) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("StreamEdges: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, "from", "to", data) VALUES ($1, $2, $3, $4, $5) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + "from" = excluded."from", + "to" = excluded."to", + data = excluded.data;`, + g.e, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("StreamEdges: Prepare Stmt: %v", err) + } + + for e := range edges { + js, err := json.Marshal(e.Data) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(e.ID, e.Label, e.From, e.To, js) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("StreamEdges: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("StreamEdges: Txn.Commit: %v", err) + } + + return nil +} + +func (g *Graph) AddEdge(edges []*gdbi.Edge) error { + txn, err := g.db.Begin() + if err != nil { + return fmt.Errorf("AddEdge: Begin Txn: %v", err) + } + + s := fmt.Sprintf( + `INSERT INTO %s (id, label, "from", "to", data) VALUES ($1, $2, $3, $4, $5) + ON CONFLICT (id) DO UPDATE SET + id = excluded.id, + label = excluded.label, + "from" = excluded."from", + "to" = excluded."to", + data = excluded.data;`, + g.e, + ) + stmt, err := txn.Prepare(s) + if err != nil { + return fmt.Errorf("AddEdge: Prepare Stmt: %v", err) + } + + for _, e := range edges { + js, err := json.Marshal(e.Data) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + _, err = stmt.Exec(e.ID, e.Label, e.From, e.To, js) + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Exec: %v", err) + } + } + + err = stmt.Close() + if err != nil { + return fmt.Errorf("AddEdge: Stmt.Close: %v", err) + } + + err = txn.Commit() + if err != nil { + return fmt.Errorf("AddEdge: Txn.Commit: %v", err) + } + + return nil +} + +func (g *Graph) GetVertex(id string, load bool) *gdbi.Vertex { + q := fmt.Sprintf(`SELECT id, label FROM %s WHERE id='%s'`, g.v, id) + if load { + q = fmt.Sprintf(`SELECT * FROM %s WHERE id='%s'`, g.v, id) + } + vrow := &psql.Row{} + err := g.db.QueryRowx(q).StructScan(vrow) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetVertex: StructScan") + return nil + } + vertex, err := psql.ConvertVertexRow(vrow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertex: ConvertVertexRow") + return nil + } + return vertex +} + +func (g *Graph) GetEdge(id string, load bool) *gdbi.Edge { + q := fmt.Sprintf(`SELECT id, label, "from", "to" FROM %s WHERE id='%s'`, g.e, id) + if load { + q = fmt.Sprintf(`SELECT * FROM %s WHERE id='%s'`, g.e, id) + } + erow := &psql.Row{} + err := g.db.QueryRowx(q).StructScan(erow) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetEdge: StructScan") + return nil + } + edge, err := psql.ConvertEdgeRow(erow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetEdge: convertEdgeRow") + return nil + } + return edge +} + +func (g *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error { + return util.StreamBatch(stream, 50, g.graph, g.StreamVertices, g.StreamEdges) +} + +func (g *Graph) BulkDel(Data *gdbi.DeleteData) error { + for _, v := range Data.Edges { + if err := g.DelEdge(v); err != nil { + return err + } + } + for _, v := range Data.Vertices { + if err := g.DelVertex(v); err != nil { + return err + } + } + return nil +} + +// Compiler returns a query compiler that uses the graph +func (g *Graph) Compiler() gdbi.Compiler { + return core.NewCompiler(g, core.IndexStartOptimize) //TODO: probably a better optimizer for vertex label search) +} + +// DelEdge is not implemented in the SQL driver +func (g *Graph) DelEdge(key string) error { + stmt := fmt.Sprintf("DELETE FROM %s WHERE id='%s'", g.e, key) + _, err := g.db.Exec(stmt) + if err != nil { + return fmt.Errorf("deleting edge: %v", err) + } + return nil +} + +// DelVertex is not implemented in the SQL driver +func (g *Graph) DelVertex(key string) error { + stmt := fmt.Sprintf("DELETE FROM %s WHERE id='%s'", g.v, key) + _, err := g.db.Exec(stmt) + if err != nil { + return fmt.Errorf("deleting vertex: %v", err) + } + + stmt = fmt.Sprintf(`DELETE FROM %s WHERE "from"='%s'`, g.e, key) + _, err = g.db.Exec(stmt) + if err != nil { + return fmt.Errorf("deleting outgoing edges for %s: %v", key, err) + } + + stmt = fmt.Sprintf(`DELETE FROM %s WHERE "to"='%s'`, g.e, key) + _, err = g.db.Exec(stmt) + if err != nil { + return fmt.Errorf("deleting incoming edges for %s: %v", key, err) + } + + return nil +} + +// GetVertexList produces a channel of all vertices in the graph +func (g *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Vertex { + o := make(chan *gdbi.Vertex, 100) + go func() { + defer close(o) + q := fmt.Sprintf("SELECT id, label FROM %s", g.v) + if load { + q = fmt.Sprintf(`SELECT * FROM %s`, g.v) + } + rows, err := g.db.QueryxContext(ctx, q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexList: QueryxContext") + return + } + defer rows.Close() + for rows.Next() { + vrow := &psql.Row{} + if err := rows.StructScan(vrow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexList: StructScan") + continue + } + v, err := psql.ConvertVertexRow(vrow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexList: convertVertexRow") + continue + } + o <- v + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexList: iterating") + } + }() + return o +} + +// VertexLabelScan produces a channel of all vertex ids where the vertex label matches `label` +func (g *Graph) VertexLabelScan(ctx context.Context, label string) chan string { + o := make(chan string, 100) + go func() { + defer close(o) + q := fmt.Sprintf("SELECT id FROM %s WHERE label='%s'", g.v, label) + rows, err := g.db.QueryxContext(ctx, q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: QueryxContext") + return + } + defer rows.Close() + for rows.Next() { + var id string + if err := rows.Scan(&id); err != nil { + log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: Scan") + continue + } + o <- id + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("VertexLabelScan: iterating") + } + }() + return o +} + +// GetEdgeList produces a channel of all edges in the graph +func (g *Graph) GetEdgeList(ctx context.Context, load bool) <-chan *gdbi.Edge { + o := make(chan *gdbi.Edge, 100) + go func() { + defer close(o) + q := fmt.Sprintf(`SELECT id, label, "from", "to" FROM %s`, g.e) + if load { + q = fmt.Sprintf(`SELECT * FROM %s`, g.e) + } + rows, err := g.db.QueryxContext(ctx, q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: QueryxContext") + return + } + defer rows.Close() + for rows.Next() { + erow := &psql.Row{} + if err := rows.StructScan(erow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: StructScan") + continue + } + e, err := psql.ConvertEdgeRow(erow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: convertEdgeRow") + continue + } + o <- e + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetEdgeList: iterating") + } + }() + return o +} + +// GetVertexChannel is passed a channel of vertex ids and it produces a channel of vertices +func (g *Graph) GetVertexChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool) chan gdbi.ElementLookup { + batches := gdbi.LookupBatcher(reqChan, batchSize, time.Microsecond) + + o := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(o) + for batch := range batches { + idBatch := make([]string, 0, len(batch)) + signals := []gdbi.ElementLookup{} + for i := range batch { + if batch[i].IsSignal() { + signals = append(signals, batch[i]) + } else { + idBatch = append(idBatch, fmt.Sprintf("'%s'", batch[i].ID)) + } + } + if len(idBatch) > 0 { + ids := strings.Join(idBatch, ", ") + //q := fmt.Sprintf("SELECT id, label FROM %s WHERE id IN (%s)", g.v, ids) + //if load { + q := fmt.Sprintf("SELECT * FROM %s WHERE id IN (%s)", g.v, ids) + //} + rows, err := g.db.Queryx(q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: Queryx") + return + } + chunk := map[string]*gdbi.Vertex{} + for rows.Next() { + vrow := &psql.Row{} + if err := rows.StructScan(vrow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: StructScan") + continue + } + //v, err := psql.ConvertVertexRow(vrow, load) + v, err := psql.ConvertVertexRow(vrow, true) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: convertVertexRow") + continue + } + chunk[v.ID] = v + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel: iterating") + } + for _, id := range batch { + if x, ok := chunk[id.ID]; ok { + id.Vertex = x + o <- id + } + } + rows.Close() + } + for i := range signals { + o <- signals[i] + } + } + }() + return o +} + +// GetOutChannel is passed a channel of vertex ids and finds the connected vertices via outgoing edges +func (g *Graph) GetOutChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { + batches := gdbi.LookupBatcher(reqChan, batchSize, time.Microsecond) + + o := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(o) + for batch := range batches { + idBatch := make([]string, 0, len(batch)) + batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) + batchMapReturnCount := make(map[string]int) + signals := []gdbi.ElementLookup{} + for i := range batch { + if batch[i].IsSignal() { + signals = append(signals, batch[i]) + } else { + idBatch = append(idBatch, fmt.Sprintf("'%s'", batch[i].ID)) + batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) + batchMapReturnCount[batch[i].ID] = 0 + } + } + if len(idBatch) > 0 { + ids := strings.Join(idBatch, ", ") + /*q := fmt.Sprintf( + `SELECT %s.id, %s.label, %s."from" FROM %s INNER JOIN %s ON %s."to"=%s.id WHERE %s."from" IN (%s)`, + // SELECT + g.v, g.v, g.e, + // FROM + g.v, + // INNER JOIN + g.e, + // ON + g.e, g.v, + // WHERE + g.e, + // IN + ids, + )*/ + //if load { + q := fmt.Sprintf( + `SELECT %s.*, %s."from" FROM %s INNER JOIN %s ON %s."to"=%s.id WHERE %s."from" IN (%s)`, + // SELECT + g.v, g.e, + // FROM + g.v, + // INNER JOIN + g.e, + // ON + g.e, g.v, + // WHERE + g.e, + // IN + ids, + ) + //} + if len(edgeLabels) > 0 { + labels := make([]string, len(edgeLabels)) + for i := range edgeLabels { + labels[i] = fmt.Sprintf("'%s'", edgeLabels[i]) + } + q = fmt.Sprintf("%s AND %s.label IN (%s)", q, g.e, strings.Join(labels, ", ")) + } + rows, err := g.db.Queryx(q) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetOutChannel: Queryx") + return + } + for rows.Next() { + vrow := &psql.Row{} + if err := rows.StructScan(vrow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutChannel: StructScan") + continue + } + //v, err := psql.ConvertVertexRow(vrow, load) + v, err := psql.ConvertVertexRow(vrow, true) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutChannel: convertVertexRow") + continue + } + r := batchMap[vrow.From] + batchMapReturnCount[vrow.From]++ + for _, ri := range r { + ri.Vertex = v + o <- ri + } + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutChannel: iterating") + } + rows.Close() + if emitNull { + for id, count := range batchMapReturnCount { + if count == 0 { + r := batchMap[id] + for _, ri := range r { + ri.Vertex = nil + o <- ri + } + } + } + } + } + for i := range signals { + o <- signals[i] + } + } + }() + return o +} + +// GetInChannel is passed a channel of vertex ids and finds the connected vertices via incoming edges +func (g *Graph) GetInChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { + batches := gdbi.LookupBatcher(reqChan, batchSize, time.Microsecond) + + o := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(o) + for batch := range batches { + idBatch := make([]string, 0, len(batch)) + batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) + batchMapReturnCount := make(map[string]int) + signals := []gdbi.ElementLookup{} + for i := range batch { + if batch[i].IsSignal() { + signals = append(signals, batch[i]) + } else { + idBatch = append(idBatch, fmt.Sprintf("'%s'", batch[i].ID)) + batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) + batchMapReturnCount[batch[i].ID] = 0 + } + } + if len(idBatch) > 0 { + ids := strings.Join(idBatch, ", ") + q := fmt.Sprintf( + `SELECT %s.id, %s.label, %s."to" FROM %s INNER JOIN %s ON %s."from"=%s.id WHERE %s."to" IN (%s)`, + // SELECT + g.v, g.v, g.e, + // FROM + g.v, + // INNER JOIN + g.e, + // ON + g.e, g.v, + // WHERE + g.e, + // IN + ids, + ) + if load { + q = fmt.Sprintf( + `SELECT %s.*, %s."to" FROM %s INNER JOIN %s ON %s."from"=%s.id WHERE %s."to" IN (%s)`, + // SELECT + g.v, g.e, + // FROM + g.v, + // INNER JOIN + g.e, + // ON + g.e, g.v, + // WHERE + g.e, + // IN + ids, + ) + } + if len(edgeLabels) > 0 { + labels := make([]string, len(edgeLabels)) + for i := range edgeLabels { + labels[i] = fmt.Sprintf("'%s'", edgeLabels[i]) + } + q = fmt.Sprintf("%s AND %s.label IN (%s)", q, g.e, strings.Join(labels, ", ")) + } + rows, err := g.db.Queryx(q) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetInChannel: Queryx") + return + } + for rows.Next() { + vrow := &psql.Row{} + if err := rows.StructScan(vrow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInChannel: StructScan") + continue + } + v, err := psql.ConvertVertexRow(vrow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInChannel: convertVertexRow") + continue + } + r := batchMap[vrow.To] + batchMapReturnCount[vrow.To]++ + for _, ri := range r { + ri.Vertex = v + o <- ri + } + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInChannel: iterating") + } + rows.Close() + if emitNull { + for id, count := range batchMapReturnCount { + if count == 0 { + r := batchMap[id] + for _, ri := range r { + ri.Vertex = nil + o <- ri + } + } + } + } + } + for i := range signals { + o <- signals[i] + } + } + }() + return o +} + +// GetOutEdgeChannel is passed a channel of vertex ids and finds the outgoing edges +func (g *Graph) GetOutEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { + batches := gdbi.LookupBatcher(reqChan, batchSize, time.Microsecond) + + o := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(o) + for batch := range batches { + idBatch := make([]string, 0, len(batch)) + batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) + batchMapReturnCount := make(map[string]int) + signals := []gdbi.ElementLookup{} + for i := range batch { + if batch[i].IsSignal() { + signals = append(signals, batch[i]) + } else { + idBatch = append(idBatch, fmt.Sprintf("'%s'", batch[i].ID)) + batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) + batchMapReturnCount[batch[i].ID] = 0 + } + } + if len(idBatch) > 0 { + ids := strings.Join(idBatch, ", ") + q := fmt.Sprintf( + `SELECT id, label, "from", "to" FROM %s WHERE %s."from" IN (%s)`, + // FROM + g.e, + // WHERE + g.e, + // IN + ids, + ) + if load { + q = fmt.Sprintf( + `SELECT * FROM %s WHERE %s."from" IN (%s)`, + // FROM + g.e, + // WHERE + g.e, + // IN + ids, + ) + } + if len(edgeLabels) > 0 { + labels := make([]string, len(edgeLabels)) + for i := range edgeLabels { + labels[i] = fmt.Sprintf("'%s'", edgeLabels[i]) + } + q = fmt.Sprintf("%s AND %s.label IN (%s)", q, g.e, strings.Join(labels, ", ")) + } + rows, err := g.db.Queryx(q) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetOutEdgeChannel: Queryx") + return + } + for rows.Next() { + erow := &psql.Row{} + if err := rows.StructScan(erow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel: StructScan") + continue + } + e, err := psql.ConvertEdgeRow(erow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel: convertEdgeRow") + continue + } + r := batchMap[erow.From] + batchMapReturnCount[erow.From]++ + for _, ri := range r { + ri.Edge = e + o <- ri + } + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel: iterating") + } + rows.Close() + if emitNull { + for id, count := range batchMapReturnCount { + if count == 0 { + r := batchMap[id] + for _, ri := range r { + ri.Edge = nil + o <- ri + } + } + } + } + } + for i := range signals { + o <- signals[i] + } + } + }() + return o +} + +// GetInEdgeChannel is passed a channel of vertex ids and finds the incoming edges +func (g *Graph) GetInEdgeChannel(ctx context.Context, reqChan chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup { + batches := gdbi.LookupBatcher(reqChan, batchSize, time.Microsecond) + + o := make(chan gdbi.ElementLookup, 100) + go func() { + defer close(o) + for batch := range batches { + idBatch := make([]string, 0, len(batch)) + batchMap := make(map[string][]gdbi.ElementLookup, len(batch)) + batchMapReturnCount := make(map[string]int) + signals := []gdbi.ElementLookup{} + for i := range batch { + if batch[i].IsSignal() { + signals = append(signals, batch[i]) + } else { + idBatch = append(idBatch, fmt.Sprintf("'%s'", batch[i].ID)) + batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i]) + batchMapReturnCount[batch[i].ID] = 0 + } + } + if len(idBatch) > 0 { + ids := strings.Join(idBatch, ", ") + q := fmt.Sprintf( + `SELECT id, label, "from", "to" FROM %s WHERE %s."to" IN (%s)`, + // FROM + g.e, + // WHERE + g.e, + // IN + ids, + ) + if load { + q = fmt.Sprintf( + `SELECT * FROM %s WHERE %s."to" IN (%s)`, + // FROM + g.e, + // WHERE + g.e, + // IN + ids, + ) + } + if len(edgeLabels) > 0 { + labels := make([]string, len(edgeLabels)) + for i := range edgeLabels { + labels[i] = fmt.Sprintf("'%s'", edgeLabels[i]) + } + q = fmt.Sprintf("%s AND %s.label IN (%s)", q, g.e, strings.Join(labels, ", ")) + } + rows, err := g.db.Queryx(q) + if err != nil { + log.WithFields(log.Fields{"error": err, "query": q}).Error("GetInEdgeChannel: Queryx") + return + } + for rows.Next() { + erow := &psql.Row{} + if err := rows.StructScan(erow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel: StructScan") + continue + } + e, err := psql.ConvertEdgeRow(erow, load) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel: convertEdgeRow") + continue + } + r := batchMap[erow.To] + batchMapReturnCount[erow.To]++ + for _, ri := range r { + ri.Edge = e + o <- ri + } + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel: iterating") + } + rows.Close() + if emitNull { + for id, count := range batchMapReturnCount { + if count == 0 { + r := batchMap[id] + for _, ri := range r { + ri.Edge = nil + o <- ri + } + } + } + } + } + for i := range signals { + o <- signals[i] + } + } + }() + return o +} + +// ListVertexLabels returns a list of vertex types in the graph +func (g *Graph) ListVertexLabels() ([]string, error) { + q := fmt.Sprintf("SELECT DISTINCT label FROM %s", g.v) + rows, err := g.db.Queryx(q) + if err != nil { + return nil, err + } + labels := []string{} + defer rows.Close() + for rows.Next() { + var l string + if err := rows.Scan(&l); err != nil { + return nil, err + } + labels = append(labels, l) + } + if err := rows.Err(); err != nil { + return nil, err + } + return labels, nil +} + +// ListEdgeLabels returns a list of edge types in the graph +func (g *Graph) ListEdgeLabels() ([]string, error) { + q := fmt.Sprintf("SELECT DISTINCT label FROM %s", g.e) + rows, err := g.db.Queryx(q) + if err != nil { + return nil, err + } + labels := []string{} + defer rows.Close() + for rows.Next() { + var l string + if err := rows.Scan(&l); err != nil { + return nil, err + } + labels = append(labels, l) + } + if err := rows.Err(); err != nil { + return nil, err + } + return labels, nil +} diff --git a/sqlite/graphdb.go b/sqlite/graphdb.go new file mode 100644 index 000000000..bceb7694a --- /dev/null +++ b/sqlite/graphdb.go @@ -0,0 +1,227 @@ +package sqlite + +import ( + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/bmeg/grip/gdbi" + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/timestamp" + "github.com/jmoiron/sqlx" +) + +// Config describes the configuration for the sql driver. +// See https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters for details. +type Config struct { + DBName string +} + +// GraphDB manages graphs in the database +type GraphDB struct { + db *sqlx.DB + ts *timestamp.Timestamp +} + +// Create dir/file structure from path string +func createFileWithDirs(path string) error { + var dir string + if strings.Contains(path, "/") { + dir = filepath.Dir(path) + } + if dir != "." && dir != "" { + err := os.MkdirAll(dir, 0755) + if err != nil { + return fmt.Errorf("failed to create directories: %w", err) + } + } + file, err := os.Create(path) + if err != nil { + return fmt.Errorf("failed to create file: %w", err) + } + defer file.Close() + return nil +} + +// NewGraphDB creates a new GraphDB graph database interface +func NewGraphDB(conf Config) (gdbi.GraphDB, error) { + log.Info("Starting Sqlite3 Driver") + err := createFileWithDirs(conf.DBName) + if err != nil { + return nil, err + } + db, err := sqlx.Connect("sqlite3", conf.DBName) + if err != nil { + return nil, fmt.Errorf("connecting to database: %v", err) + } + db.SetMaxIdleConns(10) + + stmt := "CREATE TABLE IF NOT EXISTS graphs (graph_name varchar PRIMARY KEY, sanitized_graph_name varchar NOT NULL, vertex_table varchar NOT NULL, edge_table varchar NOT NULL)" + _, err = db.Exec(stmt) + if err != nil { + return nil, fmt.Errorf("creating graphs table: %v", err) + } + + ts := timestamp.NewTimestamp() + gdb := &GraphDB{db, &ts} + for _, i := range gdb.ListGraphs() { + gdb.ts.Touch(i) + } + return gdb, nil +} + +// Close the connection +func (db *GraphDB) Close() error { + return db.db.Close() +} + +// AddGraph creates a new graph named `graph` +func (db *GraphDB) AddGraph(graph string) error { + err := gripql.ValidateGraphName(graph) + if err != nil { + return err + } + + sanitizedName := strings.Replace(graph, "-", "_", -1) + vertexTable := fmt.Sprintf("%s_vertices", sanitizedName) + edgeTable := fmt.Sprintf("%s_edges", sanitizedName) + + stmt := fmt.Sprintf("INSERT INTO graphs (graph_name, sanitized_graph_name, vertex_table, edge_table) VALUES ('%s', '%s', '%s', '%s') ON CONFLICT DO NOTHING", graph, sanitizedName, vertexTable, edgeTable) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("inserting row into graphs table: %v", err) + } + + stmt = fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s (id varchar PRIMARY KEY, label varchar NOT NULL, data jsonb)", vertexTable) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("creating vertex table: %v", err) + } + + toIndex := []string{"label"} + for _, f := range toIndex { + err := db.createIndex(vertexTable, f) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("AddGraph: creating index") + } + } + + stmt = fmt.Sprintf(`CREATE TABLE IF NOT EXISTS %s (id varchar PRIMARY KEY, label varchar NOT NULL, "from" varchar NOT NULL, "to" varchar NOT NULL, data jsonb)`, edgeTable) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("creating edge table: %v", err) + } + + toIndex = []string{"label", "from", "to"} + for _, f := range toIndex { + err := db.createIndex(edgeTable, f) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("AddGraph: creating index") + } + } + return nil +} + +func (db *GraphDB) createIndex(table, field string) error { + stmt := fmt.Sprintf(`CREATE INDEX IF NOT EXISTS %s_%s ON %s ("%s")`, table, field, table, field) + _, err := db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("creating index for table %s on field %s: %v", table, field, err) + } + return nil +} + +type graphInfo struct { + GraphName string + SanitizedGraphName string + VertexTable string + EdgeTable string +} + +func (db *GraphDB) getGraphInfo(graph string) (*graphInfo, error) { + q := fmt.Sprintf("SELECT * FROM graphs where graph_name='%s'", graph) + info := make(map[string]interface{}) + err := db.db.QueryRowx(q).MapScan(info) + if err != nil { + return nil, fmt.Errorf("querying graphs table: %v", err) + } + return &graphInfo{ + GraphName: info["graph_name"].(string), + SanitizedGraphName: info["sanitized_graph_name"].(string), + VertexTable: info["vertex_table"].(string), + EdgeTable: info["edge_table"].(string), + }, nil +} + +// DeleteGraph deletes an existing graph named `graph` +func (db *GraphDB) DeleteGraph(graph string) error { + info, err := db.getGraphInfo(graph) + if err != nil { + return fmt.Errorf("DeleteGraph: %v", err) + } + + stmt := fmt.Sprintf("DROP TABLE IF EXISTS %s_vertices", info.VertexTable) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("DeleteGraph: dropping vertex table: %v", err) + } + + stmt = fmt.Sprintf("DROP TABLE IF EXISTS %s_edges", info.EdgeTable) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("DeleteGraph: dropping edge table: %v", err) + } + + stmt = fmt.Sprintf("DELETE FROM graphs where graph_name='%s'", graph) + _, err = db.db.Exec(stmt) + if err != nil { + return fmt.Errorf("DeleteGraph: deleting row from graphs table: %v", err) + } + + return nil +} + +// ListGraphs lists the graphs managed by this driver +func (db *GraphDB) ListGraphs() []string { + //fmt.Printf("PSQL listing graphs\n") + out := []string{} + rows, err := db.db.Queryx("SELECT graph_name FROM graphs") + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("ListGraphs: Queryx") + return out + } + defer rows.Close() + var table string + for rows.Next() { + if err := rows.Scan(&table); err != nil { + log.WithFields(log.Fields{"error": err}).Error("ListGraphs: Scan") + return out + } + //fmt.Printf("Found %s\n", table) + out = append(out, table) + //out = append(out, strings.SplitN(table, "_", 2)[0]) + } + if err := rows.Err(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("ListGraphs: iterating") + return out + } + //fmt.Printf("Graphs: %s\n", out) + return out +} + +// Graph obtains the gdbi.DBI for a particular graph +func (db *GraphDB) Graph(graph string) (gdbi.GraphInterface, error) { + info, err := db.getGraphInfo(graph) + if err != nil { + return nil, fmt.Errorf("graph '%s' was not found: %v", graph, err) + } + return &Graph{ + db: db.db, + v: info.VertexTable, + e: info.EdgeTable, + ts: db.ts, + graph: graph, + }, nil +} diff --git a/sqlite/index.go b/sqlite/index.go new file mode 100644 index 000000000..ca2f05309 --- /dev/null +++ b/sqlite/index.go @@ -0,0 +1,99 @@ +package sqlite + +import ( + "fmt" + "strings" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/lib/pq" +) + +func (g *Graph) AddVertexIndex(vertexLabel string, field string) error { + indexName := fmt.Sprintf("%s_%s_%s", g.graph, vertexLabel, field) + query := fmt.Sprintf( + "CREATE INDEX IF NOT EXISTS %s ON %s ((data->>'%s')) WHERE label = '%s'", + pq.QuoteIdentifier(indexName), + pq.QuoteIdentifier(g.v), + field, + vertexLabel, + ) + _, err := g.db.Exec(query) + if err != nil { + log.Errorf("Error adding index %s: %v", indexName, err) + return fmt.Errorf("failed to add index %s: %w", indexName, err) + } + log.Infof("Successfully added index %s for vertex label %s field %s", indexName, vertexLabel, field) + return nil +} + +// DeleteVertexIndex drops the specified index. +func (g *Graph) DeleteVertexIndex(vertexLabel string, field string) error { + indexName := fmt.Sprintf("%s_%s_%s", g.graph, vertexLabel, field) + query := fmt.Sprintf("DROP INDEX IF EXISTS %s", pq.QuoteIdentifier(indexName)) + _, err := g.db.Exec(query) + if err != nil { + log.Errorf("Error deleting index %s: %v", indexName, err) + return fmt.Errorf("failed to delete index %s: %w", indexName, err) + } + log.Infof("Successfully deleted index %s", indexName) + return nil +} + +// GetVertexIndexList lists indices +func (g *Graph) GetVertexIndexList() <-chan *gripql.IndexID { + o := make(chan *gripql.IndexID, 100) + go func() { + defer close(o) + // Query indices only on the vertex table (g.v) + query := ` + SELECT name + FROM sqlite_master + WHERE type = 'index' AND tbl_name = ? + AND name NOT LIKE 'sqlite_autoindex_%' -- Exclude auto-generated primary key indices + AND name IN ( + SELECT name + FROM pragma_index_list(?) + WHERE "unique" = 0 -- Exclude unique indices + ) + ` + rows, err := g.db.Queryx(query, g.v, g.v) + if err != nil { + log.Errorf("Error getting index list: %v", err) + return + } + defer rows.Close() + + prefix := fmt.Sprintf("%s_", g.graph) + for rows.Next() { + var indexName string + if err := rows.Scan(&indexName); err != nil { + log.Errorf("Error scanning index row: %v", err) + continue + } + if !strings.HasPrefix(indexName, prefix) { + log.Infof("Skipping index '%s': does not match graph '%s'", indexName, g.graph) + continue + } + rest := strings.TrimPrefix(indexName, prefix) + if strings.HasPrefix(rest, "vertices_") { + continue + } else { + parts := strings.SplitN(rest, "_", 2) + if len(parts) == 2 { + o <- &gripql.IndexID{ + Graph: g.graph, + Label: parts[0], // Vertex label, e.g., "Person" + Field: parts[1], // Field, e.g., "age" + } + } else { + log.Infof("Skipping index '%s': unrecognized format", indexName) + } + } + } + if err := rows.Err(); err != nil { + log.Errorf("Error during index row iteration: %v", err) + } + }() + return o +} diff --git a/sqlite/schema.go b/sqlite/schema.go new file mode 100644 index 000000000..e7d0ab31c --- /dev/null +++ b/sqlite/schema.go @@ -0,0 +1,142 @@ +package sqlite + +import ( + "context" + "fmt" + + "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/log" + "github.com/bmeg/grip/psql" + "github.com/bmeg/grip/util" + "golang.org/x/sync/errgroup" + "google.golang.org/protobuf/types/known/structpb" +) + +// BuildSchema returns the schema of a specific graph in the database +func (db *GraphDB) BuildSchema(ctx context.Context, graphID string, sampleN uint32, random bool) (*gripql.Graph, error) { + + var g errgroup.Group + + gi, err := db.Graph(graphID) + if err != nil { + return nil, err + } + + graph := gi.(*Graph) + + vSchemaChan := make(chan *gripql.Vertex) + eSchemaChan := make(chan *gripql.Edge) + + vLabels, err := graph.ListVertexLabels() + if err != nil { + return nil, err + } + + for _, label := range vLabels { + label := label + if label == "" { + continue + } + g.Go(func() error { + q := fmt.Sprintf("SELECT * FROM %s WHERE label='%s'", graph.v, label) + rows, err := graph.db.QueryxContext(ctx, q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("BuildSchema: QueryxContext") + return err + } + defer rows.Close() + schema := make(map[string]interface{}) + for rows.Next() { + vrow := &psql.Row{} + if err := rows.StructScan(vrow); err != nil { + log.WithFields(log.Fields{"error": err}).Error("BuildSchema: StructScan") + continue + } + v, err := psql.ConvertVertexRow(vrow, true) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("BuildSchema: convertVertexRow") + continue + } + util.MergeMaps(schema, v.Data) + } + + sSchema, _ := structpb.NewStruct(schema) + vSchema := &gripql.Vertex{Id: label, Label: "Vertex", Data: sSchema} + vSchemaChan <- vSchema + + return nil + }) + } + + eLabels, err := graph.ListEdgeLabels() + if err != nil { + return nil, err + } + + for _, label := range eLabels { + label := label + if label == "" { + continue + } + + g.Go(func() error { + q := fmt.Sprintf( + `SELECT a.label, b.label, c.label, b.data FROM %s as a INNER JOIN %s as b ON b."to"=a.id INNER JOIN %s as c on b."from" = c.id WHERE b.label = '%s' limit %d`, + graph.v, graph.e, graph.v, + label, sampleN, + ) + //fmt.Printf("Query: %s\n", q) + rows, err := graph.db.QueryxContext(ctx, q) + if err != nil { + log.WithFields(log.Fields{"error": err}).Error("BuildSchema: QueryxContext") + return err + } + defer rows.Close() + //schema := make(map[string]interface{}) + for rows.Next() { + if row, err := rows.SliceScan(); err != nil { + log.WithFields(log.Fields{"error": err}).Error("BuildSchema: SliceScan") + continue + } else { + eSchema := &gripql.Edge{ + Id: fmt.Sprintf("(%s)--%s->(%s)", row[0], row[1], row[2]), + Label: label, + From: row[0].(string), + To: row[2].(string), + } + eSchemaChan <- eSchema + //fmt.Printf("Found: %s\n", row) + } + } + return nil + }) + + } + + wg := errgroup.Group{} + + vSchema := []*gripql.Vertex{} + eSchema := []*gripql.Edge{} + + wg.Go(func() error { + for s := range vSchemaChan { + vSchema = append(vSchema, s) + } + return nil + }) + wg.Go(func() error { + for s := range eSchemaChan { + eSchema = append(eSchema, s) + } + return nil + }) + + g.Wait() + close(vSchemaChan) + close(eSchemaChan) + + wg.Wait() + + schema := &gripql.Graph{Graph: graphID, Vertices: vSchema, Edges: eSchema} + return schema, nil +} diff --git a/test/elastic.yml b/test/elastic.yml deleted file mode 100644 index a639cdd87..000000000 --- a/test/elastic.yml +++ /dev/null @@ -1,7 +0,0 @@ -Default: elastic - -Drivers: - elastic: - Elasticsearch: - URL: http://localhost:19200 - Synchronous: true diff --git a/test/engine/sort_test.go b/test/engine/sort_test.go new file mode 100644 index 000000000..2a004138d --- /dev/null +++ b/test/engine/sort_test.go @@ -0,0 +1,99 @@ +package main + +import ( + "encoding/json" + "flag" + "os" + "strings" + "testing" + + "github.com/bmeg/grip/engine/logic" +) + +type JSONCompare struct{} + +// Compare implements logic.SortConf. +func (j *JSONCompare) Compare(a any, b any) int { + return logic.CompareAny(a, b) +} + +// FromBytes implements logic.SortConf. +func (j *JSONCompare) FromBytes(b []byte) (any, error) { + if b[0] == '"' { + var a string + json.Unmarshal(b, &a) + return a, nil + } else if strings.Compare(string(b), "true") == 0 { + return true, nil + } else if strings.Compare(string(b), "false") == 0 { + return false, nil + } else if strings.Contains(string(b), ".") { + var a float64 + json.Unmarshal(b, &a) + return a, nil + } else { + var a int + json.Unmarshal(b, &a) + return a, nil + } +} + +// ToBytes implements logic.SortConf. +func (j *JSONCompare) ToBytes(a any) []byte { + o, _ := json.Marshal(a) + return o +} + +func TestKVSort(t *testing.T) { + + path := "kv_sort_test.store" + + keys := []any{ + "Bob", + "Charles", + "Alice", + 1.0, + 2, + 20.0, + 40, + true, + false, + } + + jConf := JSONCompare{} + + memSort := logic.NewMemSorter[any](&jConf) + for _, i := range keys { + memSort.Add(i) + } + + out1 := []any{} + for i := range memSort.Sorted() { + out1 = append(out1, i) + } + + kvSort := logic.NewKVSorter(path, &jConf) + for _, i := range keys { + kvSort.Add(i) + } + out2 := []any{} + for i := range kvSort.Sorted() { + out2 = append(out2, i) + } + + for i := range out1 { + if logic.CompareAny(out1[i], out2[i]) != 0 { + t.Error("mismatch") + } + } + + os.RemoveAll(path) +} + +var configFile string + +func TestMain(m *testing.M) { + flag.StringVar(&configFile, "config", configFile, "config file to use for tests") + flag.Parse() + +} diff --git a/test/inspect_test.go b/test/inspect_test.go index f19c49b09..9f1d6c677 100644 --- a/test/inspect_test.go +++ b/test/inspect_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/bmeg/grip/engine/core" - "github.com/bmeg/grip/engine/inspect" "github.com/bmeg/grip/gripql" + "github.com/bmeg/grip/gripql/inspect" "github.com/bmeg/grip/util/setcmp" ) @@ -36,7 +36,7 @@ func TestAsMapping(t *testing.T) { func TestOutputMasking(t *testing.T) { q := gripql.NewQuery() q = q.V().Out().In().Has(gripql.Eq("$.test", "value")) - out := inspect.PipelineStepOutputs(q.Statements) + out := inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) if len(out) != 1 { t.Errorf("Wrong number of step outputs %d", len(out)) @@ -47,7 +47,7 @@ func TestOutputMasking(t *testing.T) { q = gripql.NewQuery() q = q.V().Out().In().Has(gripql.Eq("$.test", "value")).Out() - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) if len(out) != 2 { t.Errorf("Wrong number of step outputs %d", len(out)) @@ -60,8 +60,8 @@ func TestOutputMasking(t *testing.T) { } q = gripql.NewQuery() - q = q.E() - out = inspect.PipelineStepOutputs(q.Statements) + q = q.V().OutE() + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("EdgeList vars: %s\n", out) if len(out) != 1 { t.Errorf("Wrong number of step outputs %d", len(out)) @@ -69,7 +69,7 @@ func TestOutputMasking(t *testing.T) { q = gripql.NewQuery() q = q.V().Out().In().Count() - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) if len(out) != 0 { t.Errorf("Incorrect output count") @@ -77,7 +77,7 @@ func TestOutputMasking(t *testing.T) { q = gripql.NewQuery() q = q.V().Out().In().Has(gripql.Eq("$.test", "value")).Count() - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) if len(out) != 1 { t.Errorf("Incorrect output count") @@ -85,7 +85,7 @@ func TestOutputMasking(t *testing.T) { q = gripql.NewQuery() q = q.V().HasLabel("test").Out().In().Has(gripql.Eq("$.test", "value")).Count() - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) if len(out) != 2 { t.Errorf("Wrong number of step outputs %d", len(out)) } @@ -93,17 +93,17 @@ func TestOutputMasking(t *testing.T) { q = gripql.NewQuery() q = q.V().HasLabel("test").Out().As("a").Out().Out().Select("a") - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) q = gripql.NewQuery() q = q.V().HasLabel("robot", "person") - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s\n", out) q = gripql.NewQuery() q = q.V().HasLabel("Person").As("person").Out().Distinct("$person.name") - out = inspect.PipelineStepOutputs(q.Statements) + out = inspect.PipelineStepOutputs(q.Statements, false) fmt.Printf("vars: %s -> %s\n", inspect.PipelineSteps(q.Statements), out) if len(out) != 2 { t.Errorf("Incorrect output count") @@ -123,7 +123,7 @@ func TestOutputIndexMasking(t *testing.T) { q = q.V().HasLabel("robot", "person") smts := core.IndexStartOptimize(q.Statements) - out := inspect.PipelineStepOutputs(smts) + out := inspect.PipelineStepOutputs(smts, false) fmt.Printf("%#v\n", smts) if len(out) == 0 { t.Errorf("No outputs found") @@ -131,6 +131,7 @@ func TestOutputIndexMasking(t *testing.T) { fmt.Printf("vars: %s\n", out) } +/* func TestPathFind(t *testing.T) { q := gripql.NewQuery() o := q.V().HasLabel("test").Out().As("a").Out().Out().Select("a") @@ -156,11 +157,12 @@ func TestPathFind(t *testing.T) { } } } +*/ func TestDistinct(t *testing.T) { q := gripql.NewQuery() o := q.V().HasLabel("Person").As("person").Out("friend").Distinct("$person.name", "$.name").Count() - out := inspect.PipelineStepOutputs(o.Statements) + out := inspect.PipelineStepOutputs(o.Statements, false) fmt.Printf("%#v\n", out) if x, ok := out["2"]; ok { @@ -172,7 +174,7 @@ func TestDistinct(t *testing.T) { } o = q.V().HasLabel("Person").As("person").Out("friend").Distinct("$.name").Count() - out = inspect.PipelineStepOutputs(o.Statements) + out = inspect.PipelineStepOutputs(o.Statements, false) fmt.Printf("%#v\n", out) if x, ok := out["2"]; ok { if !setcmp.ContainsString(x, "*") { @@ -183,7 +185,7 @@ func TestDistinct(t *testing.T) { } o = q.V().HasLabel("Person").As("person").Out("friend").Distinct("$person.name").Out("friend").Distinct("$.name").Count() - out = inspect.PipelineStepOutputs(o.Statements) + out = inspect.PipelineStepOutputs(o.Statements, false) fmt.Printf("%#v\n", out) if x, ok := out["3"]; ok { if !setcmp.ContainsString(x, "*") { diff --git a/test/kafka.yml b/test/kafka.yml new file mode 100644 index 000000000..5e3583f4d --- /dev/null +++ b/test/kafka.yml @@ -0,0 +1,11 @@ +Default: grids + +Drivers: + grids: + Grids: grip-grids.db + +Kafka: + Username: admin + Password: adminpassword + Hostname: localhost:9092 + Topic: gripHistory diff --git a/test/keymap_test.go b/test/keymap_test.go deleted file mode 100644 index 9d8c4fe1c..000000000 --- a/test/keymap_test.go +++ /dev/null @@ -1,141 +0,0 @@ -package test - -import ( - "fmt" - "os" - "testing" - - "github.com/akrylysov/pogreb" - "github.com/bmeg/grip/grids" -) - -var kvPath = "test.db" - -func dbSetup() (*pogreb.DB, error) { - os.Mkdir("test_db", 0700) - return pogreb.Open("test_db/data", nil) -} - -func dbClose(db *pogreb.DB) { - db.Close() - os.RemoveAll("test_db") -} - -func TestKeyInsert(t *testing.T) { - keykv, err := dbSetup() - if err != nil { - t.Error(err) - } - - keymap := grids.NewKeyMap(keykv) - - vertexKeys := make([]uint64, 100) - var evenLabel uint64 - for i := range vertexKeys { - label := "even" - if i%2 == 1 { - label = "odd" - } - k, l := keymap.GetsertVertexKey(fmt.Sprintf("vertex_%d", i), label) - if i == 0 { - evenLabel = l - } else { - if i%2 == 1 { - if evenLabel == l { - t.Errorf("Getsert returns wrong key") - } - } else { - if evenLabel != l { - t.Errorf("Getsert returns wrong key") - } - } - } - vertexKeys[i] = k - } - for i := range vertexKeys { - for j := range vertexKeys { - if i != j { - if vertexKeys[i] == vertexKeys[j] { - t.Errorf("Non unique keys: %d %d", vertexKeys[i], vertexKeys[j]) - } - } - } - } - for i := range vertexKeys { - id, ok := keymap.GetVertexID(vertexKeys[i]) - if !ok { - t.Errorf("Vertex %d not found", vertexKeys[i]) - } - if id != fmt.Sprintf("vertex_%d", i) { - t.Errorf("ID test_%d != %s", i, id) - } - lkey := keymap.GetVertexLabel(vertexKeys[i]) - lid, ok := keymap.GetLabelID(lkey) - if !ok { - t.Errorf("Vertex label %d not found", lkey) - } - if i%2 == 1 { - if lid != "odd" { - t.Errorf("Wrong vertex label %s : %s != %s", id, lid, "odd") - } - } else { - if lid != "even" { - t.Errorf("Wrong vertex label %s : %s != %s", id, lid, "even") - } - } - } - - edgeKeys := make([]uint64, 100) - for i := range edgeKeys { - label := "even_edge" - if i%2 == 1 { - label = "odd_edge" - } - k, _ := keymap.GetsertEdgeKey(fmt.Sprintf("edge_%d", i), label) - edgeKeys[i] = k - } - for i := range edgeKeys { - for j := range edgeKeys { - if i != j { - if edgeKeys[i] == edgeKeys[j] { - t.Errorf("Non unique keys: %d %d", edgeKeys[i], edgeKeys[j]) - } - } - } - } - for i := range edgeKeys { - id, ok := keymap.GetEdgeID(edgeKeys[i]) - if !ok { - t.Errorf("Edge %d not found", edgeKeys[i]) - } - if id != fmt.Sprintf("edge_%d", i) { - t.Errorf("ID test_%d != %s", i, id) - } - } - - labelKeys := make([]uint64, 100) - for i := range labelKeys { - k := keymap.GetsertLabelKey(fmt.Sprintf("label_%d", i)) - labelKeys[i] = k - } - for i := range labelKeys { - for j := range labelKeys { - if i != j { - if labelKeys[i] == labelKeys[j] { - t.Errorf("Non unique keys: %d %d", labelKeys[i], labelKeys[j]) - } - } - } - } - for i := range labelKeys { - id, ok := keymap.GetLabelID(labelKeys[i]) - if !ok { - t.Errorf("Label %d not found", labelKeys[i]) - } - if id != fmt.Sprintf("label_%d", i) { - t.Errorf("ID graph_%d != %s", i, id) - } - } - - dbClose(keykv) -} diff --git a/test/main_test.go b/test/main_test.go index b955d49d0..a725f5fb6 100644 --- a/test/main_test.go +++ b/test/main_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/bmeg/grip/config" - "github.com/bmeg/grip/elastic" esql "github.com/bmeg/grip/existing-sql" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/grids" @@ -18,6 +17,8 @@ import ( _ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself _ "github.com/bmeg/grip/kvi/boltdb" // import so bolt will register itself _ "github.com/bmeg/grip/kvi/leveldb" // import so level will register itself + _ "github.com/bmeg/grip/kvi/pebbledb" // import so pebble will register itself + "github.com/bmeg/grip/mongo" "github.com/bmeg/grip/psql" "github.com/bmeg/grip/util" @@ -34,7 +35,7 @@ var edges = []*gripql.Edge{} func setupGraph() error { // sort edges/vertices and insert one at a time to ensure the same write order sort.Slice(vertices[:], func(i, j int) bool { - return vertices[i].Gid < vertices[j].Gid + return vertices[i].Id < vertices[j].Id }) for _, v := range vertices { err := db.AddVertex([]*gdbi.Vertex{gdbi.NewElementFromVertex(v)}) @@ -44,7 +45,7 @@ func setupGraph() error { } sort.Slice(edges[:], func(i, j int) bool { - return edges[i].Gid < edges[j].Gid + return edges[i].Id < edges[j].Id }) for _, e := range edges { err := db.AddEdge([]*gdbi.Edge{gdbi.NewElementFromEdge(e)}) @@ -69,6 +70,7 @@ func TestMain(m *testing.M) { panic(err) } for v := range vertChan { + fmt.Printf("Adding vertex: %s %#v\n", v.Id, v.Data.AsMap()) vertices = append(vertices, v) } edgeChan, err := util.StreamEdgesFromFile("./resources/smtest_edges.txt", 2) @@ -76,6 +78,7 @@ func TestMain(m *testing.M) { panic(err) } for e := range edgeChan { + fmt.Printf("Adding edge: %s %#v\n", e.Id, e.Data.AsMap()) edges = append(edges, e) } @@ -94,7 +97,7 @@ func TestMain(m *testing.M) { return } } else { - conf.AddBadgerDefault() + conf.AddPebbleDefault() } config.TestifyConfig(conf) @@ -108,39 +111,69 @@ func TestMain(m *testing.M) { if dbconfig.ExistingSQL != nil { err = setupSQLGraph() if err != nil { - fmt.Println("Error: setting up graph:", err) + fmt.Println("Error: setting up sql graph:", err) return } gdb, err = esql.NewGraphDB(*dbconfig.ExistingSQL) + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.Badger != nil { gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Badger) defer func() { os.RemoveAll(*dbconfig.Badger) }() + if err != nil { + fmt.Printf("Init error: %s\n", err) + } + } else if dbconfig.Pebble != nil { + gdb, err = kvgraph.NewKVGraphDB("pebble", *dbconfig.Pebble) + defer func() { + os.RemoveAll(*dbconfig.Pebble) + }() + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.Bolt != nil { gdb, err = kvgraph.NewKVGraphDB("bolt", *dbconfig.Bolt) defer func() { os.RemoveAll(*dbconfig.Bolt) }() + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.Level != nil { gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Level) defer func() { os.RemoveAll(*dbconfig.Level) }() + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.Grids != nil { gdb, err = grids.NewGraphDB(*dbconfig.Grids) defer func() { os.RemoveAll(*dbconfig.Grids) }() - } else if dbconfig.Elasticsearch != nil { - gdb, err = elastic.NewGraphDB(*dbconfig.Elasticsearch) + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.MongoDB != nil { gdb, err = mongo.NewGraphDB(*dbconfig.MongoDB) + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else if dbconfig.PSQL != nil { gdb, err = psql.NewGraphDB(*dbconfig.PSQL) + if err != nil { + fmt.Printf("Init error: %s\n", err) + } } else { err = fmt.Errorf("unknown database") } + if err != nil { + fmt.Printf("Init error: %s\n", err) + } err = gdb.AddGraph("test-graph") if err != nil { @@ -157,11 +190,41 @@ func TestMain(m *testing.M) { if dbname != "existing-sql" { err = setupGraph() if err != nil { - fmt.Println("Error: setting up graph:", err) + fmt.Printf("Error 1st setting up %s graph: %s", dbname, err) return } } + // After deleting graph, docs, entries, fields should no longer exist in doc + err = gdb.DeleteGraph("test-graph") + if err != nil { + fmt.Printf("Init error: %s\n", err) + } + err = gdb.AddGraph("test-graph") + if err != nil { + fmt.Println("Error: failed to add graph:", err) + return + } + db, err = gdb.Graph("test-graph") + if err != nil { + fmt.Println("Error: failed to connect to graph:", err) + return + } + + afterVertexLabels, _ := db.ListVertexLabels() + afterEdgeLabels, _ := db.ListEdgeLabels() + fmt.Printf("afterEdgeLabels: %s afterVertexLabels: %s\n", afterEdgeLabels, afterVertexLabels) + if len(afterVertexLabels) != 0 || len(afterEdgeLabels) != 0 { + panic(fmt.Errorf("afterEdgeLabels: %s or afterVertexLabels: %s are not empty\n", afterEdgeLabels, afterVertexLabels)) + } + + if dbname != "existing-sql" { + err = setupGraph() + if err != nil { + fmt.Printf("Error: 2nd setting up %s graph: %s\n", dbname, err) + return + } + } // run tests exit = m.Run() } diff --git a/test/pathcompile_test.go b/test/pathcompile_test.go deleted file mode 100644 index c10525ef8..000000000 --- a/test/pathcompile_test.go +++ /dev/null @@ -1,92 +0,0 @@ -package test - -import ( - "context" - "fmt" - "os" - "testing" - - "github.com/bmeg/grip/engine/pipeline" - "github.com/bmeg/grip/gdbi" - "github.com/bmeg/grip/grids" - "github.com/bmeg/grip/gripql" - "google.golang.org/protobuf/encoding/protojson" -) - -var pathVertices = []string{ - `{"gid" : "1", "label" : "Person", "data" : { "name" : "bob" }}`, - `{"gid" : "2", "label" : "Person", "data" : { "name" : "alice" }}`, - `{"gid" : "3", "label" : "Person", "data" : { "name" : "jane" }}`, - `{"gid" : "4", "label" : "Person", "data" : { "name" : "janet" }}`, -} - -var pathEdges = []string{ - `{"gid" : "e1", "label" : "knows", "from" : "1", "to" : "2", "data" : {}}`, - `{"gid" : "e3", "label" : "knows", "from" : "2", "to" : "3", "data" : {}}`, - `{"gid" : "e4", "label" : "knows", "from" : "3", "to" : "4", "data" : {}}`, -} - -func TestEngineQuery(t *testing.T) { - gdb, err := grids.NewGraphDB("testing.db") - if err != nil { - t.Error(err) - } - - gdb.AddGraph("test") - graph, err := gdb.Graph("test") - if err != nil { - t.Error(err) - } - - vset := []*gdbi.Vertex{} - for _, r := range pathVertices { - v := &gripql.Vertex{} - err := protojson.Unmarshal([]byte(r), v) - if err != nil { - t.Error(err) - } - vset = append(vset, gdbi.NewElementFromVertex(v)) - } - graph.AddVertex(vset) - - eset := []*gdbi.Edge{} - for _, r := range pathEdges { - e := &gripql.Edge{} - err := protojson.Unmarshal([]byte(r), e) - if err != nil { - t.Error(err) - } - eset = append(eset, gdbi.NewElementFromEdge(e)) - } - graph.AddEdge(eset) - - q := gripql.NewQuery() - q = q.V().Out().Out().Count() - comp := graph.Compiler() - - compiledPipeline, err := comp.Compile(q.Statements, nil) - if err != nil { - t.Error(err) - } - - out := pipeline.Run(context.Background(), compiledPipeline, "./work.dir") - for r := range out { - fmt.Printf("result: %s\n", r) - } - - q = gripql.NewQuery() - q = q.V().Out().Out().OutE().Out().Count() - - compiledPipeline, err = comp.Compile(q.Statements, nil) - if err != nil { - t.Error(err) - } - - out = pipeline.Run(context.Background(), compiledPipeline, "./work.dir") - for r := range out { - fmt.Printf("result: %s\n", r) - } - - gdb.Close() - os.RemoveAll("testing.db") -} diff --git a/test/badger-auth.yml b/test/pebble-auth.yml similarity index 85% rename from test/badger-auth.yml rename to test/pebble-auth.yml index 560931e1c..f7c9757b0 100644 --- a/test/badger-auth.yml +++ b/test/pebble-auth.yml @@ -1,8 +1,8 @@ -Default: badger +Default: pebble Drivers: - badger: - Badger: grip-badger.db + pebble: + Pebble: grip-pebble.db Server: Accounts: diff --git a/test/badger-proxy-auth.yml b/test/pebble-proxy-auth.yml similarity index 80% rename from test/badger-proxy-auth.yml rename to test/pebble-proxy-auth.yml index 5862c84b7..8b8c0403d 100644 --- a/test/badger-proxy-auth.yml +++ b/test/pebble-proxy-auth.yml @@ -1,8 +1,8 @@ -Default: badger +Default: pebble Drivers: - badger: - Badger: grip-badger.db + pebble: + Pebble: grip-pebble.db Server: Accounts: diff --git a/test/processors_test.go b/test/processors_test.go index fb146a638..c66114213 100644 --- a/test/processors_test.go +++ b/test/processors_test.go @@ -34,7 +34,7 @@ func TestEngine(t *testing.T) { count(len(vertices)), }, { - Q.E().Count(), + Q.V().OutE().Count(), count(len(edges)), }, { @@ -42,7 +42,7 @@ func TestEngine(t *testing.T) { pickAllVertices(), }, { - Q.E(), + Q.V().OutE(), pickAllEdges(), }, { @@ -62,11 +62,11 @@ func TestEngine(t *testing.T) { count(170), }, { - Q.E().HasLabel("purchasedProducts").Count(), + Q.V().OutE().HasLabel("purchasedProducts").Count(), count(100), }, { - Q.E().HasLabel("userPurchases").Count(), + Q.V().OutE().HasLabel("userPurchases").Count(), count(100), }, { @@ -74,7 +74,7 @@ func TestEngine(t *testing.T) { count(0), }, { - Q.E().HasLabel("does-not-exist").Count(), + Q.V().OutE().HasLabel("does-not-exist").Count(), count(0), }, { @@ -310,7 +310,7 @@ func TestEngine(t *testing.T) { pickRes(vertex("users:1", "users", data{"email": "Earlean.Bonacci@yahoo.com", "id": 1})), }, { - Q.V("users:1").Fields("-_gid", "-_label", "email", "id"), + Q.V("users:1").Fields("-_id", "-_label", "email", "id"), pickRes(vertex("", "", data{"email": "Earlean.Bonacci@yahoo.com", "id": 1})), }, { @@ -347,51 +347,16 @@ func TestEngine(t *testing.T) { count(2), }, { - Q.V("users:11").As("a").OutE().As("b").Out().Has(gripql.Neq("_gid", "purchases:4")).Select("b").Count(), + Q.V("users:11").As("a").OutE().As("b").Out().Has(gripql.Neq("_id", "purchases:4")).Select("b").Count(), count(1), }, { - Q.V("users:11").As("a").OutE().As("b").Out().Has(gripql.Neq("_gid", "purchases:4")).Select("b").Out(), + Q.V("users:11").As("a").OutE().As("b").Out().Has(gripql.Neq("_id", "purchases:4")).Select("b").Out(), pick("purchases:26"), }, - { - Q.V("users:1").As("a").Out().As("b").Select("a", "b"), - pickSelection(map[string]interface{}{ - "a": getVertex("users:1"), - "b": getVertex("purchases:57"), - }), - }, - { - Q.V("users:1").Fields().As("a").Out().Fields().As("b").Select("a", "b"), - pickSelection(map[string]interface{}{ - "a": vertex("users:1", "users", nil), - "b": vertex("purchases:57", "purchases", nil), - }), - }, - { - Q.V("users:1").Fields("-created_at", "-deleted_at", "-details", "-id", "-password").As("a").Out().Fields().As("b").Select("a", "b"), - pickSelection(map[string]interface{}{ - "a": vertex("users:1", "users", data{"email": "Earlean.Bonacci@yahoo.com"}), - "b": vertex("purchases:57", "purchases", nil), - }), - }, - { - Q.V("users:1").Fields().As("a").Out().Fields("state").As("b").Select("a", "b"), - pickSelection(map[string]interface{}{ - "a": vertex("users:1", "users", nil), - "b": vertex("purchases:57", "purchases", data{"state": "IL"}), - }), - }, - { - Q.V("users:1").As("a").Fields().Out().As("b").Fields().Select("a", "b"), - pickSelection(map[string]interface{}{ - "a": getVertex("users:1"), - "b": getVertex("purchases:57"), - }), - }, { Q.V("users:1").As("a").Out().As("b"). - Render(map[string]interface{}{"user_id": "$a._gid", "purchase_id": "$b._gid", "purchaser": "$b.name"}), + Render(map[string]interface{}{"user_id": "$a._id", "purchase_id": "$b._id", "purchaser": "$b.name"}), render(map[string]interface{}{"user_id": "users:1", "purchase_id": "purchases:57", "purchaser": "Letitia Sprau"}), }, } @@ -413,19 +378,19 @@ func TestEngine(t *testing.T) { } } -func vertex(gid, label string, d data) *gripql.Vertex { +func vertex(id, label string, d data) *gripql.Vertex { ds, _ := structpb.NewStruct(d) return &gripql.Vertex{ - Gid: gid, + Id: id, Label: label, Data: ds, } } -func edge(gid interface{}, from, to string, label string, d data) *gripql.Edge { +func edge(id interface{}, from, to string, label string, d data) *gripql.Edge { ds, _ := structpb.NewStruct(d) return &gripql.Edge{ - Gid: fmt.Sprintf("%v", gid), + Id: fmt.Sprintf("%v", id), From: from, To: to, Label: label, @@ -454,61 +419,61 @@ func compare(expect []*gripql.QueryResult) checker { sort.Strings(expectS) if !reflect.DeepEqual(actualS, expectS) { - for _, s := range actualS { - t.Log("actual", s) - } - for _, s := range expectS { - t.Log("expect", s) - } if len(expectS) != len(actualS) { t.Logf("expected # results: %d actual # results: %d", len(expectS), len(actualS)) + } else { + for i, s := range actualS { + t.Log("actual", s) + t.Log("expect", expectS[i]) + } } + t.Errorf("not equal") } } } -func pick(gids ...string) checker { +func pick(ids ...string) checker { expect := []*gripql.QueryResult{} - for _, id := range gids { - res := pickgid(id) + for _, id := range ids { + res := pickid(id) expect = append(expect, res) } return compare(expect) } -func getVertex(gid string) *gripql.Vertex { +func getVertex(id string) *gripql.Vertex { for _, v := range vertices { - if v.Gid == gid { + if v.Id == id { return v } } return nil } -func getEdge(gid string) *gripql.Edge { +func getEdge(id string) *gripql.Edge { for _, e := range edges { - if e.Gid == gid { + if e.Id == id { return e } } return nil } -func pickgid(gid string) *gripql.QueryResult { - v := getVertex(gid) +func pickid(id string) *gripql.QueryResult { + v := getVertex(id) if v != nil { return &gripql.QueryResult{ Result: &gripql.QueryResult_Vertex{Vertex: v}, } } - e := getEdge(gid) + e := getEdge(id) if e != nil { return &gripql.QueryResult{ Result: &gripql.QueryResult_Edge{Edge: e}, } } - panic("no vertex or edge found for gid") + panic("no vertex or edge found for id") } func pickRes(ival ...interface{}) checker { @@ -554,36 +519,6 @@ func pickAllEdges() checker { return compare(expect) } -func pickSelection(selection map[string]interface{}) checker { - s := map[string]*gripql.Selection{} - for mark, ival := range selection { - switch val := ival.(type) { - case *gripql.Vertex: - s[mark] = &gripql.Selection{ - Result: &gripql.Selection_Vertex{ - Vertex: val, - }, - } - case *gripql.Edge: - s[mark] = &gripql.Selection{ - Result: &gripql.Selection_Edge{ - Edge: val, - }, - } - default: - panic(fmt.Sprintf("unhandled type %T", ival)) - } - } - expect := []*gripql.QueryResult{ - { - Result: &gripql.QueryResult_Selections{ - Selections: &gripql.Selections{Selections: s}, - }, - }, - } - return compare(expect) -} - func count(i int) checker { expect := []*gripql.QueryResult{ { diff --git a/test/resources/smtest_edges.txt b/test/resources/smtest_edges.txt index 4fd110a20..0ab4c65af 100644 --- a/test/resources/smtest_edges.txt +++ b/test/resources/smtest_edges.txt @@ -1,200 +1,200 @@ -{"gid": "purchase_items:2", "label": "purchasedProducts", "from": "purchases:1", "to": "products:3", "data": {"id": 2, "price": 27.99, "product_id": 3, "purchase_id": 1, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:3", "label": "purchasedProducts", "from": "purchases:1", "to": "products:8", "data": {"id": 3, "price": 108, "product_id": 8, "purchase_id": 1, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:4", "label": "purchasedProducts", "from": "purchases:2", "to": "products:1", "data": {"id": 4, "price": 9.99, "product_id": 1, "purchase_id": 2, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:5", "label": "purchasedProducts", "from": "purchases:3", "to": "products:12", "data": {"id": 5, "price": 9.99, "product_id": 12, "purchase_id": 3, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:6", "label": "purchasedProducts", "from": "purchases:3", "to": "products:17", "data": {"id": 6, "price": 14.99, "product_id": 17, "purchase_id": 3, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:7", "label": "purchasedProducts", "from": "purchases:3", "to": "products:11", "data": {"id": 7, "price": 9.99, "product_id": 11, "purchase_id": 3, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:8", "label": "purchasedProducts", "from": "purchases:4", "to": "products:4", "data": {"id": 8, "price": 7.99, "product_id": 4, "purchase_id": 4, "quantity": 3, "state": "Delivered"}} -{"gid": "purchase_items:9", "label": "purchasedProducts", "from": "purchases:5", "to": "products:18", "data": {"id": 9, "price": 14.99, "product_id": 18, "purchase_id": 5, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:10", "label": "purchasedProducts", "from": "purchases:5", "to": "products:2", "data": {"id": 10, "price": 29.99, "product_id": 2, "purchase_id": 5, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:11", "label": "purchasedProducts", "from": "purchases:6", "to": "products:5", "data": {"id": 11, "price": 5.99, "product_id": 5, "purchase_id": 6, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:12", "label": "purchasedProducts", "from": "purchases:7", "to": "products:6", "data": {"id": 12, "price": 499.99, "product_id": 6, "purchase_id": 7, "quantity": 3, "state": "Returned"}} -{"gid": "purchase_items:13", "label": "purchasedProducts", "from": "purchases:8", "to": "products:10", "data": {"id": 13, "price": 529, "product_id": 10, "purchase_id": 8, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:14", "label": "purchasedProducts", "from": "purchases:8", "to": "products:7", "data": {"id": 14, "price": 899.99, "product_id": 7, "purchase_id": 8, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:15", "label": "purchasedProducts", "from": "purchases:9", "to": "products:15", "data": {"id": 15, "price": 9.99, "product_id": 15, "purchase_id": 9, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:16", "label": "purchasedProducts", "from": "purchases:10", "to": "products:2", "data": {"id": 16, "price": 29.99, "product_id": 2, "purchase_id": 10, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:17", "label": "purchasedProducts", "from": "purchases:11", "to": "products:9", "data": {"id": 17, "price": 499, "product_id": 9, "purchase_id": 11, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:18", "label": "purchasedProducts", "from": "purchases:12", "to": "products:14", "data": {"id": 18, "price": 9.99, "product_id": 14, "purchase_id": 12, "quantity": 5, "state": "Delivered"}} -{"gid": "purchase_items:19", "label": "purchasedProducts", "from": "purchases:12", "to": "products:10", "data": {"id": 19, "price": 529, "product_id": 10, "purchase_id": 12, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:20", "label": "purchasedProducts", "from": "purchases:13", "to": "products:8", "data": {"id": 20, "price": 108, "product_id": 8, "purchase_id": 13, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:21", "label": "purchasedProducts", "from": "purchases:14", "to": "products:20", "data": {"id": 21, "price": 14.99, "product_id": 20, "purchase_id": 14, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:22", "label": "purchasedProducts", "from": "purchases:14", "to": "products:7", "data": {"id": 22, "price": 899.99, "product_id": 7, "purchase_id": 14, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:23", "label": "purchasedProducts", "from": "purchases:14", "to": "products:9", "data": {"id": 23, "price": 499, "product_id": 9, "purchase_id": 14, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:24", "label": "purchasedProducts", "from": "purchases:15", "to": "products:10", "data": {"id": 24, "price": 529, "product_id": 10, "purchase_id": 15, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:25", "label": "purchasedProducts", "from": "purchases:16", "to": "products:2", "data": {"id": 25, "price": 29.99, "product_id": 2, "purchase_id": 16, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:26", "label": "purchasedProducts", "from": "purchases:16", "to": "products:11", "data": {"id": 26, "price": 9.99, "product_id": 11, "purchase_id": 16, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:27", "label": "purchasedProducts", "from": "purchases:16", "to": "products:5", "data": {"id": 27, "price": 5.99, "product_id": 5, "purchase_id": 16, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:28", "label": "purchasedProducts", "from": "purchases:17", "to": "products:15", "data": {"id": 28, "price": 9.99, "product_id": 15, "purchase_id": 17, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:29", "label": "purchasedProducts", "from": "purchases:18", "to": "products:4", "data": {"id": 29, "price": 7.99, "product_id": 4, "purchase_id": 18, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:30", "label": "purchasedProducts", "from": "purchases:19", "to": "products:1", "data": {"id": 30, "price": 9.99, "product_id": 1, "purchase_id": 19, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:31", "label": "purchasedProducts", "from": "purchases:19", "to": "products:7", "data": {"id": 31, "price": 899.99, "product_id": 7, "purchase_id": 19, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:32", "label": "purchasedProducts", "from": "purchases:19", "to": "products:9", "data": {"id": 32, "price": 499, "product_id": 9, "purchase_id": 19, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:33", "label": "purchasedProducts", "from": "purchases:20", "to": "products:20", "data": {"id": 33, "price": 14.99, "product_id": 20, "purchase_id": 20, "quantity": 5, "state": "Delivered"}} -{"gid": "purchase_items:34", "label": "purchasedProducts", "from": "purchases:21", "to": "products:13", "data": {"id": 34, "price": 9.99, "product_id": 13, "purchase_id": 21, "quantity": 3, "state": "Delivered"}} -{"gid": "purchase_items:35", "label": "purchasedProducts", "from": "purchases:21", "to": "products:20", "data": {"id": 35, "price": 14.99, "product_id": 20, "purchase_id": 21, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:36", "label": "purchasedProducts", "from": "purchases:22", "to": "products:7", "data": {"id": 36, "price": 899.99, "product_id": 7, "purchase_id": 22, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:37", "label": "purchasedProducts", "from": "purchases:22", "to": "products:4", "data": {"id": 37, "price": 7.99, "product_id": 4, "purchase_id": 22, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:38", "label": "purchasedProducts", "from": "purchases:22", "to": "products:15", "data": {"id": 38, "price": 9.99, "product_id": 15, "purchase_id": 22, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:39", "label": "purchasedProducts", "from": "purchases:23", "to": "products:4", "data": {"id": 39, "price": 7.99, "product_id": 4, "purchase_id": 23, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:40", "label": "purchasedProducts", "from": "purchases:24", "to": "products:4", "data": {"id": 40, "price": 7.99, "product_id": 4, "purchase_id": 24, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:41", "label": "purchasedProducts", "from": "purchases:25", "to": "products:14", "data": {"id": 41, "price": 9.99, "product_id": 14, "purchase_id": 25, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:42", "label": "purchasedProducts", "from": "purchases:25", "to": "products:12", "data": {"id": 42, "price": 9.99, "product_id": 12, "purchase_id": 25, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:43", "label": "purchasedProducts", "from": "purchases:26", "to": "products:12", "data": {"id": 43, "price": 9.99, "product_id": 12, "purchase_id": 26, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:44", "label": "purchasedProducts", "from": "purchases:26", "to": "products:6", "data": {"id": 44, "price": 499.99, "product_id": 6, "purchase_id": 26, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:45", "label": "purchasedProducts", "from": "purchases:26", "to": "products:4", "data": {"id": 45, "price": 7.99, "product_id": 4, "purchase_id": 26, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:46", "label": "purchasedProducts", "from": "purchases:27", "to": "products:11", "data": {"id": 46, "price": 9.99, "product_id": 11, "purchase_id": 27, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:47", "label": "purchasedProducts", "from": "purchases:28", "to": "products:9", "data": {"id": 47, "price": 499, "product_id": 9, "purchase_id": 28, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:48", "label": "purchasedProducts", "from": "purchases:29", "to": "products:8", "data": {"id": 48, "price": 108, "product_id": 8, "purchase_id": 29, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:49", "label": "purchasedProducts", "from": "purchases:29", "to": "products:10", "data": {"id": 49, "price": 529, "product_id": 10, "purchase_id": 29, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:50", "label": "purchasedProducts", "from": "purchases:30", "to": "products:13", "data": {"id": 50, "price": 9.99, "product_id": 13, "purchase_id": 30, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:51", "label": "purchasedProducts", "from": "purchases:31", "to": "products:2", "data": {"id": 51, "price": 29.99, "product_id": 2, "purchase_id": 31, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:52", "label": "purchasedProducts", "from": "purchases:32", "to": "products:16", "data": {"id": 52, "price": 14.99, "product_id": 16, "purchase_id": 32, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:53", "label": "purchasedProducts", "from": "purchases:32", "to": "products:19", "data": {"id": 53, "price": 14.99, "product_id": 19, "purchase_id": 32, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:54", "label": "purchasedProducts", "from": "purchases:33", "to": "products:9", "data": {"id": 54, "price": 499, "product_id": 9, "purchase_id": 33, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:55", "label": "purchasedProducts", "from": "purchases:34", "to": "products:16", "data": {"id": 55, "price": 14.99, "product_id": 16, "purchase_id": 34, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:56", "label": "purchasedProducts", "from": "purchases:34", "to": "products:1", "data": {"id": 56, "price": 9.99, "product_id": 1, "purchase_id": 34, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:57", "label": "purchasedProducts", "from": "purchases:35", "to": "products:6", "data": {"id": 57, "price": 499.99, "product_id": 6, "purchase_id": 35, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:58", "label": "purchasedProducts", "from": "purchases:36", "to": "products:3", "data": {"id": 58, "price": 27.99, "product_id": 3, "purchase_id": 36, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:59", "label": "purchasedProducts", "from": "purchases:36", "to": "products:20", "data": {"id": 59, "price": 14.99, "product_id": 20, "purchase_id": 36, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:60", "label": "purchasedProducts", "from": "purchases:37", "to": "products:14", "data": {"id": 60, "price": 9.99, "product_id": 14, "purchase_id": 37, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:61", "label": "purchasedProducts", "from": "purchases:38", "to": "products:10", "data": {"id": 61, "price": 529, "product_id": 10, "purchase_id": 38, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:62", "label": "purchasedProducts", "from": "purchases:39", "to": "products:2", "data": {"id": 62, "price": 29.99, "product_id": 2, "purchase_id": 39, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:63", "label": "purchasedProducts", "from": "purchases:40", "to": "products:17", "data": {"id": 63, "price": 14.99, "product_id": 17, "purchase_id": 40, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:64", "label": "purchasedProducts", "from": "purchases:41", "to": "products:12", "data": {"id": 64, "price": 9.99, "product_id": 12, "purchase_id": 41, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:65", "label": "purchasedProducts", "from": "purchases:42", "to": "products:14", "data": {"id": 65, "price": 9.99, "product_id": 14, "purchase_id": 42, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:66", "label": "purchasedProducts", "from": "purchases:43", "to": "products:6", "data": {"id": 66, "price": 499.99, "product_id": 6, "purchase_id": 43, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:67", "label": "purchasedProducts", "from": "purchases:43", "to": "products:3", "data": {"id": 67, "price": 27.99, "product_id": 3, "purchase_id": 43, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:68", "label": "purchasedProducts", "from": "purchases:44", "to": "products:10", "data": {"id": 68, "price": 529, "product_id": 10, "purchase_id": 44, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:69", "label": "purchasedProducts", "from": "purchases:44", "to": "products:3", "data": {"id": 69, "price": 27.99, "product_id": 3, "purchase_id": 44, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:70", "label": "purchasedProducts", "from": "purchases:45", "to": "products:12", "data": {"id": 70, "price": 9.99, "product_id": 12, "purchase_id": 45, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:71", "label": "purchasedProducts", "from": "purchases:46", "to": "products:7", "data": {"id": 71, "price": 899.99, "product_id": 7, "purchase_id": 46, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:72", "label": "purchasedProducts", "from": "purchases:47", "to": "products:12", "data": {"id": 72, "price": 9.99, "product_id": 12, "purchase_id": 47, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:73", "label": "purchasedProducts", "from": "purchases:48", "to": "products:3", "data": {"id": 73, "price": 27.99, "product_id": 3, "purchase_id": 48, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:74", "label": "purchasedProducts", "from": "purchases:49", "to": "products:6", "data": {"id": 74, "price": 499.99, "product_id": 6, "purchase_id": 49, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:75", "label": "purchasedProducts", "from": "purchases:49", "to": "products:20", "data": {"id": 75, "price": 14.99, "product_id": 20, "purchase_id": 49, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:76", "label": "purchasedProducts", "from": "purchases:50", "to": "products:8", "data": {"id": 76, "price": 108, "product_id": 8, "purchase_id": 50, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:77", "label": "purchasedProducts", "from": "purchases:51", "to": "products:7", "data": {"id": 77, "price": 899.99, "product_id": 7, "purchase_id": 51, "quantity": 1, "state": "Pending"}} -{"gid": "purchase_items:78", "label": "purchasedProducts", "from": "purchases:52", "to": "products:9", "data": {"id": 78, "price": 499, "product_id": 9, "purchase_id": 52, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:79", "label": "purchasedProducts", "from": "purchases:53", "to": "products:16", "data": {"id": 79, "price": 14.99, "product_id": 16, "purchase_id": 53, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:80", "label": "purchasedProducts", "from": "purchases:54", "to": "products:16", "data": {"id": 80, "price": 14.99, "product_id": 16, "purchase_id": 54, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:81", "label": "purchasedProducts", "from": "purchases:55", "to": "products:4", "data": {"id": 81, "price": 7.99, "product_id": 4, "purchase_id": 55, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:82", "label": "purchasedProducts", "from": "purchases:55", "to": "products:15", "data": {"id": 82, "price": 9.99, "product_id": 15, "purchase_id": 55, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:83", "label": "purchasedProducts", "from": "purchases:55", "to": "products:19", "data": {"id": 83, "price": 14.99, "product_id": 19, "purchase_id": 55, "quantity": 5, "state": "Delivered"}} -{"gid": "purchase_items:84", "label": "purchasedProducts", "from": "purchases:56", "to": "products:14", "data": {"id": 84, "price": 9.99, "product_id": 14, "purchase_id": 56, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:85", "label": "purchasedProducts", "from": "purchases:57", "to": "products:3", "data": {"id": 85, "price": 27.99, "product_id": 3, "purchase_id": 57, "quantity": 3, "state": "Delivered"}} -{"gid": "purchase_items:86", "label": "purchasedProducts", "from": "purchases:58", "to": "products:9", "data": {"id": 86, "price": 499, "product_id": 9, "purchase_id": 58, "quantity": 4, "state": "Delivered"}} -{"gid": "purchase_items:87", "label": "purchasedProducts", "from": "purchases:58", "to": "products:16", "data": {"id": 87, "price": 14.99, "product_id": 16, "purchase_id": 58, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:88", "label": "purchasedProducts", "from": "purchases:59", "to": "products:1", "data": {"id": 88, "price": 9.99, "product_id": 1, "purchase_id": 59, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:89", "label": "purchasedProducts", "from": "purchases:60", "to": "products:1", "data": {"id": 89, "price": 9.99, "product_id": 1, "purchase_id": 60, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:90", "label": "purchasedProducts", "from": "purchases:61", "to": "products:2", "data": {"id": 90, "price": 29.99, "product_id": 2, "purchase_id": 61, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:91", "label": "purchasedProducts", "from": "purchases:61", "to": "products:15", "data": {"id": 91, "price": 9.99, "product_id": 15, "purchase_id": 61, "quantity": 3, "state": "Delivered"}} -{"gid": "purchase_items:92", "label": "purchasedProducts", "from": "purchases:62", "to": "products:14", "data": {"id": 92, "price": 9.99, "product_id": 14, "purchase_id": 62, "quantity": 5, "state": "Delivered"}} -{"gid": "purchase_items:93", "label": "purchasedProducts", "from": "purchases:63", "to": "products:6", "data": {"id": 93, "price": 499.99, "product_id": 6, "purchase_id": 63, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:94", "label": "purchasedProducts", "from": "purchases:64", "to": "products:20", "data": {"id": 94, "price": 14.99, "product_id": 20, "purchase_id": 64, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:95", "label": "purchasedProducts", "from": "purchases:65", "to": "products:15", "data": {"id": 95, "price": 9.99, "product_id": 15, "purchase_id": 65, "quantity": 1, "state": "Returned"}} -{"gid": "purchase_items:96", "label": "purchasedProducts", "from": "purchases:66", "to": "products:12", "data": {"id": 96, "price": 9.99, "product_id": 12, "purchase_id": 66, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:97", "label": "purchasedProducts", "from": "purchases:67", "to": "products:11", "data": {"id": 97, "price": 9.99, "product_id": 11, "purchase_id": 67, "quantity": 2, "state": "Returned"}} -{"gid": "purchase_items:98", "label": "purchasedProducts", "from": "purchases:68", "to": "products:11", "data": {"id": 98, "price": 9.99, "product_id": 11, "purchase_id": 68, "quantity": 3, "state": "Pending"}} -{"gid": "purchase_items:99", "label": "purchasedProducts", "from": "purchases:69", "to": "products:12", "data": {"id": 99, "price": 9.99, "product_id": 12, "purchase_id": 69, "quantity": 2, "state": "Delivered"}} -{"gid": "purchase_items:100", "label": "purchasedProducts", "from": "purchases:70", "to": "products:4", "data": {"id": 100, "price": 7.99, "product_id": 4, "purchase_id": 70, "quantity": 1, "state": "Delivered"}} -{"gid": "purchase_items:101", "label": "purchasedProducts", "from": "purchases:71", "to": "products:12", "data": {"id": 101, "price": 9.99, "product_id": 12, "purchase_id": 71, "quantity": 2, "state": "Delivered"}} -{"gid": "userPurchases:users:7:purchases:1", "label": "userPurchases", "from": "users:7", "to": "purchases:1", "data": {}} -{"gid": "userPurchases:users:30:purchases:2", "label": "userPurchases", "from": "users:30", "to": "purchases:2", "data": {}} -{"gid": "userPurchases:users:18:purchases:3", "label": "userPurchases", "from": "users:18", "to": "purchases:3", "data": {}} -{"gid": "userPurchases:users:11:purchases:4", "label": "userPurchases", "from": "users:11", "to": "purchases:4", "data": {}} -{"gid": "userPurchases:users:34:purchases:5", "label": "userPurchases", "from": "users:34", "to": "purchases:5", "data": {}} -{"gid": "userPurchases:users:39:purchases:6", "label": "userPurchases", "from": "users:39", "to": "purchases:6", "data": {}} -{"gid": "userPurchases:users:8:purchases:7", "label": "userPurchases", "from": "users:8", "to": "purchases:7", "data": {}} -{"gid": "userPurchases:users:50:purchases:8", "label": "userPurchases", "from": "users:50", "to": "purchases:8", "data": {}} -{"gid": "userPurchases:users:32:purchases:9", "label": "userPurchases", "from": "users:32", "to": "purchases:9", "data": {}} -{"gid": "userPurchases:users:23:purchases:10", "label": "userPurchases", "from": "users:23", "to": "purchases:10", "data": {}} -{"gid": "userPurchases:users:45:purchases:11", "label": "userPurchases", "from": "users:45", "to": "purchases:11", "data": {}} -{"gid": "userPurchases:users:25:purchases:12", "label": "userPurchases", "from": "users:25", "to": "purchases:12", "data": {}} -{"gid": "userPurchases:users:33:purchases:13", "label": "userPurchases", "from": "users:33", "to": "purchases:13", "data": {}} -{"gid": "userPurchases:users:5:purchases:14", "label": "userPurchases", "from": "users:5", "to": "purchases:14", "data": {}} -{"gid": "userPurchases:users:9:purchases:15", "label": "userPurchases", "from": "users:9", "to": "purchases:15", "data": {}} -{"gid": "userPurchases:users:22:purchases:16", "label": "userPurchases", "from": "users:22", "to": "purchases:16", "data": {}} -{"gid": "userPurchases:users:27:purchases:17", "label": "userPurchases", "from": "users:27", "to": "purchases:17", "data": {}} -{"gid": "userPurchases:users:36:purchases:18", "label": "userPurchases", "from": "users:36", "to": "purchases:18", "data": {}} -{"gid": "userPurchases:users:28:purchases:19", "label": "userPurchases", "from": "users:28", "to": "purchases:19", "data": {}} -{"gid": "userPurchases:users:37:purchases:20", "label": "userPurchases", "from": "users:37", "to": "purchases:20", "data": {}} -{"gid": "userPurchases:users:8:purchases:21", "label": "userPurchases", "from": "users:8", "to": "purchases:21", "data": {}} -{"gid": "userPurchases:users:45:purchases:22", "label": "userPurchases", "from": "users:45", "to": "purchases:22", "data": {}} -{"gid": "userPurchases:users:39:purchases:23", "label": "userPurchases", "from": "users:39", "to": "purchases:23", "data": {}} -{"gid": "userPurchases:users:37:purchases:24", "label": "userPurchases", "from": "users:37", "to": "purchases:24", "data": {}} -{"gid": "userPurchases:users:9:purchases:25", "label": "userPurchases", "from": "users:9", "to": "purchases:25", "data": {}} -{"gid": "userPurchases:users:11:purchases:26", "label": "userPurchases", "from": "users:11", "to": "purchases:26", "data": {}} -{"gid": "userPurchases:users:17:purchases:27", "label": "userPurchases", "from": "users:17", "to": "purchases:27", "data": {}} -{"gid": "userPurchases:users:34:purchases:28", "label": "userPurchases", "from": "users:34", "to": "purchases:28", "data": {}} -{"gid": "userPurchases:users:8:purchases:29", "label": "userPurchases", "from": "users:8", "to": "purchases:29", "data": {}} -{"gid": "userPurchases:users:27:purchases:30", "label": "userPurchases", "from": "users:27", "to": "purchases:30", "data": {}} -{"gid": "userPurchases:users:43:purchases:31", "label": "userPurchases", "from": "users:43", "to": "purchases:31", "data": {}} -{"gid": "userPurchases:users:48:purchases:32", "label": "userPurchases", "from": "users:48", "to": "purchases:32", "data": {}} -{"gid": "userPurchases:users:25:purchases:33", "label": "userPurchases", "from": "users:25", "to": "purchases:33", "data": {}} -{"gid": "userPurchases:users:5:purchases:34", "label": "userPurchases", "from": "users:5", "to": "purchases:34", "data": {}} -{"gid": "userPurchases:users:18:purchases:35", "label": "userPurchases", "from": "users:18", "to": "purchases:35", "data": {}} -{"gid": "userPurchases:users:37:purchases:36", "label": "userPurchases", "from": "users:37", "to": "purchases:36", "data": {}} -{"gid": "userPurchases:users:47:purchases:37", "label": "userPurchases", "from": "users:47", "to": "purchases:37", "data": {}} -{"gid": "userPurchases:users:20:purchases:38", "label": "userPurchases", "from": "users:20", "to": "purchases:38", "data": {}} -{"gid": "userPurchases:users:15:purchases:39", "label": "userPurchases", "from": "users:15", "to": "purchases:39", "data": {}} -{"gid": "userPurchases:users:40:purchases:40", "label": "userPurchases", "from": "users:40", "to": "purchases:40", "data": {}} -{"gid": "userPurchases:users:24:purchases:41", "label": "userPurchases", "from": "users:24", "to": "purchases:41", "data": {}} -{"gid": "userPurchases:users:48:purchases:42", "label": "userPurchases", "from": "users:48", "to": "purchases:42", "data": {}} -{"gid": "userPurchases:users:44:purchases:43", "label": "userPurchases", "from": "users:44", "to": "purchases:43", "data": {}} -{"gid": "userPurchases:users:49:purchases:44", "label": "userPurchases", "from": "users:49", "to": "purchases:44", "data": {}} -{"gid": "userPurchases:users:42:purchases:45", "label": "userPurchases", "from": "users:42", "to": "purchases:45", "data": {}} -{"gid": "userPurchases:users:16:purchases:46", "label": "userPurchases", "from": "users:16", "to": "purchases:46", "data": {}} -{"gid": "userPurchases:users:18:purchases:47", "label": "userPurchases", "from": "users:18", "to": "purchases:47", "data": {}} -{"gid": "userPurchases:users:50:purchases:48", "label": "userPurchases", "from": "users:50", "to": "purchases:48", "data": {}} -{"gid": "userPurchases:users:9:purchases:49", "label": "userPurchases", "from": "users:9", "to": "purchases:49", "data": {}} -{"gid": "userPurchases:users:27:purchases:50", "label": "userPurchases", "from": "users:27", "to": "purchases:50", "data": {}} -{"gid": "userPurchases:users:23:purchases:51", "label": "userPurchases", "from": "users:23", "to": "purchases:51", "data": {}} -{"gid": "userPurchases:users:35:purchases:52", "label": "userPurchases", "from": "users:35", "to": "purchases:52", "data": {}} -{"gid": "userPurchases:users:15:purchases:53", "label": "userPurchases", "from": "users:15", "to": "purchases:53", "data": {}} -{"gid": "userPurchases:users:23:purchases:54", "label": "userPurchases", "from": "users:23", "to": "purchases:54", "data": {}} -{"gid": "userPurchases:users:24:purchases:55", "label": "userPurchases", "from": "users:24", "to": "purchases:55", "data": {}} -{"gid": "userPurchases:users:10:purchases:56", "label": "userPurchases", "from": "users:10", "to": "purchases:56", "data": {}} -{"gid": "userPurchases:users:1:purchases:57", "label": "userPurchases", "from": "users:1", "to": "purchases:57", "data": {}} -{"gid": "userPurchases:users:41:purchases:58", "label": "userPurchases", "from": "users:41", "to": "purchases:58", "data": {}} -{"gid": "userPurchases:users:31:purchases:59", "label": "userPurchases", "from": "users:31", "to": "purchases:59", "data": {}} -{"gid": "userPurchases:users:43:purchases:60", "label": "userPurchases", "from": "users:43", "to": "purchases:60", "data": {}} -{"gid": "userPurchases:users:2:purchases:61", "label": "userPurchases", "from": "users:2", "to": "purchases:61", "data": {}} -{"gid": "userPurchases:users:6:purchases:62", "label": "userPurchases", "from": "users:6", "to": "purchases:62", "data": {}} -{"gid": "userPurchases:users:13:purchases:63", "label": "userPurchases", "from": "users:13", "to": "purchases:63", "data": {}} -{"gid": "userPurchases:users:16:purchases:64", "label": "userPurchases", "from": "users:16", "to": "purchases:64", "data": {}} -{"gid": "userPurchases:users:29:purchases:65", "label": "userPurchases", "from": "users:29", "to": "purchases:65", "data": {}} -{"gid": "userPurchases:users:29:purchases:66", "label": "userPurchases", "from": "users:29", "to": "purchases:66", "data": {}} -{"gid": "userPurchases:users:35:purchases:67", "label": "userPurchases", "from": "users:35", "to": "purchases:67", "data": {}} -{"gid": "userPurchases:users:20:purchases:68", "label": "userPurchases", "from": "users:20", "to": "purchases:68", "data": {}} -{"gid": "userPurchases:users:14:purchases:69", "label": "userPurchases", "from": "users:14", "to": "purchases:69", "data": {}} -{"gid": "userPurchases:users:29:purchases:70", "label": "userPurchases", "from": "users:29", "to": "purchases:70", "data": {}} -{"gid": "userPurchases:users:37:purchases:71", "label": "userPurchases", "from": "users:37", "to": "purchases:71", "data": {}} -{"gid": "userPurchases:users:7:purchases:72", "label": "userPurchases", "from": "users:7", "to": "purchases:72", "data": {}} -{"gid": "userPurchases:users:10:purchases:73", "label": "userPurchases", "from": "users:10", "to": "purchases:73", "data": {}} -{"gid": "userPurchases:users:23:purchases:74", "label": "userPurchases", "from": "users:23", "to": "purchases:74", "data": {}} -{"gid": "userPurchases:users:12:purchases:75", "label": "userPurchases", "from": "users:12", "to": "purchases:75", "data": {}} -{"gid": "userPurchases:users:26:purchases:76", "label": "userPurchases", "from": "users:26", "to": "purchases:76", "data": {}} -{"gid": "userPurchases:users:44:purchases:77", "label": "userPurchases", "from": "users:44", "to": "purchases:77", "data": {}} -{"gid": "userPurchases:users:3:purchases:78", "label": "userPurchases", "from": "users:3", "to": "purchases:78", "data": {}} -{"gid": "userPurchases:users:16:purchases:79", "label": "userPurchases", "from": "users:16", "to": "purchases:79", "data": {}} -{"gid": "userPurchases:users:16:purchases:80", "label": "userPurchases", "from": "users:16", "to": "purchases:80", "data": {}} -{"gid": "userPurchases:users:20:purchases:81", "label": "userPurchases", "from": "users:20", "to": "purchases:81", "data": {}} -{"gid": "userPurchases:users:23:purchases:82", "label": "userPurchases", "from": "users:23", "to": "purchases:82", "data": {}} -{"gid": "userPurchases:users:8:purchases:83", "label": "userPurchases", "from": "users:8", "to": "purchases:83", "data": {}} -{"gid": "userPurchases:users:13:purchases:84", "label": "userPurchases", "from": "users:13", "to": "purchases:84", "data": {}} -{"gid": "userPurchases:users:15:purchases:85", "label": "userPurchases", "from": "users:15", "to": "purchases:85", "data": {}} -{"gid": "userPurchases:users:26:purchases:86", "label": "userPurchases", "from": "users:26", "to": "purchases:86", "data": {}} -{"gid": "userPurchases:users:15:purchases:87", "label": "userPurchases", "from": "users:15", "to": "purchases:87", "data": {}} -{"gid": "userPurchases:users:37:purchases:88", "label": "userPurchases", "from": "users:37", "to": "purchases:88", "data": {}} -{"gid": "userPurchases:users:7:purchases:89", "label": "userPurchases", "from": "users:7", "to": "purchases:89", "data": {}} -{"gid": "userPurchases:users:44:purchases:90", "label": "userPurchases", "from": "users:44", "to": "purchases:90", "data": {}} -{"gid": "userPurchases:users:8:purchases:91", "label": "userPurchases", "from": "users:8", "to": "purchases:91", "data": {}} -{"gid": "userPurchases:users:18:purchases:92", "label": "userPurchases", "from": "users:18", "to": "purchases:92", "data": {}} -{"gid": "userPurchases:users:32:purchases:93", "label": "userPurchases", "from": "users:32", "to": "purchases:93", "data": {}} -{"gid": "userPurchases:users:48:purchases:94", "label": "userPurchases", "from": "users:48", "to": "purchases:94", "data": {}} -{"gid": "userPurchases:users:38:purchases:95", "label": "userPurchases", "from": "users:38", "to": "purchases:95", "data": {}} -{"gid": "userPurchases:users:23:purchases:96", "label": "userPurchases", "from": "users:23", "to": "purchases:96", "data": {}} -{"gid": "userPurchases:users:23:purchases:97", "label": "userPurchases", "from": "users:23", "to": "purchases:97", "data": {}} -{"gid": "userPurchases:users:49:purchases:98", "label": "userPurchases", "from": "users:49", "to": "purchases:98", "data": {}} -{"gid": "userPurchases:users:36:purchases:99", "label": "userPurchases", "from": "users:36", "to": "purchases:99", "data": {}} -{"gid": "userPurchases:users:12:purchases:100", "label": "userPurchases", "from": "users:12", "to": "purchases:100", "data": {}} +{"_id": "purchase_items:2", "_label": "purchasedProducts", "_from": "purchases:1", "_to": "products:3", "id": 2, "price": 27.99, "product_id": 3, "purchase_id": 1, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:3", "_label": "purchasedProducts", "_from": "purchases:1", "_to": "products:8", "id": 3, "price": 108, "product_id": 8, "purchase_id": 1, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:4", "_label": "purchasedProducts", "_from": "purchases:2", "_to": "products:1", "id": 4, "price": 9.99, "product_id": 1, "purchase_id": 2, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:5", "_label": "purchasedProducts", "_from": "purchases:3", "_to": "products:12", "id": 5, "price": 9.99, "product_id": 12, "purchase_id": 3, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:6", "_label": "purchasedProducts", "_from": "purchases:3", "_to": "products:17", "id": 6, "price": 14.99, "product_id": 17, "purchase_id": 3, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:7", "_label": "purchasedProducts", "_from": "purchases:3", "_to": "products:11", "id": 7, "price": 9.99, "product_id": 11, "purchase_id": 3, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:8", "_label": "purchasedProducts", "_from": "purchases:4", "_to": "products:4", "id": 8, "price": 7.99, "product_id": 4, "purchase_id": 4, "quantity": 3, "state": "Delivered"} +{"_id": "purchase_items:9", "_label": "purchasedProducts", "_from": "purchases:5", "_to": "products:18", "id": 9, "price": 14.99, "product_id": 18, "purchase_id": 5, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:10", "_label": "purchasedProducts", "_from": "purchases:5", "_to": "products:2", "id": 10, "price": 29.99, "product_id": 2, "purchase_id": 5, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:11", "_label": "purchasedProducts", "_from": "purchases:6", "_to": "products:5", "id": 11, "price": 5.99, "product_id": 5, "purchase_id": 6, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:12", "_label": "purchasedProducts", "_from": "purchases:7", "_to": "products:6", "id": 12, "price": 499.99, "product_id": 6, "purchase_id": 7, "quantity": 3, "state": "Returned"} +{"_id": "purchase_items:13", "_label": "purchasedProducts", "_from": "purchases:8", "_to": "products:10", "id": 13, "price": 529, "product_id": 10, "purchase_id": 8, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:14", "_label": "purchasedProducts", "_from": "purchases:8", "_to": "products:7", "id": 14, "price": 899.99, "product_id": 7, "purchase_id": 8, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:15", "_label": "purchasedProducts", "_from": "purchases:9", "_to": "products:15", "id": 15, "price": 9.99, "product_id": 15, "purchase_id": 9, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:16", "_label": "purchasedProducts", "_from": "purchases:10", "_to": "products:2", "id": 16, "price": 29.99, "product_id": 2, "purchase_id": 10, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:17", "_label": "purchasedProducts", "_from": "purchases:11", "_to": "products:9", "id": 17, "price": 499, "product_id": 9, "purchase_id": 11, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:18", "_label": "purchasedProducts", "_from": "purchases:12", "_to": "products:14", "id": 18, "price": 9.99, "product_id": 14, "purchase_id": 12, "quantity": 5, "state": "Delivered"} +{"_id": "purchase_items:19", "_label": "purchasedProducts", "_from": "purchases:12", "_to": "products:10", "id": 19, "price": 529, "product_id": 10, "purchase_id": 12, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:20", "_label": "purchasedProducts", "_from": "purchases:13", "_to": "products:8", "id": 20, "price": 108, "product_id": 8, "purchase_id": 13, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:21", "_label": "purchasedProducts", "_from": "purchases:14", "_to": "products:20", "id": 21, "price": 14.99, "product_id": 20, "purchase_id": 14, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:22", "_label": "purchasedProducts", "_from": "purchases:14", "_to": "products:7", "id": 22, "price": 899.99, "product_id": 7, "purchase_id": 14, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:23", "_label": "purchasedProducts", "_from": "purchases:14", "_to": "products:9", "id": 23, "price": 499, "product_id": 9, "purchase_id": 14, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:24", "_label": "purchasedProducts", "_from": "purchases:15", "_to": "products:10", "id": 24, "price": 529, "product_id": 10, "purchase_id": 15, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:25", "_label": "purchasedProducts", "_from": "purchases:16", "_to": "products:2", "id": 25, "price": 29.99, "product_id": 2, "purchase_id": 16, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:26", "_label": "purchasedProducts", "_from": "purchases:16", "_to": "products:11", "id": 26, "price": 9.99, "product_id": 11, "purchase_id": 16, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:27", "_label": "purchasedProducts", "_from": "purchases:16", "_to": "products:5", "id": 27, "price": 5.99, "product_id": 5, "purchase_id": 16, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:28", "_label": "purchasedProducts", "_from": "purchases:17", "_to": "products:15", "id": 28, "price": 9.99, "product_id": 15, "purchase_id": 17, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:29", "_label": "purchasedProducts", "_from": "purchases:18", "_to": "products:4", "id": 29, "price": 7.99, "product_id": 4, "purchase_id": 18, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:30", "_label": "purchasedProducts", "_from": "purchases:19", "_to": "products:1", "id": 30, "price": 9.99, "product_id": 1, "purchase_id": 19, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:31", "_label": "purchasedProducts", "_from": "purchases:19", "_to": "products:7", "id": 31, "price": 899.99, "product_id": 7, "purchase_id": 19, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:32", "_label": "purchasedProducts", "_from": "purchases:19", "_to": "products:9", "id": 32, "price": 499, "product_id": 9, "purchase_id": 19, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:33", "_label": "purchasedProducts", "_from": "purchases:20", "_to": "products:20", "id": 33, "price": 14.99, "product_id": 20, "purchase_id": 20, "quantity": 5, "state": "Delivered"} +{"_id": "purchase_items:34", "_label": "purchasedProducts", "_from": "purchases:21", "_to": "products:13", "id": 34, "price": 9.99, "product_id": 13, "purchase_id": 21, "quantity": 3, "state": "Delivered"} +{"_id": "purchase_items:35", "_label": "purchasedProducts", "_from": "purchases:21", "_to": "products:20", "id": 35, "price": 14.99, "product_id": 20, "purchase_id": 21, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:36", "_label": "purchasedProducts", "_from": "purchases:22", "_to": "products:7", "id": 36, "price": 899.99, "product_id": 7, "purchase_id": 22, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:37", "_label": "purchasedProducts", "_from": "purchases:22", "_to": "products:4", "id": 37, "price": 7.99, "product_id": 4, "purchase_id": 22, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:38", "_label": "purchasedProducts", "_from": "purchases:22", "_to": "products:15", "id": 38, "price": 9.99, "product_id": 15, "purchase_id": 22, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:39", "_label": "purchasedProducts", "_from": "purchases:23", "_to": "products:4", "id": 39, "price": 7.99, "product_id": 4, "purchase_id": 23, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:40", "_label": "purchasedProducts", "_from": "purchases:24", "_to": "products:4", "id": 40, "price": 7.99, "product_id": 4, "purchase_id": 24, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:41", "_label": "purchasedProducts", "_from": "purchases:25", "_to": "products:14", "id": 41, "price": 9.99, "product_id": 14, "purchase_id": 25, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:42", "_label": "purchasedProducts", "_from": "purchases:25", "_to": "products:12", "id": 42, "price": 9.99, "product_id": 12, "purchase_id": 25, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:43", "_label": "purchasedProducts", "_from": "purchases:26", "_to": "products:12", "id": 43, "price": 9.99, "product_id": 12, "purchase_id": 26, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:44", "_label": "purchasedProducts", "_from": "purchases:26", "_to": "products:6", "id": 44, "price": 499.99, "product_id": 6, "purchase_id": 26, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:45", "_label": "purchasedProducts", "_from": "purchases:26", "_to": "products:4", "id": 45, "price": 7.99, "product_id": 4, "purchase_id": 26, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:46", "_label": "purchasedProducts", "_from": "purchases:27", "_to": "products:11", "id": 46, "price": 9.99, "product_id": 11, "purchase_id": 27, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:47", "_label": "purchasedProducts", "_from": "purchases:28", "_to": "products:9", "id": 47, "price": 499, "product_id": 9, "purchase_id": 28, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:48", "_label": "purchasedProducts", "_from": "purchases:29", "_to": "products:8", "id": 48, "price": 108, "product_id": 8, "purchase_id": 29, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:49", "_label": "purchasedProducts", "_from": "purchases:29", "_to": "products:10", "id": 49, "price": 529, "product_id": 10, "purchase_id": 29, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:50", "_label": "purchasedProducts", "_from": "purchases:30", "_to": "products:13", "id": 50, "price": 9.99, "product_id": 13, "purchase_id": 30, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:51", "_label": "purchasedProducts", "_from": "purchases:31", "_to": "products:2", "id": 51, "price": 29.99, "product_id": 2, "purchase_id": 31, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:52", "_label": "purchasedProducts", "_from": "purchases:32", "_to": "products:16", "id": 52, "price": 14.99, "product_id": 16, "purchase_id": 32, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:53", "_label": "purchasedProducts", "_from": "purchases:32", "_to": "products:19", "id": 53, "price": 14.99, "product_id": 19, "purchase_id": 32, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:54", "_label": "purchasedProducts", "_from": "purchases:33", "_to": "products:9", "id": 54, "price": 499, "product_id": 9, "purchase_id": 33, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:55", "_label": "purchasedProducts", "_from": "purchases:34", "_to": "products:16", "id": 55, "price": 14.99, "product_id": 16, "purchase_id": 34, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:56", "_label": "purchasedProducts", "_from": "purchases:34", "_to": "products:1", "id": 56, "price": 9.99, "product_id": 1, "purchase_id": 34, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:57", "_label": "purchasedProducts", "_from": "purchases:35", "_to": "products:6", "id": 57, "price": 499.99, "product_id": 6, "purchase_id": 35, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:58", "_label": "purchasedProducts", "_from": "purchases:36", "_to": "products:3", "id": 58, "price": 27.99, "product_id": 3, "purchase_id": 36, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:59", "_label": "purchasedProducts", "_from": "purchases:36", "_to": "products:20", "id": 59, "price": 14.99, "product_id": 20, "purchase_id": 36, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:60", "_label": "purchasedProducts", "_from": "purchases:37", "_to": "products:14", "id": 60, "price": 9.99, "product_id": 14, "purchase_id": 37, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:61", "_label": "purchasedProducts", "_from": "purchases:38", "_to": "products:10", "id": 61, "price": 529, "product_id": 10, "purchase_id": 38, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:62", "_label": "purchasedProducts", "_from": "purchases:39", "_to": "products:2", "id": 62, "price": 29.99, "product_id": 2, "purchase_id": 39, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:63", "_label": "purchasedProducts", "_from": "purchases:40", "_to": "products:17", "id": 63, "price": 14.99, "product_id": 17, "purchase_id": 40, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:64", "_label": "purchasedProducts", "_from": "purchases:41", "_to": "products:12", "id": 64, "price": 9.99, "product_id": 12, "purchase_id": 41, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:65", "_label": "purchasedProducts", "_from": "purchases:42", "_to": "products:14", "id": 65, "price": 9.99, "product_id": 14, "purchase_id": 42, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:66", "_label": "purchasedProducts", "_from": "purchases:43", "_to": "products:6", "id": 66, "price": 499.99, "product_id": 6, "purchase_id": 43, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:67", "_label": "purchasedProducts", "_from": "purchases:43", "_to": "products:3", "id": 67, "price": 27.99, "product_id": 3, "purchase_id": 43, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:68", "_label": "purchasedProducts", "_from": "purchases:44", "_to": "products:10", "id": 68, "price": 529, "product_id": 10, "purchase_id": 44, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:69", "_label": "purchasedProducts", "_from": "purchases:44", "_to": "products:3", "id": 69, "price": 27.99, "product_id": 3, "purchase_id": 44, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:70", "_label": "purchasedProducts", "_from": "purchases:45", "_to": "products:12", "id": 70, "price": 9.99, "product_id": 12, "purchase_id": 45, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:71", "_label": "purchasedProducts", "_from": "purchases:46", "_to": "products:7", "id": 71, "price": 899.99, "product_id": 7, "purchase_id": 46, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:72", "_label": "purchasedProducts", "_from": "purchases:47", "_to": "products:12", "id": 72, "price": 9.99, "product_id": 12, "purchase_id": 47, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:73", "_label": "purchasedProducts", "_from": "purchases:48", "_to": "products:3", "id": 73, "price": 27.99, "product_id": 3, "purchase_id": 48, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:74", "_label": "purchasedProducts", "_from": "purchases:49", "_to": "products:6", "id": 74, "price": 499.99, "product_id": 6, "purchase_id": 49, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:75", "_label": "purchasedProducts", "_from": "purchases:49", "_to": "products:20", "id": 75, "price": 14.99, "product_id": 20, "purchase_id": 49, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:76", "_label": "purchasedProducts", "_from": "purchases:50", "_to": "products:8", "id": 76, "price": 108, "product_id": 8, "purchase_id": 50, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:77", "_label": "purchasedProducts", "_from": "purchases:51", "_to": "products:7", "id": 77, "price": 899.99, "product_id": 7, "purchase_id": 51, "quantity": 1, "state": "Pending"} +{"_id": "purchase_items:78", "_label": "purchasedProducts", "_from": "purchases:52", "_to": "products:9", "id": 78, "price": 499, "product_id": 9, "purchase_id": 52, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:79", "_label": "purchasedProducts", "_from": "purchases:53", "_to": "products:16", "id": 79, "price": 14.99, "product_id": 16, "purchase_id": 53, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:80", "_label": "purchasedProducts", "_from": "purchases:54", "_to": "products:16", "id": 80, "price": 14.99, "product_id": 16, "purchase_id": 54, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:81", "_label": "purchasedProducts", "_from": "purchases:55", "_to": "products:4", "id": 81, "price": 7.99, "product_id": 4, "purchase_id": 55, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:82", "_label": "purchasedProducts", "_from": "purchases:55", "_to": "products:15", "id": 82, "price": 9.99, "product_id": 15, "purchase_id": 55, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:83", "_label": "purchasedProducts", "_from": "purchases:55", "_to": "products:19", "id": 83, "price": 14.99, "product_id": 19, "purchase_id": 55, "quantity": 5, "state": "Delivered"} +{"_id": "purchase_items:84", "_label": "purchasedProducts", "_from": "purchases:56", "_to": "products:14", "id": 84, "price": 9.99, "product_id": 14, "purchase_id": 56, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:85", "_label": "purchasedProducts", "_from": "purchases:57", "_to": "products:3", "id": 85, "price": 27.99, "product_id": 3, "purchase_id": 57, "quantity": 3, "state": "Delivered"} +{"_id": "purchase_items:86", "_label": "purchasedProducts", "_from": "purchases:58", "_to": "products:9", "id": 86, "price": 499, "product_id": 9, "purchase_id": 58, "quantity": 4, "state": "Delivered"} +{"_id": "purchase_items:87", "_label": "purchasedProducts", "_from": "purchases:58", "_to": "products:16", "id": 87, "price": 14.99, "product_id": 16, "purchase_id": 58, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:88", "_label": "purchasedProducts", "_from": "purchases:59", "_to": "products:1", "id": 88, "price": 9.99, "product_id": 1, "purchase_id": 59, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:89", "_label": "purchasedProducts", "_from": "purchases:60", "_to": "products:1", "id": 89, "price": 9.99, "product_id": 1, "purchase_id": 60, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:90", "_label": "purchasedProducts", "_from": "purchases:61", "_to": "products:2", "id": 90, "price": 29.99, "product_id": 2, "purchase_id": 61, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:91", "_label": "purchasedProducts", "_from": "purchases:61", "_to": "products:15", "id": 91, "price": 9.99, "product_id": 15, "purchase_id": 61, "quantity": 3, "state": "Delivered"} +{"_id": "purchase_items:92", "_label": "purchasedProducts", "_from": "purchases:62", "_to": "products:14", "id": 92, "price": 9.99, "product_id": 14, "purchase_id": 62, "quantity": 5, "state": "Delivered"} +{"_id": "purchase_items:93", "_label": "purchasedProducts", "_from": "purchases:63", "_to": "products:6", "id": 93, "price": 499.99, "product_id": 6, "purchase_id": 63, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:94", "_label": "purchasedProducts", "_from": "purchases:64", "_to": "products:20", "id": 94, "price": 14.99, "product_id": 20, "purchase_id": 64, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:95", "_label": "purchasedProducts", "_from": "purchases:65", "_to": "products:15", "id": 95, "price": 9.99, "product_id": 15, "purchase_id": 65, "quantity": 1, "state": "Returned"} +{"_id": "purchase_items:96", "_label": "purchasedProducts", "_from": "purchases:66", "_to": "products:12", "id": 96, "price": 9.99, "product_id": 12, "purchase_id": 66, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:97", "_label": "purchasedProducts", "_from": "purchases:67", "_to": "products:11", "id": 97, "price": 9.99, "product_id": 11, "purchase_id": 67, "quantity": 2, "state": "Returned"} +{"_id": "purchase_items:98", "_label": "purchasedProducts", "_from": "purchases:68", "_to": "products:11", "id": 98, "price": 9.99, "product_id": 11, "purchase_id": 68, "quantity": 3, "state": "Pending"} +{"_id": "purchase_items:99", "_label": "purchasedProducts", "_from": "purchases:69", "_to": "products:12", "id": 99, "price": 9.99, "product_id": 12, "purchase_id": 69, "quantity": 2, "state": "Delivered"} +{"_id": "purchase_items:100", "_label": "purchasedProducts", "_from": "purchases:70", "_to": "products:4", "id": 100, "price": 7.99, "product_id": 4, "purchase_id": 70, "quantity": 1, "state": "Delivered"} +{"_id": "purchase_items:101", "_label": "purchasedProducts", "_from": "purchases:71", "_to": "products:12", "id": 101, "price": 9.99, "product_id": 12, "purchase_id": 71, "quantity": 2, "state": "Delivered"} +{"_id": "userPurchases:users:7:purchases:1", "_label": "userPurchases", "_from": "users:7", "_to": "purchases:1"} +{"_id": "userPurchases:users:30:purchases:2", "_label": "userPurchases", "_from": "users:30", "_to": "purchases:2"} +{"_id": "userPurchases:users:18:purchases:3", "_label": "userPurchases", "_from": "users:18", "_to": "purchases:3"} +{"_id": "userPurchases:users:11:purchases:4", "_label": "userPurchases", "_from": "users:11", "_to": "purchases:4"} +{"_id": "userPurchases:users:34:purchases:5", "_label": "userPurchases", "_from": "users:34", "_to": "purchases:5"} +{"_id": "userPurchases:users:39:purchases:6", "_label": "userPurchases", "_from": "users:39", "_to": "purchases:6"} +{"_id": "userPurchases:users:8:purchases:7", "_label": "userPurchases", "_from": "users:8", "_to": "purchases:7"} +{"_id": "userPurchases:users:50:purchases:8", "_label": "userPurchases", "_from": "users:50", "_to": "purchases:8"} +{"_id": "userPurchases:users:32:purchases:9", "_label": "userPurchases", "_from": "users:32", "_to": "purchases:9"} +{"_id": "userPurchases:users:23:purchases:10", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:10"} +{"_id": "userPurchases:users:45:purchases:11", "_label": "userPurchases", "_from": "users:45", "_to": "purchases:11"} +{"_id": "userPurchases:users:25:purchases:12", "_label": "userPurchases", "_from": "users:25", "_to": "purchases:12"} +{"_id": "userPurchases:users:33:purchases:13", "_label": "userPurchases", "_from": "users:33", "_to": "purchases:13"} +{"_id": "userPurchases:users:5:purchases:14", "_label": "userPurchases", "_from": "users:5", "_to": "purchases:14"} +{"_id": "userPurchases:users:9:purchases:15", "_label": "userPurchases", "_from": "users:9", "_to": "purchases:15"} +{"_id": "userPurchases:users:22:purchases:16", "_label": "userPurchases", "_from": "users:22", "_to": "purchases:16"} +{"_id": "userPurchases:users:27:purchases:17", "_label": "userPurchases", "_from": "users:27", "_to": "purchases:17"} +{"_id": "userPurchases:users:36:purchases:18", "_label": "userPurchases", "_from": "users:36", "_to": "purchases:18"} +{"_id": "userPurchases:users:28:purchases:19", "_label": "userPurchases", "_from": "users:28", "_to": "purchases:19"} +{"_id": "userPurchases:users:37:purchases:20", "_label": "userPurchases", "_from": "users:37", "_to": "purchases:20"} +{"_id": "userPurchases:users:8:purchases:21", "_label": "userPurchases", "_from": "users:8", "_to": "purchases:21"} +{"_id": "userPurchases:users:45:purchases:22", "_label": "userPurchases", "_from": "users:45", "_to": "purchases:22"} +{"_id": "userPurchases:users:39:purchases:23", "_label": "userPurchases", "_from": "users:39", "_to": "purchases:23"} +{"_id": "userPurchases:users:37:purchases:24", "_label": "userPurchases", "_from": "users:37", "_to": "purchases:24"} +{"_id": "userPurchases:users:9:purchases:25", "_label": "userPurchases", "_from": "users:9", "_to": "purchases:25"} +{"_id": "userPurchases:users:11:purchases:26", "_label": "userPurchases", "_from": "users:11", "_to": "purchases:26"} +{"_id": "userPurchases:users:17:purchases:27", "_label": "userPurchases", "_from": "users:17", "_to": "purchases:27"} +{"_id": "userPurchases:users:34:purchases:28", "_label": "userPurchases", "_from": "users:34", "_to": "purchases:28"} +{"_id": "userPurchases:users:8:purchases:29", "_label": "userPurchases", "_from": "users:8", "_to": "purchases:29"} +{"_id": "userPurchases:users:27:purchases:30", "_label": "userPurchases", "_from": "users:27", "_to": "purchases:30"} +{"_id": "userPurchases:users:43:purchases:31", "_label": "userPurchases", "_from": "users:43", "_to": "purchases:31"} +{"_id": "userPurchases:users:48:purchases:32", "_label": "userPurchases", "_from": "users:48", "_to": "purchases:32"} +{"_id": "userPurchases:users:25:purchases:33", "_label": "userPurchases", "_from": "users:25", "_to": "purchases:33"} +{"_id": "userPurchases:users:5:purchases:34", "_label": "userPurchases", "_from": "users:5", "_to": "purchases:34"} +{"_id": "userPurchases:users:18:purchases:35", "_label": "userPurchases", "_from": "users:18", "_to": "purchases:35"} +{"_id": "userPurchases:users:37:purchases:36", "_label": "userPurchases", "_from": "users:37", "_to": "purchases:36"} +{"_id": "userPurchases:users:47:purchases:37", "_label": "userPurchases", "_from": "users:47", "_to": "purchases:37"} +{"_id": "userPurchases:users:20:purchases:38", "_label": "userPurchases", "_from": "users:20", "_to": "purchases:38"} +{"_id": "userPurchases:users:15:purchases:39", "_label": "userPurchases", "_from": "users:15", "_to": "purchases:39"} +{"_id": "userPurchases:users:40:purchases:40", "_label": "userPurchases", "_from": "users:40", "_to": "purchases:40"} +{"_id": "userPurchases:users:24:purchases:41", "_label": "userPurchases", "_from": "users:24", "_to": "purchases:41"} +{"_id": "userPurchases:users:48:purchases:42", "_label": "userPurchases", "_from": "users:48", "_to": "purchases:42"} +{"_id": "userPurchases:users:44:purchases:43", "_label": "userPurchases", "_from": "users:44", "_to": "purchases:43"} +{"_id": "userPurchases:users:49:purchases:44", "_label": "userPurchases", "_from": "users:49", "_to": "purchases:44"} +{"_id": "userPurchases:users:42:purchases:45", "_label": "userPurchases", "_from": "users:42", "_to": "purchases:45"} +{"_id": "userPurchases:users:16:purchases:46", "_label": "userPurchases", "_from": "users:16", "_to": "purchases:46"} +{"_id": "userPurchases:users:18:purchases:47", "_label": "userPurchases", "_from": "users:18", "_to": "purchases:47"} +{"_id": "userPurchases:users:50:purchases:48", "_label": "userPurchases", "_from": "users:50", "_to": "purchases:48"} +{"_id": "userPurchases:users:9:purchases:49", "_label": "userPurchases", "_from": "users:9", "_to": "purchases:49"} +{"_id": "userPurchases:users:27:purchases:50", "_label": "userPurchases", "_from": "users:27", "_to": "purchases:50"} +{"_id": "userPurchases:users:23:purchases:51", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:51"} +{"_id": "userPurchases:users:35:purchases:52", "_label": "userPurchases", "_from": "users:35", "_to": "purchases:52"} +{"_id": "userPurchases:users:15:purchases:53", "_label": "userPurchases", "_from": "users:15", "_to": "purchases:53"} +{"_id": "userPurchases:users:23:purchases:54", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:54"} +{"_id": "userPurchases:users:24:purchases:55", "_label": "userPurchases", "_from": "users:24", "_to": "purchases:55"} +{"_id": "userPurchases:users:10:purchases:56", "_label": "userPurchases", "_from": "users:10", "_to": "purchases:56"} +{"_id": "userPurchases:users:1:purchases:57", "_label": "userPurchases", "_from": "users:1", "_to": "purchases:57"} +{"_id": "userPurchases:users:41:purchases:58", "_label": "userPurchases", "_from": "users:41", "_to": "purchases:58"} +{"_id": "userPurchases:users:31:purchases:59", "_label": "userPurchases", "_from": "users:31", "_to": "purchases:59"} +{"_id": "userPurchases:users:43:purchases:60", "_label": "userPurchases", "_from": "users:43", "_to": "purchases:60"} +{"_id": "userPurchases:users:2:purchases:61", "_label": "userPurchases", "_from": "users:2", "_to": "purchases:61"} +{"_id": "userPurchases:users:6:purchases:62", "_label": "userPurchases", "_from": "users:6", "_to": "purchases:62"} +{"_id": "userPurchases:users:13:purchases:63", "_label": "userPurchases", "_from": "users:13", "_to": "purchases:63"} +{"_id": "userPurchases:users:16:purchases:64", "_label": "userPurchases", "_from": "users:16", "_to": "purchases:64"} +{"_id": "userPurchases:users:29:purchases:65", "_label": "userPurchases", "_from": "users:29", "_to": "purchases:65"} +{"_id": "userPurchases:users:29:purchases:66", "_label": "userPurchases", "_from": "users:29", "_to": "purchases:66"} +{"_id": "userPurchases:users:35:purchases:67", "_label": "userPurchases", "_from": "users:35", "_to": "purchases:67"} +{"_id": "userPurchases:users:20:purchases:68", "_label": "userPurchases", "_from": "users:20", "_to": "purchases:68"} +{"_id": "userPurchases:users:14:purchases:69", "_label": "userPurchases", "_from": "users:14", "_to": "purchases:69"} +{"_id": "userPurchases:users:29:purchases:70", "_label": "userPurchases", "_from": "users:29", "_to": "purchases:70"} +{"_id": "userPurchases:users:37:purchases:71", "_label": "userPurchases", "_from": "users:37", "_to": "purchases:71"} +{"_id": "userPurchases:users:7:purchases:72", "_label": "userPurchases", "_from": "users:7", "_to": "purchases:72"} +{"_id": "userPurchases:users:10:purchases:73", "_label": "userPurchases", "_from": "users:10", "_to": "purchases:73"} +{"_id": "userPurchases:users:23:purchases:74", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:74"} +{"_id": "userPurchases:users:12:purchases:75", "_label": "userPurchases", "_from": "users:12", "_to": "purchases:75"} +{"_id": "userPurchases:users:26:purchases:76", "_label": "userPurchases", "_from": "users:26", "_to": "purchases:76"} +{"_id": "userPurchases:users:44:purchases:77", "_label": "userPurchases", "_from": "users:44", "_to": "purchases:77"} +{"_id": "userPurchases:users:3:purchases:78", "_label": "userPurchases", "_from": "users:3", "_to": "purchases:78"} +{"_id": "userPurchases:users:16:purchases:79", "_label": "userPurchases", "_from": "users:16", "_to": "purchases:79"} +{"_id": "userPurchases:users:16:purchases:80", "_label": "userPurchases", "_from": "users:16", "_to": "purchases:80"} +{"_id": "userPurchases:users:20:purchases:81", "_label": "userPurchases", "_from": "users:20", "_to": "purchases:81"} +{"_id": "userPurchases:users:23:purchases:82", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:82"} +{"_id": "userPurchases:users:8:purchases:83", "_label": "userPurchases", "_from": "users:8", "_to": "purchases:83"} +{"_id": "userPurchases:users:13:purchases:84", "_label": "userPurchases", "_from": "users:13", "_to": "purchases:84"} +{"_id": "userPurchases:users:15:purchases:85", "_label": "userPurchases", "_from": "users:15", "_to": "purchases:85"} +{"_id": "userPurchases:users:26:purchases:86", "_label": "userPurchases", "_from": "users:26", "_to": "purchases:86"} +{"_id": "userPurchases:users:15:purchases:87", "_label": "userPurchases", "_from": "users:15", "_to": "purchases:87"} +{"_id": "userPurchases:users:37:purchases:88", "_label": "userPurchases", "_from": "users:37", "_to": "purchases:88"} +{"_id": "userPurchases:users:7:purchases:89", "_label": "userPurchases", "_from": "users:7", "_to": "purchases:89"} +{"_id": "userPurchases:users:44:purchases:90", "_label": "userPurchases", "_from": "users:44", "_to": "purchases:90"} +{"_id": "userPurchases:users:8:purchases:91", "_label": "userPurchases", "_from": "users:8", "_to": "purchases:91"} +{"_id": "userPurchases:users:18:purchases:92", "_label": "userPurchases", "_from": "users:18", "_to": "purchases:92"} +{"_id": "userPurchases:users:32:purchases:93", "_label": "userPurchases", "_from": "users:32", "_to": "purchases:93"} +{"_id": "userPurchases:users:48:purchases:94", "_label": "userPurchases", "_from": "users:48", "_to": "purchases:94"} +{"_id": "userPurchases:users:38:purchases:95", "_label": "userPurchases", "_from": "users:38", "_to": "purchases:95"} +{"_id": "userPurchases:users:23:purchases:96", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:96"} +{"_id": "userPurchases:users:23:purchases:97", "_label": "userPurchases", "_from": "users:23", "_to": "purchases:97"} +{"_id": "userPurchases:users:49:purchases:98", "_label": "userPurchases", "_from": "users:49", "_to": "purchases:98"} +{"_id": "userPurchases:users:36:purchases:99", "_label": "userPurchases", "_from": "users:36", "_to": "purchases:99"} +{"_id": "userPurchases:users:12:purchases:100", "_label": "userPurchases", "_from": "users:12", "_to": "purchases:100"} \ No newline at end of file diff --git a/test/resources/smtest_vertices.txt b/test/resources/smtest_vertices.txt index 345ce35cc..b60569181 100644 --- a/test/resources/smtest_vertices.txt +++ b/test/resources/smtest_vertices.txt @@ -1,170 +1,170 @@ -{"gid": "users:1", "label": "users", "data": {"created_at": "2009-12-20 20:36:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Earlean.Bonacci@yahoo.com", "id": 1, "password": "029761dd44fec0b14825843ad0dfface"}} -{"gid": "users:2", "label": "users", "data": {"created_at": "2010-11-12 21:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Evelyn.Patnode@gmail.com", "id": 2, "password": "d678656644a3f44023f90e4f1cace1f4"}} -{"gid": "users:3", "label": "users", "data": {"created_at": "2009-03-08 03:06:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Derek.Crenshaw@gmail.com", "id": 3, "password": "5ab7bc159c6371c65b41059097ff0efe"}} -{"gid": "users:4", "label": "users", "data": {"created_at": "2010-11-20 10:58:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shari.Julian@yahoo.com", "id": 4, "password": "9d38df22b71c8896137d363e29814e5f"}} -{"gid": "users:5", "label": "users", "data": {"created_at": "2009-08-11 22:33:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Zita.Breeding@gmail.com", "id": 5, "password": "7a1c8d1d180d75da38efbd03f388472d"}} -{"gid": "users:6", "label": "users", "data": {"created_at": "2010-07-18 10:40:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Samatha.Hedgpeth@yahoo.com", "id": 6, "password": "e129316bf01b0440247414b715726956"}} -{"gid": "users:7", "label": "users", "data": {"created_at": "2010-09-02 21:56:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Quinton.Gilpatrick@yahoo.com", "id": 7, "password": "7c63f3c25ee52041c2b9aec3c21a96b6"}} -{"gid": "users:8", "label": "users", "data": {"created_at": "2009-10-01 11:34:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"South Carolina\"", "email": "Vivian.Westmoreland@yahoo.com", "id": 8, "password": "100945c1684d6926dcafcacd967aedd9"}} -{"gid": "users:9", "label": "users", "data": {"created_at": "2009-04-22 07:30:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Danny.Crays@gmail.com", "id": 9, "password": "511e3229996147ae68f83bab75b9733e"}} -{"gid": "users:10", "label": "users", "data": {"created_at": "2009-07-07 21:01:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"New York\"", "email": "Edmund.Roles@yahoo.com", "id": 10, "password": "aeac2309a2b01e19177564126a6f8393"}} -{"gid": "users:11", "label": "users", "data": {"created_at": "2009-05-22 00:18:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shanell.Lichtenstein@aol.com", "id": 11, "password": "98ac14b2c6b7bef8a55b5654aee5f28b"}} -{"gid": "users:12", "label": "users", "data": {"created_at": "2009-01-14 05:07:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Romaine.Birdsell@aol.com", "id": 12, "password": "4571853f5ee73e305ac152c765ad2915"}} -{"gid": "users:13", "label": "users", "data": {"created_at": "2009-02-04 14:49:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Zita.Luman@yahoo.com", "id": 13, "password": "7467fa8332bc45a15ad2c7003c963ea2"}} -{"gid": "users:14", "label": "users", "data": {"created_at": "2009-08-17 18:48:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Claud.Cousineau@gmail.com", "id": 14, "password": "82bcc0c4c3fc1a9bbae75dc7b8fabccc"}} -{"gid": "users:15", "label": "users", "data": {"created_at": "2010-07-07 10:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Kali.Damore@yahoo.com", "id": 15, "password": "66327b7500c1b4a115910260418fd582"}} -{"gid": "users:16", "label": "users", "data": {"created_at": "2010-08-19 05:42:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Graciela.Kubala@yahoo.com", "id": 16, "password": "85dbdc9fff08c157d7d10555009ef8ff"}} -{"gid": "users:17", "label": "users", "data": {"created_at": "2010-08-11 08:21:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Theresia.Edwin@yahoo.com", "id": 17, "password": "87b2ae03da521142fd37676e6a3c376a"}} -{"gid": "users:18", "label": "users", "data": {"created_at": "2010-07-23 16:03:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Ozella.Yoshimura@gmail.com", "id": 18, "password": "df68a6070ac1f18ce7a16baa96922948"}} -{"gid": "users:19", "label": "users", "data": {"created_at": "2009-05-24 14:25:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Wynona.Greening@aol.com", "id": 19, "password": "176c818bc66324925ff6c274667e3e8f"}} -{"gid": "users:20", "label": "users", "data": {"created_at": "2010-06-22 15:16:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Kimi.Mcqueeney@gmail.com", "id": 20, "password": "588169a56191c0f99b08e7a392e03ada"}} -{"gid": "users:21", "label": "users", "data": {"created_at": "2009-01-26 09:56:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Cherryl.Tarnowski@gmail.com", "id": 21, "password": "35981f660fedede469fce21cc146aa86"}} -{"gid": "users:22", "label": "users", "data": {"created_at": "2010-07-11 13:28:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Isabel.Breeding@gmail.com", "id": 22, "password": "a32fbb3e28f4cea747d0eef30aaf9ae5"}} -{"gid": "users:23", "label": "users", "data": {"created_at": "2010-06-25 08:36:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Ivana.Kurth@yahoo.com", "id": 23, "password": "ca72fafea92a1ef152006b53e2532571"}} -{"gid": "users:24", "label": "users", "data": {"created_at": "2009-09-23 13:09:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Humberto.Jonson@yahoo.com", "id": 24, "password": "642a91737480d3bbbf621689633ee9c3"}} -{"gid": "users:25", "label": "users", "data": {"created_at": "2009-01-16 11:55:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Ivana.Sosnowski@aol.com", "id": 25, "password": "f12980358430ee7ae192b041aa6ac05d"}} -{"gid": "users:26", "label": "users", "data": {"created_at": "2009-07-19 06:08:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\", \"state\"=>\"Virginia\"", "email": "Cortney.Strayer@gmail.com", "id": 26, "password": "d80da950209cffdb96c76648d4f5b8f7"}} -{"gid": "users:27", "label": "users", "data": {"created_at": "2010-08-10 05:48:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Williams.Upson@gmail.com", "id": 27, "password": "de9a71ad16e0443955d38e4f6864d3c4"}} -{"gid": "users:28", "label": "users", "data": {"created_at": "2009-03-19 07:49:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Jeremiah.Buonocore@yahoo.com", "id": 28, "password": "1994c6611461fc9d11683b50e540d701"}} -{"gid": "users:29", "label": "users", "data": {"created_at": "2009-10-09 09:44:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Ozella.Roles@gmail.com", "id": 29, "password": "8bee01c9b64ed4ca3e68f3c3502e1d85"}} -{"gid": "users:30", "label": "users", "data": {"created_at": "2009-09-05 01:55:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Virginia\"", "email": "Salvatore.Arends@aol.com", "id": 30, "password": "8c64e4bf1574238287f230fde0314664"}} -{"gid": "users:31", "label": "users", "data": {"created_at": "2010-09-26 08:00:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Layne.Sarver@aol.com", "id": 31, "password": "296ca911a6fc78b4b3e75f927c16fcfd"}} -{"gid": "users:32", "label": "users", "data": {"created_at": "2009-02-22 15:46:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Takako.Gilpatrick@aol.com", "id": 32, "password": "3abe3e825f6e749dca1b8193d5f15215"}} -{"gid": "users:33", "label": "users", "data": {"created_at": "2010-01-12 17:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Russ.Mcclain@yahoo.com", "id": 33, "password": "cf17dc7c023e4a9f3fe6be05352aa57f"}} -{"gid": "users:34", "label": "users", "data": {"created_at": "2010-06-11 17:21:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Claud.Westmoreland@aol.com", "id": 34, "password": "631f77eeef3e513c8aad646fdd73c03a"}} -{"gid": "users:35", "label": "users", "data": {"created_at": "2010-08-16 21:09:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Derek.Knittel@gmail.com", "id": 35, "password": "ce3ce9650891124de7f449c84a33ff71"}} -{"gid": "users:36", "label": "users", "data": {"created_at": "2010-06-06 01:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Florida\"", "email": "Eleanor.Patnode@yahoo.com", "id": 36, "password": "c20912ab068921f869ee26724bdfc081"}} -{"gid": "users:37", "label": "users", "data": {"created_at": "2009-06-06 20:13:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Florida\"", "email": "Carmel.Bulfer@aol.com", "id": 37, "password": "15267e65daa06c6fcde10c80f8a744d3"}} -{"gid": "users:38", "label": "users", "data": {"created_at": "2009-08-20 02:34:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Illinois\"", "email": "Mauro.Pung@yahoo.com", "id": 38, "password": "4e625168e5ea9bd548c303d20ecc95b5"}} -{"gid": "users:39", "label": "users", "data": {"created_at": "2010-04-01 23:39:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Sherilyn.Hamill@gmail.com", "id": 39, "password": "2f313c4006182796faf17d83e7f3312b"}} -{"gid": "users:40", "label": "users", "data": {"created_at": "2010-08-06 15:14:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Glen.Lanphear@yahoo.com", "id": 40, "password": "66565168a637a3c5f43bdf5bf2e9313a"}} -{"gid": "users:41", "label": "users", "data": {"created_at": "2010-06-14 19:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Stacia.Schrack@aol.com", "id": 41, "password": "8a918b3f99c9d9aefbbd5de4fbc2ba07"}} -{"gid": "users:42", "label": "users", "data": {"created_at": "2009-12-28 10:21:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Tonette.Alba@gmail.com", "id": 42, "password": "9e742176f6d41b88a4c77334267a8ac0"}} -{"gid": "users:43", "label": "users", "data": {"created_at": "2009-08-20 09:45:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Eve.Kump@yahoo.com", "id": 43, "password": "300b9c56bfe5d45417961ef08f28498a"}} -{"gid": "users:44", "label": "users", "data": {"created_at": "2009-11-21 06:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shanell.Maxson@gmail.com", "id": 44, "password": "e47a8b0056427f189f146889d457f5c2"}} -{"gid": "users:45", "label": "users", "data": {"created_at": "2010-06-30 12:30:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Gudrun.Arends@gmail.com", "id": 45, "password": "735dba8760996aafd1b08b443c6fa4f9"}} -{"gid": "users:46", "label": "users", "data": {"created_at": "2009-08-21 17:06:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Angel.Lessley@yahoo.com", "id": 46, "password": "970efafe901fff211538e536ad797443"}} -{"gid": "users:47", "label": "users", "data": {"created_at": "2009-07-21 15:20:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Harrison.Puett@yahoo.com", "id": 47, "password": "ff9e460aaca39a2c3bbd68043047826a"}} -{"gid": "users:48", "label": "users", "data": {"created_at": "2009-08-03 14:54:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Granville.Hedgpeth@gmail.com", "id": 48, "password": "87f0bfd98e2a9b8d30bc1309936744cb"}} -{"gid": "users:49", "label": "users", "data": {"created_at": "2009-03-25 20:17:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Samatha.Pellegrin@yahoo.com", "id": 49, "password": "4e2a5f4b462636dbc7519bc49f841822"}} -{"gid": "users:50", "label": "users", "data": {"created_at": "2009-10-08 22:43:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Wan.Dilks@gmail.com", "id": 50, "password": "0650f5923e2abce41721d3d9ab37cc54"}} -{"gid": "products:1", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 1, "price": 9.99, "tags": ["Book"], "title": "Dictionary"}} -{"gid": "products:2", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 2, "price": 29.99, "tags": ["Book", "Programming", "Python"], "title": "Python Book"}} -{"gid": "products:3", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 3, "price": 27.99, "tags": ["Book", "Programming", "Ruby"], "title": "Ruby Book"}} -{"gid": "products:4", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 4, "price": 7.99, "tags": ["Book", "Children", "Baby"], "title": "Baby Book"}} -{"gid": "products:5", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 5, "price": 5.99, "tags": ["Book", "Children"], "title": "Coloring Book"}} -{"gid": "products:6", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 6, "price": 499.99, "tags": ["Technology"], "title": "Desktop Computer"}} -{"gid": "products:7", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 7, "price": 899.99, "tags": ["Technology"], "title": "Laptop Computer"}} -{"gid": "products:8", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 8, "price": 108, "tags": ["Technology", "Music"], "title": "MP3 Player"}} -{"gid": "products:9", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 9, "price": 499, "tags": ["Technology", "TV"], "title": "42\" LCD TV"}} -{"gid": "products:10", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 10, "price": 529, "tags": ["Technology", "TV"], "title": "42\" Plasma TV"}} -{"gid": "products:11", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 11, "price": 9.99, "tags": ["Music"], "title": "Classical CD"}} -{"gid": "products:12", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 12, "price": 9.99, "tags": ["Music"], "title": "Holiday CD"}} -{"gid": "products:13", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 13, "price": 9.99, "tags": ["Music"], "title": "Country CD"}} -{"gid": "products:14", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 14, "price": 9.99, "tags": ["Music"], "title": "Pop CD"}} -{"gid": "products:15", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 15, "price": 9.99, "tags": ["Music"], "title": "Electronic CD"}} -{"gid": "products:16", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 16, "price": 14.99, "tags": ["Movie", "Comedy"], "title": "Comedy Movie"}} -{"gid": "products:17", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 17, "price": 14.99, "tags": ["Movie"], "title": "Documentary"}} -{"gid": "products:18", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 18, "price": 14.99, "tags": ["Movie"], "title": "Romantic"}} -{"gid": "products:19", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 19, "price": 14.99, "tags": ["Movie"], "title": "Drama"}} -{"gid": "products:20", "label": "products", "data": {"created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 20, "price": 14.99, "tags": ["Movie"], "title": "Action"}} -{"gid": "purchases:1", "label": "purchases", "data": {"address": "6425 43rd St.", "created_at": "2011-03-16 15:03:00 +0000 UTC", "id": 1, "name": "Harrison Jonson", "state": "FL", "user_id": 7, "zipcode": 50382}} -{"gid": "purchases:2", "label": "purchases", "data": {"address": "321 MLK Ave.", "created_at": "2011-09-14 05:00:00 +0000 UTC", "id": 2, "name": "Cortney Fontanilla", "state": "WA", "user_id": 30, "zipcode": 43895}} -{"gid": "purchases:3", "label": "purchases", "data": {"address": "2307 45th St.", "created_at": "2011-09-11 05:54:00 +0000 UTC", "id": 3, "name": "Ruthie Vashon", "state": "GA", "user_id": 18, "zipcode": 98937}} -{"gid": "purchases:4", "label": "purchases", "data": {"address": "7046 10th Ave.", "created_at": "2011-02-27 20:53:00 +0000 UTC", "id": 4, "name": "Isabel Wynn", "state": "NY", "user_id": 11, "zipcode": 57243}} -{"gid": "purchases:5", "label": "purchases", "data": {"address": "4046 8th Ave.", "created_at": "2011-12-20 12:45:00 +0000 UTC", "id": 5, "name": "Shari Dutra", "state": "FL", "user_id": 34, "zipcode": 61539}} -{"gid": "purchases:6", "label": "purchases", "data": {"address": "2545 8th Ave.", "created_at": "2011-12-10 13:29:00 +0000 UTC", "id": 6, "name": "Kristofer Galvez", "state": "WA", "user_id": 39, "zipcode": 83868}} -{"gid": "purchases:7", "label": "purchases", "data": {"address": "2049 44th Ave.", "created_at": "2011-06-19 03:42:00 +0000 UTC", "id": 7, "name": "Maudie Medlen", "state": "FL", "user_id": 8, "zipcode": 52107}} -{"gid": "purchases:8", "label": "purchases", "data": {"address": "1992 50th Ave.", "created_at": "2011-05-28 01:19:00 +0000 UTC", "id": 8, "name": "Isabel Crissman", "state": "VA", "user_id": 50, "zipcode": 91062}} -{"gid": "purchases:9", "label": "purchases", "data": {"address": "5847 50th Ave.", "created_at": "2011-03-31 10:33:00 +0000 UTC", "id": 9, "name": "Nydia Moe", "state": "WY", "user_id": 32, "zipcode": 86738}} -{"gid": "purchases:10", "label": "purchases", "data": {"address": "8021 8th Ave.", "created_at": "2011-01-27 04:58:00 +0000 UTC", "id": 10, "name": "Dee Heavner", "state": "TX", "user_id": 23, "zipcode": 11065}} -{"gid": "purchases:11", "label": "purchases", "data": {"address": "5574 43rd St.", "created_at": "2011-12-15 01:12:00 +0000 UTC", "id": 11, "name": "Kristofer Larimer", "state": "NY", "user_id": 45, "zipcode": 78804}} -{"gid": "purchases:12", "label": "purchases", "data": {"address": "9888 California St.", "created_at": "2011-01-22 02:06:00 +0000 UTC", "id": 12, "name": "Rosemary Letellier", "state": "CO", "user_id": 25, "zipcode": 59199}} -{"gid": "purchases:13", "label": "purchases", "data": {"address": "7470 Washington Ave.", "created_at": "2011-08-14 19:27:00 +0000 UTC", "id": 13, "name": "Becky Stukes", "state": "CO", "user_id": 33, "zipcode": 49527}} -{"gid": "purchases:14", "label": "purchases", "data": {"address": "3528 31st St.", "created_at": "2011-07-12 19:29:00 +0000 UTC", "id": 14, "name": "Berta Fruchter", "state": "GA", "user_id": 5, "zipcode": 64386}} -{"gid": "purchases:15", "label": "purchases", "data": {"address": "1549 50th Ave.", "created_at": "2011-08-02 14:37:00 +0000 UTC", "id": 15, "name": "Adell Doyel", "state": "VA", "user_id": 9, "zipcode": 73935}} -{"gid": "purchases:16", "label": "purchases", "data": {"address": "4388 45th St.", "created_at": "2011-03-24 10:04:00 +0000 UTC", "id": 16, "name": "Bradly Vasko", "state": "NY", "user_id": 22, "zipcode": 84583}} -{"gid": "purchases:17", "label": "purchases", "data": {"address": "478 44th Ave.", "created_at": "2011-09-18 08:55:00 +0000 UTC", "id": 17, "name": "Clemencia Durio", "state": "TX", "user_id": 27, "zipcode": 27038}} -{"gid": "purchases:18", "label": "purchases", "data": {"address": "8394 8th Ave.", "created_at": "2011-02-24 19:42:00 +0000 UTC", "id": 18, "name": "Kristle Pung", "state": "IL", "user_id": 36, "zipcode": 67659}} -{"gid": "purchases:19", "label": "purchases", "data": {"address": "1482 31st St.", "created_at": "2011-04-19 17:51:00 +0000 UTC", "id": 19, "name": "Adell Mayon", "state": "TX", "user_id": 28, "zipcode": 72775}} -{"gid": "purchases:20", "label": "purchases", "data": {"address": "9520 Washington Ave.", "created_at": "2011-01-20 17:52:00 +0000 UTC", "id": 20, "name": "Carolann Yoshimura", "state": "GA", "user_id": 37, "zipcode": 20503}} -{"gid": "purchases:21", "label": "purchases", "data": {"address": "9600 44th Ave.", "created_at": "2011-07-07 14:41:00 +0000 UTC", "id": 21, "name": "Andres Schippers", "state": "CO", "user_id": 8, "zipcode": 62899}} -{"gid": "purchases:22", "label": "purchases", "data": {"address": "2103 50th Ave.", "created_at": "2011-03-05 22:53:00 +0000 UTC", "id": 22, "name": "Divina Hamill", "state": "CO", "user_id": 45, "zipcode": 73210}} -{"gid": "purchases:23", "label": "purchases", "data": {"address": "6990 Washington Ave.", "created_at": "2011-12-22 13:39:00 +0000 UTC", "id": 23, "name": "Romaine Coderre", "state": "VA", "user_id": 39, "zipcode": 31853}} -{"gid": "purchases:24", "label": "purchases", "data": {"address": "8277 44th Ave.", "created_at": "2011-12-20 23:44:00 +0000 UTC", "id": 24, "name": "Kourtney Julian", "state": "VA", "user_id": 37, "zipcode": 67133}} -{"gid": "purchases:25", "label": "purchases", "data": {"address": "8464 8th Ave.", "created_at": "2011-05-30 17:49:00 +0000 UTC", "id": 25, "name": "Danyel Styers", "state": "WA", "user_id": 9, "zipcode": 56917}} -{"gid": "purchases:26", "label": "purchases", "data": {"address": "410 44th Ave.", "created_at": "2011-12-24 02:29:00 +0000 UTC", "id": 26, "name": "Jame Petrin", "state": "SC", "user_id": 11, "zipcode": 94048}} -{"gid": "purchases:27", "label": "purchases", "data": {"address": "2438 50th Ave.", "created_at": "2011-02-28 15:00:00 +0000 UTC", "id": 27, "name": "Kimi Birdsell", "state": "CO", "user_id": 17, "zipcode": 58337}} -{"gid": "purchases:28", "label": "purchases", "data": {"address": "5307 43rd St.", "created_at": "2011-10-14 16:27:00 +0000 UTC", "id": 28, "name": "Jame Heavner", "state": "TX", "user_id": 34, "zipcode": 81439}} -{"gid": "purchases:29", "label": "purchases", "data": {"address": "8612 Washington Ave.", "created_at": "2011-07-08 22:20:00 +0000 UTC", "id": 29, "name": "Cammy Mayon", "state": "NY", "user_id": 8, "zipcode": 79807}} -{"gid": "purchases:30", "label": "purchases", "data": {"address": "3673 10th Ave.", "created_at": "2011-05-24 08:03:00 +0000 UTC", "id": 30, "name": "Tommie Lanser", "state": "WY", "user_id": 27, "zipcode": 50519}} -{"gid": "purchases:31", "label": "purchases", "data": {"address": "8354 Washington Ave.", "created_at": "2011-03-30 21:44:00 +0000 UTC", "id": 31, "name": "Brandon Fruchter", "state": "NY", "user_id": 43, "zipcode": 50274}} -{"gid": "purchases:32", "label": "purchases", "data": {"address": "6479 31st St.", "created_at": "2011-01-12 16:26:00 +0000 UTC", "id": 32, "name": "Ricarda Pressey", "state": "TX", "user_id": 48, "zipcode": 95407}} -{"gid": "purchases:33", "label": "purchases", "data": {"address": "7271 50th Ave.", "created_at": "2011-11-01 21:34:00 +0000 UTC", "id": 33, "name": "Shalon Fontanilla", "state": "IL", "user_id": 25, "zipcode": 71634}} -{"gid": "purchases:34", "label": "purchases", "data": {"address": "1644 31st St.", "created_at": "2011-09-11 02:23:00 +0000 UTC", "id": 34, "name": "Edmund Pressnell", "state": "TX", "user_id": 5, "zipcode": 63152}} -{"gid": "purchases:35", "label": "purchases", "data": {"address": "6472 46th Ave.", "created_at": "2011-01-14 11:25:00 +0000 UTC", "id": 35, "name": "Homer Gasper", "state": "IL", "user_id": 18, "zipcode": 86204}} -{"gid": "purchases:36", "label": "purchases", "data": {"address": "1510 45th St.", "created_at": "2011-10-23 18:14:00 +0000 UTC", "id": 36, "name": "Brady Harshberger", "state": "VA", "user_id": 37, "zipcode": 94138}} -{"gid": "purchases:37", "label": "purchases", "data": {"address": "204 California St.", "created_at": "2011-06-20 21:37:00 +0000 UTC", "id": 37, "name": "Clemencia Matheson", "state": "CO", "user_id": 47, "zipcode": 59664}} -{"gid": "purchases:38", "label": "purchases", "data": {"address": "5944 43rd St.", "created_at": "2011-04-07 06:52:00 +0000 UTC", "id": 38, "name": "Danyel Sisemore", "state": "CO", "user_id": 20, "zipcode": 62994}} -{"gid": "purchases:39", "label": "purchases", "data": {"address": "3057 43rd St.", "created_at": "2011-01-31 15:27:00 +0000 UTC", "id": 39, "name": "Laurence Kump", "state": "IL", "user_id": 15, "zipcode": 95353}} -{"gid": "purchases:40", "label": "purchases", "data": {"address": "7896 MLK Ave.", "created_at": "2011-11-01 22:01:00 +0000 UTC", "id": 40, "name": "Mitchell Pellegrin", "state": "CO", "user_id": 40, "zipcode": 55259}} -{"gid": "purchases:41", "label": "purchases", "data": {"address": "9162 MLK Ave.", "created_at": "2011-02-18 06:06:00 +0000 UTC", "id": 41, "name": "Emely Kimball", "state": "GA", "user_id": 24, "zipcode": 10585}} -{"gid": "purchases:42", "label": "purchases", "data": {"address": "6719 Washington Ave.", "created_at": "2011-10-29 19:36:00 +0000 UTC", "id": 42, "name": "Russ Petrin", "state": "IL", "user_id": 48, "zipcode": 75651}} -{"gid": "purchases:43", "label": "purchases", "data": {"address": "6824 35th St.42nd Ave.", "created_at": "2011-07-04 02:28:00 +0000 UTC", "id": 43, "name": "Miyoko Allbright", "state": "WA", "user_id": 44, "zipcode": 77819}} -{"gid": "purchases:44", "label": "purchases", "data": {"address": "4144 10th Ave.", "created_at": "2011-03-15 08:42:00 +0000 UTC", "id": 44, "name": "Becky Wassink", "state": "WY", "user_id": 49, "zipcode": 89509}} -{"gid": "purchases:45", "label": "purchases", "data": {"address": "3438 44th Ave.", "created_at": "2011-11-11 01:22:00 +0000 UTC", "id": 45, "name": "Harley Dement", "state": "GA", "user_id": 42, "zipcode": 34758}} -{"gid": "purchases:46", "label": "purchases", "data": {"address": "5171 10th Ave.", "created_at": "2011-05-16 20:41:00 +0000 UTC", "id": 46, "name": "Mirta Alba", "state": "VA", "user_id": 16, "zipcode": 67003}} -{"gid": "purchases:47", "label": "purchases", "data": {"address": "7387 35th St.42nd Ave.", "created_at": "2011-09-01 01:01:00 +0000 UTC", "id": 47, "name": "Buford Yoshimura", "state": "IL", "user_id": 18, "zipcode": 84086}} -{"gid": "purchases:48", "label": "purchases", "data": {"address": "2370 8th Ave.", "created_at": "2011-05-29 18:37:00 +0000 UTC", "id": 48, "name": "Ruthie Tartaglia", "state": "TX", "user_id": 50, "zipcode": 13848}} -{"gid": "purchases:49", "label": "purchases", "data": {"address": "8125 50th Ave.", "created_at": "2011-05-22 00:02:00 +0000 UTC", "id": 49, "name": "Colleen Mcqueeney", "state": "NY", "user_id": 9, "zipcode": 51760}} -{"gid": "purchases:50", "label": "purchases", "data": {"address": "9165 44th Ave.", "created_at": "2011-10-11 22:53:00 +0000 UTC", "id": 50, "name": "Minerva Iriarte", "state": "IL", "user_id": 27, "zipcode": 83449}} -{"gid": "purchases:51", "label": "purchases", "data": {"address": "5912 44th Ave.", "created_at": "2011-10-20 00:28:00 +0000 UTC", "id": 51, "name": "Beverlee Mcdougle", "state": "WY", "user_id": 23, "zipcode": 72995}} -{"gid": "purchases:52", "label": "purchases", "data": {"address": "3085 31st St.", "created_at": "2011-10-08 05:19:00 +0000 UTC", "id": 52, "name": "Danyel Kipp", "state": "GA", "user_id": 35, "zipcode": 44471}} -{"gid": "purchases:53", "label": "purchases", "data": {"address": "6214 MLK Ave.", "created_at": "2011-06-09 02:58:00 +0000 UTC", "id": 53, "name": "Miyoko Emmerich", "state": "SC", "user_id": 15, "zipcode": 92365}} -{"gid": "purchases:54", "label": "purchases", "data": {"address": "8948 46th Ave.", "created_at": "2011-08-23 19:51:00 +0000 UTC", "id": 54, "name": "Colleen Connors", "state": "CO", "user_id": 23, "zipcode": 16281}} -{"gid": "purchases:55", "label": "purchases", "data": {"address": "2727 43rd St.", "created_at": "2011-01-02 21:54:00 +0000 UTC", "id": 55, "name": "Milda Rabb", "state": "VA", "user_id": 24, "zipcode": 12546}} -{"gid": "purchases:56", "label": "purchases", "data": {"address": "2623 8th Ave.", "created_at": "2011-08-25 23:55:00 +0000 UTC", "id": 56, "name": "Rivka Pressnell", "state": "WA", "user_id": 10, "zipcode": 58091}} -{"gid": "purchases:57", "label": "purchases", "data": {"address": "2106 Washington Ave.", "created_at": "2011-01-03 01:49:00 +0000 UTC", "id": 57, "name": "Letitia Sprau", "state": "IL", "user_id": 1, "zipcode": 76898}} -{"gid": "purchases:58", "label": "purchases", "data": {"address": "463 46th Ave.", "created_at": "2011-08-31 07:41:00 +0000 UTC", "id": 58, "name": "Wendie Dilks", "state": "NY", "user_id": 41, "zipcode": 30838}} -{"gid": "purchases:59", "label": "purchases", "data": {"address": "9289 Washington Ave.", "created_at": "2011-01-24 22:11:00 +0000 UTC", "id": 59, "name": "Williams Alber", "state": "NY", "user_id": 31, "zipcode": 20505}} -{"gid": "purchases:60", "label": "purchases", "data": {"address": "3434 Washington Ave.", "created_at": "2011-12-17 12:59:00 +0000 UTC", "id": 60, "name": "Ricarda Nowakowski", "state": "CO", "user_id": 43, "zipcode": 53662}} -{"gid": "purchases:61", "label": "purchases", "data": {"address": "6494 Washington Ave.", "created_at": "2011-08-23 14:28:00 +0000 UTC", "id": 61, "name": "Irma Currier", "state": "NY", "user_id": 2, "zipcode": 98527}} -{"gid": "purchases:62", "label": "purchases", "data": {"address": "7496 10th Ave.", "created_at": "2011-02-16 03:00:00 +0000 UTC", "id": 62, "name": "Salvatore Lightcap", "state": "SC", "user_id": 6, "zipcode": 75435}} -{"gid": "purchases:63", "label": "purchases", "data": {"address": "7295 10th Ave.", "created_at": "2011-04-28 20:22:00 +0000 UTC", "id": 63, "name": "Sol Fruchter", "state": "VA", "user_id": 13, "zipcode": 50135}} -{"gid": "purchases:64", "label": "purchases", "data": {"address": "6812 43rd St.", "created_at": "2011-10-06 03:50:00 +0000 UTC", "id": 64, "name": "Nana Arends", "state": "SC", "user_id": 16, "zipcode": 48227}} -{"gid": "purchases:65", "label": "purchases", "data": {"address": "7583 35th St.42nd Ave.", "created_at": "2011-07-06 17:51:00 +0000 UTC", "id": 65, "name": "Brandon Roth", "state": "TX", "user_id": 29, "zipcode": 17570}} -{"gid": "purchases:66", "label": "purchases", "data": {"address": "8547 45th St.", "created_at": "2011-09-04 10:32:00 +0000 UTC", "id": 66, "name": "Graig Sturgill", "state": "CO", "user_id": 29, "zipcode": 67015}} -{"gid": "purchases:67", "label": "purchases", "data": {"address": "8555 31st St.", "created_at": "2011-12-29 12:45:00 +0000 UTC", "id": 67, "name": "Lawerence Roff", "state": "NY", "user_id": 35, "zipcode": 60022}} -{"gid": "purchases:68", "label": "purchases", "data": {"address": "2232 43rd St.", "created_at": "2011-04-29 20:05:00 +0000 UTC", "id": 68, "name": "Jenee Haefner", "state": "FL", "user_id": 20, "zipcode": 51498}} -{"gid": "purchases:69", "label": "purchases", "data": {"address": "6659 Washington Ave.", "created_at": "2011-03-29 21:35:00 +0000 UTC", "id": 69, "name": "Karole Calico", "state": "VA", "user_id": 14, "zipcode": 58202}} -{"gid": "purchases:70", "label": "purchases", "data": {"address": "656 35th St.42nd Ave.", "created_at": "2011-04-07 10:43:00 +0000 UTC", "id": 70, "name": "Buddy Doyel", "state": "FL", "user_id": 29, "zipcode": 89794}} -{"gid": "purchases:71", "label": "purchases", "data": {"address": "4063 8th Ave.", "created_at": "2011-07-26 14:06:00 +0000 UTC", "id": 71, "name": "Ozella Selden", "state": "GA", "user_id": 37, "zipcode": 28335}} -{"gid": "purchases:72", "label": "purchases", "data": {"address": "9344 44th Ave.", "created_at": "2011-06-10 09:18:00 +0000 UTC", "id": 72, "name": "Mauro Allbright", "state": "IL", "user_id": 7, "zipcode": 47037}} -{"gid": "purchases:73", "label": "purchases", "data": {"address": "8181 10th Ave.", "created_at": "2011-03-01 16:56:00 +0000 UTC", "id": 73, "name": "Salvatore Kimball", "state": "CO", "user_id": 10, "zipcode": 11819}} -{"gid": "purchases:74", "label": "purchases", "data": {"address": "6844 45th St.", "created_at": "2011-10-31 10:51:00 +0000 UTC", "id": 74, "name": "Nana Suits", "state": "WY", "user_id": 23, "zipcode": 45801}} -{"gid": "purchases:75", "label": "purchases", "data": {"address": "5546 31st St.", "created_at": "2011-12-25 03:13:00 +0000 UTC", "id": 75, "name": "Minerva Li", "state": "FL", "user_id": 12, "zipcode": 37071}} -{"gid": "purchases:76", "label": "purchases", "data": {"address": "2534 35th St.42nd Ave.", "created_at": "2011-01-24 14:13:00 +0000 UTC", "id": 76, "name": "Georgina Crissman", "state": "SC", "user_id": 26, "zipcode": 92320}} -{"gid": "purchases:77", "label": "purchases", "data": {"address": "4651 31st St.", "created_at": "2011-12-22 21:08:00 +0000 UTC", "id": 77, "name": "Tommie Ange", "state": "NY", "user_id": 44, "zipcode": 43609}} -{"gid": "purchases:78", "label": "purchases", "data": {"address": "7780 44th Ave.", "created_at": "2011-04-21 07:52:00 +0000 UTC", "id": 78, "name": "Kymberly Ange", "state": "VA", "user_id": 3, "zipcode": 17138}} -{"gid": "purchases:79", "label": "purchases", "data": {"address": "4937 Washington Ave.", "created_at": "2011-05-18 04:38:00 +0000 UTC", "id": 79, "name": "Reed Larimer", "state": "NY", "user_id": 16, "zipcode": 53172}} -{"gid": "purchases:80", "label": "purchases", "data": {"address": "8915 Washington Ave.", "created_at": "2011-08-27 20:03:00 +0000 UTC", "id": 80, "name": "Carmel Letellier", "state": "FL", "user_id": 16, "zipcode": 76107}} -{"gid": "purchases:81", "label": "purchases", "data": {"address": "6198 California St.", "created_at": "2011-11-04 11:56:00 +0000 UTC", "id": 81, "name": "Colleen Seabaugh", "state": "TX", "user_id": 20, "zipcode": 25936}} -{"gid": "purchases:82", "label": "purchases", "data": {"address": "7705 MLK Ave.", "created_at": "2011-11-26 16:47:00 +0000 UTC", "id": 82, "name": "Granville Blumer", "state": "WY", "user_id": 23, "zipcode": 21361}} -{"gid": "purchases:83", "label": "purchases", "data": {"address": "7813 45th St.", "created_at": "2011-01-28 23:07:00 +0000 UTC", "id": 83, "name": "Brady Durio", "state": "WA", "user_id": 8, "zipcode": 15632}} -{"gid": "purchases:84", "label": "purchases", "data": {"address": "3266 California St.", "created_at": "2011-11-22 20:47:00 +0000 UTC", "id": 84, "name": "Graciela Kiser", "state": "NY", "user_id": 13, "zipcode": 40432}} -{"gid": "purchases:85", "label": "purchases", "data": {"address": "2318 MLK Ave.", "created_at": "2011-05-01 22:45:00 +0000 UTC", "id": 85, "name": "Angel Lesane", "state": "FL", "user_id": 15, "zipcode": 93225}} -{"gid": "purchases:86", "label": "purchases", "data": {"address": "5504 8th Ave.", "created_at": "2011-03-18 09:04:00 +0000 UTC", "id": 86, "name": "Shawanda Ange", "state": "WA", "user_id": 26, "zipcode": 28528}} -{"gid": "purchases:87", "label": "purchases", "data": {"address": "7052 35th St.42nd Ave.", "created_at": "2011-03-31 20:54:00 +0000 UTC", "id": 87, "name": "Samatha Dougal", "state": "NY", "user_id": 15, "zipcode": 36717}} -{"gid": "purchases:88", "label": "purchases", "data": {"address": "7214 10th Ave.", "created_at": "2011-08-18 00:43:00 +0000 UTC", "id": 88, "name": "Dee Luman", "state": "WY", "user_id": 37, "zipcode": 35245}} -{"gid": "purchases:89", "label": "purchases", "data": {"address": "5857 43rd St.", "created_at": "2011-08-04 04:14:00 +0000 UTC", "id": 89, "name": "Rolf Crenshaw", "state": "TX", "user_id": 7, "zipcode": 21037}} -{"gid": "purchases:90", "label": "purchases", "data": {"address": "2848 MLK Ave.", "created_at": "2011-11-24 19:35:00 +0000 UTC", "id": 90, "name": "Irma Disney", "state": "VA", "user_id": 44, "zipcode": 73667}} -{"gid": "purchases:91", "label": "purchases", "data": {"address": "4441 35th St.42nd Ave.", "created_at": "2011-11-13 21:18:00 +0000 UTC", "id": 91, "name": "Letitia Strayer", "state": "SC", "user_id": 8, "zipcode": 14491}} -{"gid": "purchases:92", "label": "purchases", "data": {"address": "4875 35th St.42nd Ave.", "created_at": "2011-04-14 21:12:00 +0000 UTC", "id": 92, "name": "Angel Benedetto", "state": "WA", "user_id": 18, "zipcode": 30254}} -{"gid": "purchases:93", "label": "purchases", "data": {"address": "7661 8th Ave.", "created_at": "2011-06-12 18:43:00 +0000 UTC", "id": 93, "name": "Claud Vasko", "state": "WY", "user_id": 32, "zipcode": 10935}} -{"gid": "purchases:94", "label": "purchases", "data": {"address": "272 45th St.", "created_at": "2011-05-12 20:46:00 +0000 UTC", "id": 94, "name": "Berta Fretz", "state": "FL", "user_id": 48, "zipcode": 36777}} -{"gid": "purchases:95", "label": "purchases", "data": {"address": "1162 44th Ave.", "created_at": "2011-07-16 22:41:00 +0000 UTC", "id": 95, "name": "Johnathan Pressey", "state": "SC", "user_id": 38, "zipcode": 46110}} -{"gid": "purchases:96", "label": "purchases", "data": {"address": "3235 Washington Ave.", "created_at": "2011-02-12 19:30:00 +0000 UTC", "id": 96, "name": "Brady Mcclain", "state": "IL", "user_id": 23, "zipcode": 31913}} -{"gid": "purchases:97", "label": "purchases", "data": {"address": "2797 44th Ave.", "created_at": "2011-03-23 14:11:00 +0000 UTC", "id": 97, "name": "Theresia Lesane", "state": "GA", "user_id": 23, "zipcode": 67585}} -{"gid": "purchases:98", "label": "purchases", "data": {"address": "1528 31st St.", "created_at": "2011-07-23 13:01:00 +0000 UTC", "id": 98, "name": "Lawerence Senko", "state": "NY", "user_id": 49, "zipcode": 49526}} -{"gid": "purchases:99", "label": "purchases", "data": {"address": "7255 10th Ave.", "created_at": "2011-11-20 05:41:00 +0000 UTC", "id": 99, "name": "Rivka Scharf", "state": "TX", "user_id": 36, "zipcode": 59794}} -{"gid": "purchases:100", "label": "purchases", "data": {"address": "4864 10th Ave.", "created_at": "2011-09-12 04:07:00 +0000 UTC", "id": 100, "name": "Rubie Wassink", "state": "CO", "user_id": 12, "zipcode": 35894}} +{"_id": "users:1", "_label": "users", "created_at": "2009-12-20 20:36:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Earlean.Bonacci@yahoo.com", "id": 1, "password": "029761dd44fec0b14825843ad0dfface"} +{"_id": "users:2", "_label": "users", "created_at": "2010-11-12 21:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Evelyn.Patnode@gmail.com", "id": 2, "password": "d678656644a3f44023f90e4f1cace1f4"} +{"_id": "users:3", "_label": "users", "created_at": "2009-03-08 03:06:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Derek.Crenshaw@gmail.com", "id": 3, "password": "5ab7bc159c6371c65b41059097ff0efe"} +{"_id": "users:4", "_label": "users", "created_at": "2010-11-20 10:58:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shari.Julian@yahoo.com", "id": 4, "password": "9d38df22b71c8896137d363e29814e5f"} +{"_id": "users:5", "_label": "users", "created_at": "2009-08-11 22:33:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Zita.Breeding@gmail.com", "id": 5, "password": "7a1c8d1d180d75da38efbd03f388472d"} +{"_id": "users:6", "_label": "users", "created_at": "2010-07-18 10:40:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Samatha.Hedgpeth@yahoo.com", "id": 6, "password": "e129316bf01b0440247414b715726956"} +{"_id": "users:7", "_label": "users", "created_at": "2010-09-02 21:56:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Quinton.Gilpatrick@yahoo.com", "id": 7, "password": "7c63f3c25ee52041c2b9aec3c21a96b6"} +{"_id": "users:8", "_label": "users", "created_at": "2009-10-01 11:34:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"South Carolina\"", "email": "Vivian.Westmoreland@yahoo.com", "id": 8, "password": "100945c1684d6926dcafcacd967aedd9"} +{"_id": "users:9", "_label": "users", "created_at": "2009-04-22 07:30:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Danny.Crays@gmail.com", "id": 9, "password": "511e3229996147ae68f83bab75b9733e"} +{"_id": "users:10", "_label": "users", "created_at": "2009-07-07 21:01:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"New York\"", "email": "Edmund.Roles@yahoo.com", "id": 10, "password": "aeac2309a2b01e19177564126a6f8393"} +{"_id": "users:11", "_label": "users", "created_at": "2009-05-22 00:18:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shanell.Lichtenstein@aol.com", "id": 11, "password": "98ac14b2c6b7bef8a55b5654aee5f28b"} +{"_id": "users:12", "_label": "users", "created_at": "2009-01-14 05:07:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Romaine.Birdsell@aol.com", "id": 12, "password": "4571853f5ee73e305ac152c765ad2915"} +{"_id": "users:13", "_label": "users", "created_at": "2009-02-04 14:49:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Zita.Luman@yahoo.com", "id": 13, "password": "7467fa8332bc45a15ad2c7003c963ea2"} +{"_id": "users:14", "_label": "users", "created_at": "2009-08-17 18:48:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Claud.Cousineau@gmail.com", "id": 14, "password": "82bcc0c4c3fc1a9bbae75dc7b8fabccc"} +{"_id": "users:15", "_label": "users", "created_at": "2010-07-07 10:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Kali.Damore@yahoo.com", "id": 15, "password": "66327b7500c1b4a115910260418fd582"} +{"_id": "users:16", "_label": "users", "created_at": "2010-08-19 05:42:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Graciela.Kubala@yahoo.com", "id": 16, "password": "85dbdc9fff08c157d7d10555009ef8ff"} +{"_id": "users:17", "_label": "users", "created_at": "2010-08-11 08:21:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Theresia.Edwin@yahoo.com", "id": 17, "password": "87b2ae03da521142fd37676e6a3c376a"} +{"_id": "users:18", "_label": "users", "created_at": "2010-07-23 16:03:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Ozella.Yoshimura@gmail.com", "id": 18, "password": "df68a6070ac1f18ce7a16baa96922948"} +{"_id": "users:19", "_label": "users", "created_at": "2009-05-24 14:25:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Wynona.Greening@aol.com", "id": 19, "password": "176c818bc66324925ff6c274667e3e8f"} +{"_id": "users:20", "_label": "users", "created_at": "2010-06-22 15:16:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Kimi.Mcqueeney@gmail.com", "id": 20, "password": "588169a56191c0f99b08e7a392e03ada"} +{"_id": "users:21", "_label": "users", "created_at": "2009-01-26 09:56:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Cherryl.Tarnowski@gmail.com", "id": 21, "password": "35981f660fedede469fce21cc146aa86"} +{"_id": "users:22", "_label": "users", "created_at": "2010-07-11 13:28:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Isabel.Breeding@gmail.com", "id": 22, "password": "a32fbb3e28f4cea747d0eef30aaf9ae5"} +{"_id": "users:23", "_label": "users", "created_at": "2010-06-25 08:36:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Ivana.Kurth@yahoo.com", "id": 23, "password": "ca72fafea92a1ef152006b53e2532571"} +{"_id": "users:24", "_label": "users", "created_at": "2009-09-23 13:09:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Humberto.Jonson@yahoo.com", "id": 24, "password": "642a91737480d3bbbf621689633ee9c3"} +{"_id": "users:25", "_label": "users", "created_at": "2009-01-16 11:55:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Ivana.Sosnowski@aol.com", "id": 25, "password": "f12980358430ee7ae192b041aa6ac05d"} +{"_id": "users:26", "_label": "users", "created_at": "2009-07-19 06:08:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\", \"state\"=>\"Virginia\"", "email": "Cortney.Strayer@gmail.com", "id": 26, "password": "d80da950209cffdb96c76648d4f5b8f7"} +{"_id": "users:27", "_label": "users", "created_at": "2010-08-10 05:48:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Williams.Upson@gmail.com", "id": 27, "password": "de9a71ad16e0443955d38e4f6864d3c4"} +{"_id": "users:28", "_label": "users", "created_at": "2009-03-19 07:49:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Jeremiah.Buonocore@yahoo.com", "id": 28, "password": "1994c6611461fc9d11683b50e540d701"} +{"_id": "users:29", "_label": "users", "created_at": "2009-10-09 09:44:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Ozella.Roles@gmail.com", "id": 29, "password": "8bee01c9b64ed4ca3e68f3c3502e1d85"} +{"_id": "users:30", "_label": "users", "created_at": "2009-09-05 01:55:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Virginia\"", "email": "Salvatore.Arends@aol.com", "id": 30, "password": "8c64e4bf1574238287f230fde0314664"} +{"_id": "users:31", "_label": "users", "created_at": "2010-09-26 08:00:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Layne.Sarver@aol.com", "id": 31, "password": "296ca911a6fc78b4b3e75f927c16fcfd"} +{"_id": "users:32", "_label": "users", "created_at": "2009-02-22 15:46:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Takako.Gilpatrick@aol.com", "id": 32, "password": "3abe3e825f6e749dca1b8193d5f15215"} +{"_id": "users:33", "_label": "users", "created_at": "2010-01-12 17:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Russ.Mcclain@yahoo.com", "id": 33, "password": "cf17dc7c023e4a9f3fe6be05352aa57f"} +{"_id": "users:34", "_label": "users", "created_at": "2010-06-11 17:21:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Claud.Westmoreland@aol.com", "id": 34, "password": "631f77eeef3e513c8aad646fdd73c03a"} +{"_id": "users:35", "_label": "users", "created_at": "2010-08-16 21:09:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Derek.Knittel@gmail.com", "id": 35, "password": "ce3ce9650891124de7f449c84a33ff71"} +{"_id": "users:36", "_label": "users", "created_at": "2010-06-06 01:27:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Florida\"", "email": "Eleanor.Patnode@yahoo.com", "id": 36, "password": "c20912ab068921f869ee26724bdfc081"} +{"_id": "users:37", "_label": "users", "created_at": "2009-06-06 20:13:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Florida\"", "email": "Carmel.Bulfer@aol.com", "id": 37, "password": "15267e65daa06c6fcde10c80f8a744d3"} +{"_id": "users:38", "_label": "users", "created_at": "2009-08-20 02:34:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\", \"state\"=>\"Illinois\"", "email": "Mauro.Pung@yahoo.com", "id": 38, "password": "4e625168e5ea9bd548c303d20ecc95b5"} +{"_id": "users:39", "_label": "users", "created_at": "2010-04-01 23:39:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Sherilyn.Hamill@gmail.com", "id": 39, "password": "2f313c4006182796faf17d83e7f3312b"} +{"_id": "users:40", "_label": "users", "created_at": "2010-08-06 15:14:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Glen.Lanphear@yahoo.com", "id": 40, "password": "66565168a637a3c5f43bdf5bf2e9313a"} +{"_id": "users:41", "_label": "users", "created_at": "2010-06-14 19:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Stacia.Schrack@aol.com", "id": 41, "password": "8a918b3f99c9d9aefbbd5de4fbc2ba07"} +{"_id": "users:42", "_label": "users", "created_at": "2009-12-28 10:21:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Tonette.Alba@gmail.com", "id": 42, "password": "9e742176f6d41b88a4c77334267a8ac0"} +{"_id": "users:43", "_label": "users", "created_at": "2009-08-20 09:45:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Eve.Kump@yahoo.com", "id": 43, "password": "300b9c56bfe5d45417961ef08f28498a"} +{"_id": "users:44", "_label": "users", "created_at": "2009-11-21 06:28:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Shanell.Maxson@gmail.com", "id": 44, "password": "e47a8b0056427f189f146889d457f5c2"} +{"_id": "users:45", "_label": "users", "created_at": "2010-06-30 12:30:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Gudrun.Arends@gmail.com", "id": 45, "password": "735dba8760996aafd1b08b443c6fa4f9"} +{"_id": "users:46", "_label": "users", "created_at": "2009-08-21 17:06:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"F\"", "email": "Angel.Lessley@yahoo.com", "id": 46, "password": "970efafe901fff211538e536ad797443"} +{"_id": "users:47", "_label": "users", "created_at": "2009-07-21 15:20:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Harrison.Puett@yahoo.com", "id": 47, "password": "ff9e460aaca39a2c3bbd68043047826a"} +{"_id": "users:48", "_label": "users", "created_at": "2009-08-03 14:54:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Granville.Hedgpeth@gmail.com", "id": 48, "password": "87f0bfd98e2a9b8d30bc1309936744cb"} +{"_id": "users:49", "_label": "users", "created_at": "2009-03-25 20:17:00 +0000 UTC", "deleted_at": null, "details": null, "email": "Samatha.Pellegrin@yahoo.com", "id": 49, "password": "4e2a5f4b462636dbc7519bc49f841822"} +{"_id": "users:50", "_label": "users", "created_at": "2009-10-08 22:43:00 +0000 UTC", "deleted_at": null, "details": "\"sex\"=>\"M\"", "email": "Wan.Dilks@gmail.com", "id": 50, "password": "0650f5923e2abce41721d3d9ab37cc54"} +{"_id": "products:1", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 1, "price": 9.99, "tags": ["Book"], "title": "Dictionary"} +{"_id": "products:2", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 2, "price": 29.99, "tags": ["Book", "Programming", "Python"], "title": "Python Book"} +{"_id": "products:3", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 3, "price": 27.99, "tags": ["Book", "Programming", "Ruby"], "title": "Ruby Book"} +{"_id": "products:4", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 4, "price": 7.99, "tags": ["Book", "Children", "Baby"], "title": "Baby Book"} +{"_id": "products:5", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 5, "price": 5.99, "tags": ["Book", "Children"], "title": "Coloring Book"} +{"_id": "products:6", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 6, "price": 499.99, "tags": ["Technology"], "title": "Desktop Computer"} +{"_id": "products:7", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 7, "price": 899.99, "tags": ["Technology"], "title": "Laptop Computer"} +{"_id": "products:8", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 8, "price": 108, "tags": ["Technology", "Music"], "title": "MP3 Player"} +{"_id": "products:9", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 9, "price": 499, "tags": ["Technology", "TV"], "title": "42\" LCD TV"} +{"_id": "products:10", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 10, "price": 529, "tags": ["Technology", "TV"], "title": "42\" Plasma TV"} +{"_id": "products:11", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 11, "price": 9.99, "tags": ["Music"], "title": "Classical CD"} +{"_id": "products:12", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 12, "price": 9.99, "tags": ["Music"], "title": "Holiday CD"} +{"_id": "products:13", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 13, "price": 9.99, "tags": ["Music"], "title": "Country CD"} +{"_id": "products:14", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 14, "price": 9.99, "tags": ["Music"], "title": "Pop CD"} +{"_id": "products:15", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 15, "price": 9.99, "tags": ["Music"], "title": "Electronic CD"} +{"_id": "products:16", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 16, "price": 14.99, "tags": ["Movie", "Comedy"], "title": "Comedy Movie"} +{"_id": "products:17", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 17, "price": 14.99, "tags": ["Movie"], "title": "Documentary"} +{"_id": "products:18", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 18, "price": 14.99, "tags": ["Movie"], "title": "Romantic"} +{"_id": "products:19", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 19, "price": 14.99, "tags": ["Movie"], "title": "Drama"} +{"_id": "products:20", "_label": "products", "created_at": "2011-01-01 20:00:00 +0000 UTC", "deleted_at": null, "id": 20, "price": 14.99, "tags": ["Movie"], "title": "Action"} +{"_id": "purchases:1", "_label": "purchases", "address": "6425 43rd St.", "created_at": "2011-03-16 15:03:00 +0000 UTC", "id": 1, "name": "Harrison Jonson", "state": "FL", "user_id": 7, "zipcode": 50382} +{"_id": "purchases:2", "_label": "purchases", "address": "321 MLK Ave.", "created_at": "2011-09-14 05:00:00 +0000 UTC", "id": 2, "name": "Cortney Fontanilla", "state": "WA", "user_id": 30, "zipcode": 43895} +{"_id": "purchases:3", "_label": "purchases", "address": "2307 45th St.", "created_at": "2011-09-11 05:54:00 +0000 UTC", "id": 3, "name": "Ruthie Vashon", "state": "GA", "user_id": 18, "zipcode": 98937} +{"_id": "purchases:4", "_label": "purchases", "address": "7046 10th Ave.", "created_at": "2011-02-27 20:53:00 +0000 UTC", "id": 4, "name": "Isabel Wynn", "state": "NY", "user_id": 11, "zipcode": 57243} +{"_id": "purchases:5", "_label": "purchases", "address": "4046 8th Ave.", "created_at": "2011-12-20 12:45:00 +0000 UTC", "id": 5, "name": "Shari Dutra", "state": "FL", "user_id": 34, "zipcode": 61539} +{"_id": "purchases:6", "_label": "purchases", "address": "2545 8th Ave.", "created_at": "2011-12-10 13:29:00 +0000 UTC", "id": 6, "name": "Kristofer Galvez", "state": "WA", "user_id": 39, "zipcode": 83868} +{"_id": "purchases:7", "_label": "purchases", "address": "2049 44th Ave.", "created_at": "2011-06-19 03:42:00 +0000 UTC", "id": 7, "name": "Maudie Medlen", "state": "FL", "user_id": 8, "zipcode": 52107} +{"_id": "purchases:8", "_label": "purchases", "address": "1992 50th Ave.", "created_at": "2011-05-28 01:19:00 +0000 UTC", "id": 8, "name": "Isabel Crissman", "state": "VA", "user_id": 50, "zipcode": 91062} +{"_id": "purchases:9", "_label": "purchases", "address": "5847 50th Ave.", "created_at": "2011-03-31 10:33:00 +0000 UTC", "id": 9, "name": "Nydia Moe", "state": "WY", "user_id": 32, "zipcode": 86738} +{"_id": "purchases:10", "_label": "purchases", "address": "8021 8th Ave.", "created_at": "2011-01-27 04:58:00 +0000 UTC", "id": 10, "name": "Dee Heavner", "state": "TX", "user_id": 23, "zipcode": 11065} +{"_id": "purchases:11", "_label": "purchases", "address": "5574 43rd St.", "created_at": "2011-12-15 01:12:00 +0000 UTC", "id": 11, "name": "Kristofer Larimer", "state": "NY", "user_id": 45, "zipcode": 78804} +{"_id": "purchases:12", "_label": "purchases", "address": "9888 California St.", "created_at": "2011-01-22 02:06:00 +0000 UTC", "id": 12, "name": "Rosemary Letellier", "state": "CO", "user_id": 25, "zipcode": 59199} +{"_id": "purchases:13", "_label": "purchases", "address": "7470 Washington Ave.", "created_at": "2011-08-14 19:27:00 +0000 UTC", "id": 13, "name": "Becky Stukes", "state": "CO", "user_id": 33, "zipcode": 49527} +{"_id": "purchases:14", "_label": "purchases", "address": "3528 31st St.", "created_at": "2011-07-12 19:29:00 +0000 UTC", "id": 14, "name": "Berta Fruchter", "state": "GA", "user_id": 5, "zipcode": 64386} +{"_id": "purchases:15", "_label": "purchases", "address": "1549 50th Ave.", "created_at": "2011-08-02 14:37:00 +0000 UTC", "id": 15, "name": "Adell Doyel", "state": "VA", "user_id": 9, "zipcode": 73935} +{"_id": "purchases:16", "_label": "purchases", "address": "4388 45th St.", "created_at": "2011-03-24 10:04:00 +0000 UTC", "id": 16, "name": "Bradly Vasko", "state": "NY", "user_id": 22, "zipcode": 84583} +{"_id": "purchases:17", "_label": "purchases", "address": "478 44th Ave.", "created_at": "2011-09-18 08:55:00 +0000 UTC", "id": 17, "name": "Clemencia Durio", "state": "TX", "user_id": 27, "zipcode": 27038} +{"_id": "purchases:18", "_label": "purchases", "address": "8394 8th Ave.", "created_at": "2011-02-24 19:42:00 +0000 UTC", "id": 18, "name": "Kristle Pung", "state": "IL", "user_id": 36, "zipcode": 67659} +{"_id": "purchases:19", "_label": "purchases", "address": "1482 31st St.", "created_at": "2011-04-19 17:51:00 +0000 UTC", "id": 19, "name": "Adell Mayon", "state": "TX", "user_id": 28, "zipcode": 72775} +{"_id": "purchases:20", "_label": "purchases", "address": "9520 Washington Ave.", "created_at": "2011-01-20 17:52:00 +0000 UTC", "id": 20, "name": "Carolann Yoshimura", "state": "GA", "user_id": 37, "zipcode": 20503} +{"_id": "purchases:21", "_label": "purchases", "address": "9600 44th Ave.", "created_at": "2011-07-07 14:41:00 +0000 UTC", "id": 21, "name": "Andres Schippers", "state": "CO", "user_id": 8, "zipcode": 62899} +{"_id": "purchases:22", "_label": "purchases", "address": "2103 50th Ave.", "created_at": "2011-03-05 22:53:00 +0000 UTC", "id": 22, "name": "Divina Hamill", "state": "CO", "user_id": 45, "zipcode": 73210} +{"_id": "purchases:23", "_label": "purchases", "address": "6990 Washington Ave.", "created_at": "2011-12-22 13:39:00 +0000 UTC", "id": 23, "name": "Romaine Coderre", "state": "VA", "user_id": 39, "zipcode": 31853} +{"_id": "purchases:24", "_label": "purchases", "address": "8277 44th Ave.", "created_at": "2011-12-20 23:44:00 +0000 UTC", "id": 24, "name": "Kourtney Julian", "state": "VA", "user_id": 37, "zipcode": 67133} +{"_id": "purchases:25", "_label": "purchases", "address": "8464 8th Ave.", "created_at": "2011-05-30 17:49:00 +0000 UTC", "id": 25, "name": "Danyel Styers", "state": "WA", "user_id": 9, "zipcode": 56917} +{"_id": "purchases:26", "_label": "purchases", "address": "410 44th Ave.", "created_at": "2011-12-24 02:29:00 +0000 UTC", "id": 26, "name": "Jame Petrin", "state": "SC", "user_id": 11, "zipcode": 94048} +{"_id": "purchases:27", "_label": "purchases", "address": "2438 50th Ave.", "created_at": "2011-02-28 15:00:00 +0000 UTC", "id": 27, "name": "Kimi Birdsell", "state": "CO", "user_id": 17, "zipcode": 58337} +{"_id": "purchases:28", "_label": "purchases", "address": "5307 43rd St.", "created_at": "2011-10-14 16:27:00 +0000 UTC", "id": 28, "name": "Jame Heavner", "state": "TX", "user_id": 34, "zipcode": 81439} +{"_id": "purchases:29", "_label": "purchases", "address": "8612 Washington Ave.", "created_at": "2011-07-08 22:20:00 +0000 UTC", "id": 29, "name": "Cammy Mayon", "state": "NY", "user_id": 8, "zipcode": 79807} +{"_id": "purchases:30", "_label": "purchases", "address": "3673 10th Ave.", "created_at": "2011-05-24 08:03:00 +0000 UTC", "id": 30, "name": "Tommie Lanser", "state": "WY", "user_id": 27, "zipcode": 50519} +{"_id": "purchases:31", "_label": "purchases", "address": "8354 Washington Ave.", "created_at": "2011-03-30 21:44:00 +0000 UTC", "id": 31, "name": "Brandon Fruchter", "state": "NY", "user_id": 43, "zipcode": 50274} +{"_id": "purchases:32", "_label": "purchases", "address": "6479 31st St.", "created_at": "2011-01-12 16:26:00 +0000 UTC", "id": 32, "name": "Ricarda Pressey", "state": "TX", "user_id": 48, "zipcode": 95407} +{"_id": "purchases:33", "_label": "purchases", "address": "7271 50th Ave.", "created_at": "2011-11-01 21:34:00 +0000 UTC", "id": 33, "name": "Shalon Fontanilla", "state": "IL", "user_id": 25, "zipcode": 71634} +{"_id": "purchases:34", "_label": "purchases", "address": "1644 31st St.", "created_at": "2011-09-11 02:23:00 +0000 UTC", "id": 34, "name": "Edmund Pressnell", "state": "TX", "user_id": 5, "zipcode": 63152} +{"_id": "purchases:35", "_label": "purchases", "address": "6472 46th Ave.", "created_at": "2011-01-14 11:25:00 +0000 UTC", "id": 35, "name": "Homer Gasper", "state": "IL", "user_id": 18, "zipcode": 86204} +{"_id": "purchases:36", "_label": "purchases", "address": "1510 45th St.", "created_at": "2011-10-23 18:14:00 +0000 UTC", "id": 36, "name": "Brady Harshberger", "state": "VA", "user_id": 37, "zipcode": 94138} +{"_id": "purchases:37", "_label": "purchases", "address": "204 California St.", "created_at": "2011-06-20 21:37:00 +0000 UTC", "id": 37, "name": "Clemencia Matheson", "state": "CO", "user_id": 47, "zipcode": 59664} +{"_id": "purchases:38", "_label": "purchases", "address": "5944 43rd St.", "created_at": "2011-04-07 06:52:00 +0000 UTC", "id": 38, "name": "Danyel Sisemore", "state": "CO", "user_id": 20, "zipcode": 62994} +{"_id": "purchases:39", "_label": "purchases", "address": "3057 43rd St.", "created_at": "2011-01-31 15:27:00 +0000 UTC", "id": 39, "name": "Laurence Kump", "state": "IL", "user_id": 15, "zipcode": 95353} +{"_id": "purchases:40", "_label": "purchases", "address": "7896 MLK Ave.", "created_at": "2011-11-01 22:01:00 +0000 UTC", "id": 40, "name": "Mitchell Pellegrin", "state": "CO", "user_id": 40, "zipcode": 55259} +{"_id": "purchases:41", "_label": "purchases", "address": "9162 MLK Ave.", "created_at": "2011-02-18 06:06:00 +0000 UTC", "id": 41, "name": "Emely Kimball", "state": "GA", "user_id": 24, "zipcode": 10585} +{"_id": "purchases:42", "_label": "purchases", "address": "6719 Washington Ave.", "created_at": "2011-10-29 19:36:00 +0000 UTC", "id": 42, "name": "Russ Petrin", "state": "IL", "user_id": 48, "zipcode": 75651} +{"_id": "purchases:43", "_label": "purchases", "address": "6824 35th St.42nd Ave.", "created_at": "2011-07-04 02:28:00 +0000 UTC", "id": 43, "name": "Miyoko Allbright", "state": "WA", "user_id": 44, "zipcode": 77819} +{"_id": "purchases:44", "_label": "purchases", "address": "4144 10th Ave.", "created_at": "2011-03-15 08:42:00 +0000 UTC", "id": 44, "name": "Becky Wassink", "state": "WY", "user_id": 49, "zipcode": 89509} +{"_id": "purchases:45", "_label": "purchases", "address": "3438 44th Ave.", "created_at": "2011-11-11 01:22:00 +0000 UTC", "id": 45, "name": "Harley Dement", "state": "GA", "user_id": 42, "zipcode": 34758} +{"_id": "purchases:46", "_label": "purchases", "address": "5171 10th Ave.", "created_at": "2011-05-16 20:41:00 +0000 UTC", "id": 46, "name": "Mirta Alba", "state": "VA", "user_id": 16, "zipcode": 67003} +{"_id": "purchases:47", "_label": "purchases", "address": "7387 35th St.42nd Ave.", "created_at": "2011-09-01 01:01:00 +0000 UTC", "id": 47, "name": "Buford Yoshimura", "state": "IL", "user_id": 18, "zipcode": 84086} +{"_id": "purchases:48", "_label": "purchases", "address": "2370 8th Ave.", "created_at": "2011-05-29 18:37:00 +0000 UTC", "id": 48, "name": "Ruthie Tartaglia", "state": "TX", "user_id": 50, "zipcode": 13848} +{"_id": "purchases:49", "_label": "purchases", "address": "8125 50th Ave.", "created_at": "2011-05-22 00:02:00 +0000 UTC", "id": 49, "name": "Colleen Mcqueeney", "state": "NY", "user_id": 9, "zipcode": 51760} +{"_id": "purchases:50", "_label": "purchases", "address": "9165 44th Ave.", "created_at": "2011-10-11 22:53:00 +0000 UTC", "id": 50, "name": "Minerva Iriarte", "state": "IL", "user_id": 27, "zipcode": 83449} +{"_id": "purchases:51", "_label": "purchases", "address": "5912 44th Ave.", "created_at": "2011-10-20 00:28:00 +0000 UTC", "id": 51, "name": "Beverlee Mcdougle", "state": "WY", "user_id": 23, "zipcode": 72995} +{"_id": "purchases:52", "_label": "purchases", "address": "3085 31st St.", "created_at": "2011-10-08 05:19:00 +0000 UTC", "id": 52, "name": "Danyel Kipp", "state": "GA", "user_id": 35, "zipcode": 44471} +{"_id": "purchases:53", "_label": "purchases", "address": "6214 MLK Ave.", "created_at": "2011-06-09 02:58:00 +0000 UTC", "id": 53, "name": "Miyoko Emmerich", "state": "SC", "user_id": 15, "zipcode": 92365} +{"_id": "purchases:54", "_label": "purchases", "address": "8948 46th Ave.", "created_at": "2011-08-23 19:51:00 +0000 UTC", "id": 54, "name": "Colleen Connors", "state": "CO", "user_id": 23, "zipcode": 16281} +{"_id": "purchases:55", "_label": "purchases", "address": "2727 43rd St.", "created_at": "2011-01-02 21:54:00 +0000 UTC", "id": 55, "name": "Milda Rabb", "state": "VA", "user_id": 24, "zipcode": 12546} +{"_id": "purchases:56", "_label": "purchases", "address": "2623 8th Ave.", "created_at": "2011-08-25 23:55:00 +0000 UTC", "id": 56, "name": "Rivka Pressnell", "state": "WA", "user_id": 10, "zipcode": 58091} +{"_id": "purchases:57", "_label": "purchases", "address": "2106 Washington Ave.", "created_at": "2011-01-03 01:49:00 +0000 UTC", "id": 57, "name": "Letitia Sprau", "state": "IL", "user_id": 1, "zipcode": 76898} +{"_id": "purchases:58", "_label": "purchases", "address": "463 46th Ave.", "created_at": "2011-08-31 07:41:00 +0000 UTC", "id": 58, "name": "Wendie Dilks", "state": "NY", "user_id": 41, "zipcode": 30838} +{"_id": "purchases:59", "_label": "purchases", "address": "9289 Washington Ave.", "created_at": "2011-01-24 22:11:00 +0000 UTC", "id": 59, "name": "Williams Alber", "state": "NY", "user_id": 31, "zipcode": 20505} +{"_id": "purchases:60", "_label": "purchases", "address": "3434 Washington Ave.", "created_at": "2011-12-17 12:59:00 +0000 UTC", "id": 60, "name": "Ricarda Nowakowski", "state": "CO", "user_id": 43, "zipcode": 53662} +{"_id": "purchases:61", "_label": "purchases", "address": "6494 Washington Ave.", "created_at": "2011-08-23 14:28:00 +0000 UTC", "id": 61, "name": "Irma Currier", "state": "NY", "user_id": 2, "zipcode": 98527} +{"_id": "purchases:62", "_label": "purchases", "address": "7496 10th Ave.", "created_at": "2011-02-16 03:00:00 +0000 UTC", "id": 62, "name": "Salvatore Lightcap", "state": "SC", "user_id": 6, "zipcode": 75435} +{"_id": "purchases:63", "_label": "purchases", "address": "7295 10th Ave.", "created_at": "2011-04-28 20:22:00 +0000 UTC", "id": 63, "name": "Sol Fruchter", "state": "VA", "user_id": 13, "zipcode": 50135} +{"_id": "purchases:64", "_label": "purchases", "address": "6812 43rd St.", "created_at": "2011-10-06 03:50:00 +0000 UTC", "id": 64, "name": "Nana Arends", "state": "SC", "user_id": 16, "zipcode": 48227} +{"_id": "purchases:65", "_label": "purchases", "address": "7583 35th St.42nd Ave.", "created_at": "2011-07-06 17:51:00 +0000 UTC", "id": 65, "name": "Brandon Roth", "state": "TX", "user_id": 29, "zipcode": 17570} +{"_id": "purchases:66", "_label": "purchases", "address": "8547 45th St.", "created_at": "2011-09-04 10:32:00 +0000 UTC", "id": 66, "name": "Graig Sturgill", "state": "CO", "user_id": 29, "zipcode": 67015} +{"_id": "purchases:67", "_label": "purchases", "address": "8555 31st St.", "created_at": "2011-12-29 12:45:00 +0000 UTC", "id": 67, "name": "Lawerence Roff", "state": "NY", "user_id": 35, "zipcode": 60022} +{"_id": "purchases:68", "_label": "purchases", "address": "2232 43rd St.", "created_at": "2011-04-29 20:05:00 +0000 UTC", "id": 68, "name": "Jenee Haefner", "state": "FL", "user_id": 20, "zipcode": 51498} +{"_id": "purchases:69", "_label": "purchases", "address": "6659 Washington Ave.", "created_at": "2011-03-29 21:35:00 +0000 UTC", "id": 69, "name": "Karole Calico", "state": "VA", "user_id": 14, "zipcode": 58202} +{"_id": "purchases:70", "_label": "purchases", "address": "656 35th St.42nd Ave.", "created_at": "2011-04-07 10:43:00 +0000 UTC", "id": 70, "name": "Buddy Doyel", "state": "FL", "user_id": 29, "zipcode": 89794} +{"_id": "purchases:71", "_label": "purchases", "address": "4063 8th Ave.", "created_at": "2011-07-26 14:06:00 +0000 UTC", "id": 71, "name": "Ozella Selden", "state": "GA", "user_id": 37, "zipcode": 28335} +{"_id": "purchases:72", "_label": "purchases", "address": "9344 44th Ave.", "created_at": "2011-06-10 09:18:00 +0000 UTC", "id": 72, "name": "Mauro Allbright", "state": "IL", "user_id": 7, "zipcode": 47037} +{"_id": "purchases:73", "_label": "purchases", "address": "8181 10th Ave.", "created_at": "2011-03-01 16:56:00 +0000 UTC", "id": 73, "name": "Salvatore Kimball", "state": "CO", "user_id": 10, "zipcode": 11819} +{"_id": "purchases:74", "_label": "purchases", "address": "6844 45th St.", "created_at": "2011-10-31 10:51:00 +0000 UTC", "id": 74, "name": "Nana Suits", "state": "WY", "user_id": 23, "zipcode": 45801} +{"_id": "purchases:75", "_label": "purchases", "address": "5546 31st St.", "created_at": "2011-12-25 03:13:00 +0000 UTC", "id": 75, "name": "Minerva Li", "state": "FL", "user_id": 12, "zipcode": 37071} +{"_id": "purchases:76", "_label": "purchases", "address": "2534 35th St.42nd Ave.", "created_at": "2011-01-24 14:13:00 +0000 UTC", "id": 76, "name": "Georgina Crissman", "state": "SC", "user_id": 26, "zipcode": 92320} +{"_id": "purchases:77", "_label": "purchases", "address": "4651 31st St.", "created_at": "2011-12-22 21:08:00 +0000 UTC", "id": 77, "name": "Tommie Ange", "state": "NY", "user_id": 44, "zipcode": 43609} +{"_id": "purchases:78", "_label": "purchases", "address": "7780 44th Ave.", "created_at": "2011-04-21 07:52:00 +0000 UTC", "id": 78, "name": "Kymberly Ange", "state": "VA", "user_id": 3, "zipcode": 17138} +{"_id": "purchases:79", "_label": "purchases", "address": "4937 Washington Ave.", "created_at": "2011-05-18 04:38:00 +0000 UTC", "id": 79, "name": "Reed Larimer", "state": "NY", "user_id": 16, "zipcode": 53172} +{"_id": "purchases:80", "_label": "purchases", "address": "8915 Washington Ave.", "created_at": "2011-08-27 20:03:00 +0000 UTC", "id": 80, "name": "Carmel Letellier", "state": "FL", "user_id": 16, "zipcode": 76107} +{"_id": "purchases:81", "_label": "purchases", "address": "6198 California St.", "created_at": "2011-11-04 11:56:00 +0000 UTC", "id": 81, "name": "Colleen Seabaugh", "state": "TX", "user_id": 20, "zipcode": 25936} +{"_id": "purchases:82", "_label": "purchases", "address": "7705 MLK Ave.", "created_at": "2011-11-26 16:47:00 +0000 UTC", "id": 82, "name": "Granville Blumer", "state": "WY", "user_id": 23, "zipcode": 21361} +{"_id": "purchases:83", "_label": "purchases", "address": "7813 45th St.", "created_at": "2011-01-28 23:07:00 +0000 UTC", "id": 83, "name": "Brady Durio", "state": "WA", "user_id": 8, "zipcode": 15632} +{"_id": "purchases:84", "_label": "purchases", "address": "3266 California St.", "created_at": "2011-11-22 20:47:00 +0000 UTC", "id": 84, "name": "Graciela Kiser", "state": "NY", "user_id": 13, "zipcode": 40432} +{"_id": "purchases:85", "_label": "purchases", "address": "2318 MLK Ave.", "created_at": "2011-05-01 22:45:00 +0000 UTC", "id": 85, "name": "Angel Lesane", "state": "FL", "user_id": 15, "zipcode": 93225} +{"_id": "purchases:86", "_label": "purchases", "address": "5504 8th Ave.", "created_at": "2011-03-18 09:04:00 +0000 UTC", "id": 86, "name": "Shawanda Ange", "state": "WA", "user_id": 26, "zipcode": 28528} +{"_id": "purchases:87", "_label": "purchases", "address": "7052 35th St.42nd Ave.", "created_at": "2011-03-31 20:54:00 +0000 UTC", "id": 87, "name": "Samatha Dougal", "state": "NY", "user_id": 15, "zipcode": 36717} +{"_id": "purchases:88", "_label": "purchases", "address": "7214 10th Ave.", "created_at": "2011-08-18 00:43:00 +0000 UTC", "id": 88, "name": "Dee Luman", "state": "WY", "user_id": 37, "zipcode": 35245} +{"_id": "purchases:89", "_label": "purchases", "address": "5857 43rd St.", "created_at": "2011-08-04 04:14:00 +0000 UTC", "id": 89, "name": "Rolf Crenshaw", "state": "TX", "user_id": 7, "zipcode": 21037} +{"_id": "purchases:90", "_label": "purchases", "address": "2848 MLK Ave.", "created_at": "2011-11-24 19:35:00 +0000 UTC", "id": 90, "name": "Irma Disney", "state": "VA", "user_id": 44, "zipcode": 73667} +{"_id": "purchases:91", "_label": "purchases", "address": "4441 35th St.42nd Ave.", "created_at": "2011-11-13 21:18:00 +0000 UTC", "id": 91, "name": "Letitia Strayer", "state": "SC", "user_id": 8, "zipcode": 14491} +{"_id": "purchases:92", "_label": "purchases", "address": "4875 35th St.42nd Ave.", "created_at": "2011-04-14 21:12:00 +0000 UTC", "id": 92, "name": "Angel Benedetto", "state": "WA", "user_id": 18, "zipcode": 30254} +{"_id": "purchases:93", "_label": "purchases", "address": "7661 8th Ave.", "created_at": "2011-06-12 18:43:00 +0000 UTC", "id": 93, "name": "Claud Vasko", "state": "WY", "user_id": 32, "zipcode": 10935} +{"_id": "purchases:94", "_label": "purchases", "address": "272 45th St.", "created_at": "2011-05-12 20:46:00 +0000 UTC", "id": 94, "name": "Berta Fretz", "state": "FL", "user_id": 48, "zipcode": 36777} +{"_id": "purchases:95", "_label": "purchases", "address": "1162 44th Ave.", "created_at": "2011-07-16 22:41:00 +0000 UTC", "id": 95, "name": "Johnathan Pressey", "state": "SC", "user_id": 38, "zipcode": 46110} +{"_id": "purchases:96", "_label": "purchases", "address": "3235 Washington Ave.", "created_at": "2011-02-12 19:30:00 +0000 UTC", "id": 96, "name": "Brady Mcclain", "state": "IL", "user_id": 23, "zipcode": 31913} +{"_id": "purchases:97", "_label": "purchases", "address": "2797 44th Ave.", "created_at": "2011-03-23 14:11:00 +0000 UTC", "id": 97, "name": "Theresia Lesane", "state": "GA", "user_id": 23, "zipcode": 67585} +{"_id": "purchases:98", "_label": "purchases", "address": "1528 31st St.", "created_at": "2011-07-23 13:01:00 +0000 UTC", "id": 98, "name": "Lawerence Senko", "state": "NY", "user_id": 49, "zipcode": 49526} +{"_id": "purchases:99", "_label": "purchases", "address": "7255 10th Ave.", "created_at": "2011-11-20 05:41:00 +0000 UTC", "id": 99, "name": "Rivka Scharf", "state": "TX", "user_id": 36, "zipcode": 59794} +{"_id": "purchases:100", "_label": "purchases", "address": "4864 10th Ave.", "created_at": "2011-09-12 04:07:00 +0000 UTC", "id": 100, "name": "Rubie Wassink", "state": "CO", "user_id": 12, "zipcode": 35894} \ No newline at end of file diff --git a/test/schema_graph_test.go b/test/schema_graph_test.go index ded42105f..592f7d88f 100644 --- a/test/schema_graph_test.go +++ b/test/schema_graph_test.go @@ -14,7 +14,7 @@ import ( ) func TestSchema(t *testing.T) { - if dbname == "psql" || dbname == "existing-sql" || dbname == "elastic" { + if dbname == "psql" || dbname == "existing-sql" { t.Skip("skipping schema test") } @@ -65,7 +65,7 @@ func TestSchema(t *testing.T) { expected := &gripql.QueryResult{ Result: &gripql.QueryResult_Vertex{ Vertex: &gripql.Vertex{ - Gid: "users", + Id: "users", Label: "users", Data: ds, }, diff --git a/test/server/auth_test.go b/test/server/auth_test.go index c1fb76af6..549de6f0d 100644 --- a/test/server/auth_test.go +++ b/test/server/auth_test.go @@ -6,7 +6,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "net/http" "os" "strings" @@ -61,7 +60,7 @@ func TestBasicAuthFail(t *testing.T) { t.Fatal(err) } - _, err = cli.Traversal(&gripql.GraphQuery{Graph: "test", Query: gripql.NewQuery().V().Statements}) + _, err = cli.Traversal(context.Background(), &gripql.GraphQuery{Graph: "test", Query: gripql.NewQuery().V().Statements}) if err == nil || !strings.Contains(err.Error(), "PermissionDenied") { t.Errorf("expected PermissionDenied error; got: %v", err) } @@ -126,12 +125,12 @@ func TestBasicAuth(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - err = cli.AddVertex("test", &gripql.Vertex{Gid: "1", Label: "test"}) + err = cli.AddVertex("test", &gripql.Vertex{Id: "1", Label: "test"}) if err != nil { t.Fatalf("unexpected error: %v", err) } - _, err = cli.Traversal(&gripql.GraphQuery{Graph: "test", Query: gripql.NewQuery().V().Statements}) + _, err = cli.Traversal(context.Background(), &gripql.GraphQuery{Graph: "test", Query: gripql.NewQuery().V().Statements}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -154,7 +153,7 @@ func TestBasicAuth(t *testing.T) { t.Errorf("unexpected error: %v", err) } returnString := `{"graphs":["test"]}` - bodyText, err := ioutil.ReadAll(resp.Body) + bodyText, err := io.ReadAll(resp.Body) if string(bodyText) != returnString { t.Log(string(bodyText)) t.Error("incorrect http return value") diff --git a/test/sqlite.yml b/test/sqlite.yml new file mode 100644 index 000000000..d8039c70b --- /dev/null +++ b/test/sqlite.yml @@ -0,0 +1,7 @@ +Default: sqlite + +Drivers: + sqlite: + Sqlite: + DBName: tester/sqliteDB + diff --git a/timestamp/timestamp.go b/timestamp/timestamp.go index 146c7e9a9..f5ed9782d 100644 --- a/timestamp/timestamp.go +++ b/timestamp/timestamp.go @@ -6,22 +6,22 @@ import ( "time" ) -//Timestamp records timestamps +// Timestamp records timestamps type Timestamp struct { stamps sync.Map } -//NewTimestamp creates a new Timestamp recorder +// NewTimestamp creates a new Timestamp recorder func NewTimestamp() Timestamp { return Timestamp{stamps: sync.Map{}} } -//Touch updates an entry in the timestamp +// Touch updates an entry in the timestamp func (ts *Timestamp) Touch(name string) { ts.stamps.Store(name, fmt.Sprintf("%d", time.Now().UnixNano())) } -//Get gets the current timestamp +// Get gets the current timestamp func (ts *Timestamp) Get(name string) string { o, _ := ts.stamps.Load(name) if o == nil { diff --git a/util/file_reader.go b/util/file_reader.go index 820c136f5..5f326eb2d 100644 --- a/util/file_reader.go +++ b/util/file_reader.go @@ -11,13 +11,14 @@ import ( "path/filepath" "strings" "sync" + "sync/atomic" "github.com/bmeg/grip/gripql" "github.com/bmeg/grip/log" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/types/known/structpb" ) func getS3Client(u *url.URL) (*minio.Client, error) { @@ -56,7 +57,6 @@ func getS3URL(path string) *url.URL { // StreamLines returns a channel of lines from a file. func StreamLines(file string, chanSize int) (chan string, error) { - var fh io.ReadCloser var err error if u := getS3URL(file); u != nil { @@ -113,9 +113,7 @@ func StreamLines(file string, chanSize int) (chan string, error) { return lineChan, nil } -// StreamVerticesFromFile reads a file containing a vertex per line and -// streams *gripql.Vertex objects out on a channel -func StreamVerticesFromFile(file string, workers int) (chan *gripql.Vertex, error) { +func StreamRawJsonFromFile(file string, workers int, graph string, extra_args map[string]any) (chan *gripql.RawJson, error) { if workers < 1 { workers = 1 } @@ -126,58 +124,55 @@ func StreamVerticesFromFile(file string, workers int) (chan *gripql.Vertex, erro if err != nil { return nil, err } - - vertChan := make(chan *gripql.Vertex, workers) + jsonChan := make(chan *gripql.RawJson, workers) var wg sync.WaitGroup + jum := gripql.NewFlattenMarshaler() - jum := protojson.UnmarshalOptions{DiscardUnknown: true} - - for i := 0; i < workers; i++ { + for range workers { wg.Add(1) go func() { + defer wg.Done() for line := range lineChan { - v := &gripql.Vertex{} - err := jum.Unmarshal([]byte(line), v) + rawData := &gripql.RawJson{ + Data: &structpb.Struct{}, + ExtraArgs: &structpb.Struct{}, + Graph: graph, + } + + rawData.ExtraArgs, err = structpb.NewStruct(extra_args) + if err != nil { + log.WithFields(log.Fields{"error": err}).Errorf("Marshalling ExtraArgs: %#v", extra_args) + continue + } + err = jum.Unmarshal([]byte(line), rawData.Data) if err != nil { log.WithFields(log.Fields{"error": err}).Errorf("Unmarshaling vertex: %s", line) - } else { - vertChan <- v + continue } + jsonChan <- rawData } - wg.Done() }() } - go func() { wg.Wait() - close(vertChan) + close(jsonChan) }() - - return vertChan, nil + return jsonChan, nil } -// StreamEdgesFromFile reads a file containing an edge per line and -// streams gripql.Edge objects on a channel +// StreamEdgesFromFile reads a file of JSON edges and streams *gripql.Edge objects. func StreamEdgesFromFile(file string, workers int) (chan *gripql.Edge, error) { - if workers < 1 { - workers = 1 - } - if workers > 99 { - workers = 99 - } lineChan, err := StreamLines(file, workers) if err != nil { return nil, err } - edgeChan := make(chan *gripql.Edge, workers) var wg sync.WaitGroup - - jum := protojson.UnmarshalOptions{DiscardUnknown: true} - - for i := 0; i < workers; i++ { + for range workers { wg.Add(1) go func() { + defer wg.Done() + jum := gripql.NewFlattenMarshaler() for line := range lineChan { e := &gripql.Edge{} err := jum.Unmarshal([]byte(line), e) @@ -187,18 +182,51 @@ func StreamEdgesFromFile(file string, workers int) (chan *gripql.Edge, error) { edgeChan <- e } } - wg.Done() }() } - go func() { wg.Wait() close(edgeChan) }() - return edgeChan, nil } +// StreamVerticesFromFile reads a file of JSON vertices and streams *gripql.Vertex objects. +func StreamVerticesFromFile(file string, workers int) (chan *gripql.Vertex, error) { + lineChan, err := StreamLines(file, workers) + if err != nil { + return nil, err + } + vertChan := make(chan *gripql.Vertex, workers) + var wg sync.WaitGroup + var unmarshalCount atomic.Int64 + for range workers { + wg.Add(1) + go func() { + defer wg.Done() + jum := gripql.NewFlattenMarshaler() + for line := range lineChan { + v := &gripql.Vertex{} + err := jum.Unmarshal([]byte(line), v) + if unmarshalCount.Add(1)%10000 == 0 { + log.Infof("Unmarshaled %d vertices", unmarshalCount.Load()) + } + if err != nil { + log.WithFields(log.Fields{"error": err}).Errorf("Unmarshaling edge: %s", line) + } else { + vertChan <- v + } + } + }() + } + go func() { + wg.Wait() + close(vertChan) + }() + + return vertChan, nil +} + func DirScan(baseDir string, fileGlob string) ([]string, error) { if u := getS3URL(baseDir); u != nil { if client, err := getS3Client(u); err == nil { diff --git a/util/insert.go b/util/insert.go index 419df0ac1..b923b8a92 100644 --- a/util/insert.go +++ b/util/insert.go @@ -1,49 +1,42 @@ package util import ( + "context" "fmt" "sync" "github.com/bmeg/grip/gdbi" "github.com/bmeg/grip/log" multierror "github.com/hashicorp/go-multierror" + "golang.org/x/sync/semaphore" ) // StreamBatch a stream of inputs and loads them into the graph // This function assumes incoming stream is GraphElemnts from a single graph -func StreamBatch(stream <-chan *gdbi.GraphElement, batchSize int, graph string, vertexAdd func([]*gdbi.Vertex) error, edgeAdd func([]*gdbi.Edge) error) error { - +func StreamBatch(stream <-chan *gdbi.GraphElement, batchSize int, graph string, vertexAdd func(<-chan *gdbi.Vertex, int) error, edgeAdd func(<-chan *gdbi.Edge, int) error) error { var bulkErr *multierror.Error vertCount := 0 edgeCount := 0 - vertexBatchChan := make(chan []*gdbi.Vertex) - edgeBatchChan := make(chan []*gdbi.Edge) wg := &sync.WaitGroup{} - wg.Add(1) + vertexChan := make(chan *gdbi.Vertex, batchSize) + edgeChan := make(chan *gdbi.Edge, batchSize) + + sem := semaphore.NewWeighted(int64(batchSize * 2)) + + wg.Add(2) go func() { - for vBatch := range vertexBatchChan { - if len(vBatch) > 0 { - err := vertexAdd(vBatch) - if err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - } + defer wg.Done() + if err := vertexAdd(vertexChan, batchSize); err != nil { + bulkErr = multierror.Append(bulkErr, err) } - wg.Done() }() - wg.Add(1) go func() { - for eBatch := range edgeBatchChan { - if len(eBatch) > 0 { - err := edgeAdd(eBatch) - if err != nil { - bulkErr = multierror.Append(bulkErr, err) - } - } + defer wg.Done() + if err := edgeAdd(edgeChan, batchSize); err != nil { + bulkErr = multierror.Append(bulkErr, err) } - wg.Done() }() vertexBatch := make([]*gdbi.Vertex, 0, batchSize) @@ -55,45 +48,73 @@ func StreamBatch(stream <-chan *gdbi.GraphElement, batchSize int, graph string, bulkErr, fmt.Errorf("unexpected graph reference: %s != %s", element.Graph, graph), ) - } else if element.Vertex != nil { - if len(vertexBatch) >= batchSize { - vertexBatchChan <- vertexBatch - vertexBatch = make([]*gdbi.Vertex, 0, batchSize) - } + continue + } + if element.Vertex != nil { vertex := element.Vertex - err := vertex.Validate() - if err != nil { + if err := vertex.Validate(); err != nil { bulkErr = multierror.Append( bulkErr, fmt.Errorf("vertex validation failed: %v", err), ) - } else { - vertexBatch = append(vertexBatch, vertex) - vertCount++ + continue } - } else if element.Edge != nil { - if len(edgeBatch) >= batchSize { - edgeBatchChan <- edgeBatch - edgeBatch = make([]*gdbi.Edge, 0, batchSize) + + sem.Acquire(context.Background(), 1) + vertexBatch = append(vertexBatch, vertex) + vertCount++ + + if len(vertexBatch) >= batchSize { + batchSizeToRelease := len(vertexBatch) + for _, v := range vertexBatch { + vertexChan <- v + } + vertexBatch = make([]*gdbi.Vertex, 0, batchSize) + sem.Release(int64(batchSizeToRelease)) } + } else if element.Edge != nil { edge := element.Edge if edge.ID == "" { edge.ID = UUID() } - err := edge.Validate() - if err != nil { + + if err := edge.Validate(); err != nil { bulkErr = multierror.Append( bulkErr, fmt.Errorf("edge validation failed: %v", err), ) - } else { - edgeBatch = append(edgeBatch, edge) - edgeCount++ + continue + } + + sem.Acquire(context.Background(), 1) + edgeBatch = append(edgeBatch, edge) + edgeCount++ + + if len(edgeBatch) >= batchSize { + batchSizeToRelease := len(edgeBatch) + for _, e := range edgeBatch { + edgeChan <- e + } + edgeBatch = make([]*gdbi.Edge, 0, batchSize) + sem.Release(int64(batchSizeToRelease)) } } } - vertexBatchChan <- vertexBatch - edgeBatchChan <- edgeBatch + + // Send remaining vertices and edges in the batch + for _, v := range vertexBatch { + vertexChan <- v + } + for _, e := range edgeBatch { + edgeChan <- e + } + + // Close channels after all data is sent + close(vertexChan) + close(edgeChan) + + wg.Wait() + sem.Release(int64(len(vertexBatch) + len(edgeBatch))) if vertCount != 0 { log.Debugf("%d vertices streamed to BulkAdd", vertCount) @@ -103,9 +124,5 @@ func StreamBatch(stream <-chan *gdbi.GraphElement, batchSize int, graph string, log.Debugf("%d edges streamed to BulkAdd", edgeCount) } - close(edgeBatchChan) - close(vertexBatchChan) - wg.Wait() - return bulkErr.ErrorOrNil() } diff --git a/util/insert_test.go b/util/insert_test.go index 7e14f8c5a..ecdaeeff6 100644 --- a/util/insert_test.go +++ b/util/insert_test.go @@ -27,10 +27,14 @@ func TestBatchInsertValidation(t *testing.T) { {Graph: "graph", Edge: &gdbi.Edge{ID: "e8", Label: "test", From: "v1", To: "v7"}}, } - vAdd := func([]*gdbi.Vertex) error { + vAdd := func(v <-chan *gdbi.Vertex, c int) error { + for range v { + } return nil } - eAdd := func([]*gdbi.Edge) error { + eAdd := func(e <-chan *gdbi.Edge, c int) error { + for range e { + } return nil } @@ -69,10 +73,14 @@ func TestBatchGraphValidation(t *testing.T) { {Graph: "graph", Edge: &gdbi.Edge{ID: "e8", Label: "test", From: "v1", To: "v7"}}, } - vAdd := func([]*gdbi.Vertex) error { + vAdd := func(v <-chan *gdbi.Vertex, c int) error { + for range v { + } return nil } - eAdd := func(e []*gdbi.Edge) error { + eAdd := func(e <-chan *gdbi.Edge, c int) error { + for range e { + } return fmt.Errorf("edgeAdd test error") } @@ -88,7 +96,7 @@ func TestBatchGraphValidation(t *testing.T) { err := StreamBatch(i, 5, "graph", vAdd, eAdd) if merr, ok := err.(*multierror.Error); ok { - if len(merr.Errors) != 8 { + if len(merr.Errors) != 6 { t.Log(merr.Error()) t.Errorf("incorrect number of errors returned") } diff --git a/website/.hugo_build.lock b/website/.hugo_build.lock new file mode 100644 index 000000000..e69de29bb diff --git a/website/content/docs.md b/website/content/docs.md index 266eed9c7..1c5f39908 100644 --- a/website/content/docs.md +++ b/website/content/docs.md @@ -9,14 +9,14 @@ menu: # Overview GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: -MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB. +MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB. Properties of an GRIP graph: -* Both vertices and edges in a graph can have any number of properties associated with them. -* There are many types of vertices and edges in a graph. Two vertices may have many types of edges +- Both vertices and edges in a graph can have any number of properties associated with them. +- There are many types of vertices and edges in a graph. Two vertices may have many types of edges connecting them, thus reflecting a myriad of relationship types. -* Edges in the graph are directed, meaning they have a source and destination. +- Edges in the graph are directed, meaning they have a source and destination. GRIP also provides a query API for the traversing, analyzing and manipulating your graphs. Its syntax is inspired by [Apache TinkerPop](http://tinkerpop.apache.org/). Learn more [here](/docs/queries/getting_started) about GRIP and its @@ -26,25 +26,25 @@ application for querying the Bio Medical Evidence Graph ([BMEG](https://bmeg.io) GRIP has three types of drivers: - - *Embedded* : GRIP has built in graph storage, built using embedded databases. This allows you to quick - set graphs for data storage and analysis, without having to configure an external database and connect it - to GRIP. This is the default mode if GRIP is started without any configuration. The primarily driver - is based on [Badger](https://github.com/dgraph-io/badger). - - *Database Backends* : GRIP can utilize a number of different database backends to store graph data. - In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same - as the Embedded deployment. Supported systems include Mongo, Portgres SQL and Elastic Search. When deployed - using Mongo, GRIP will translate GripQL queries into [Mongo Aggregation Pipeline queries](https://docs.mongodb.com/manual/core/aggregation-pipeline/). - - *Plugin Existing Resources* : This mode is designed to take advantage of existing data resources, mapping - them into a graph framework so they can be accessed using GripQL. This mode is currently read-only. +- _Embedded_ : GRIP has built in graph storage, built using embedded databases. This allows you to quick + set graphs for data storage and analysis, without having to configure an external database and connect it + to GRIP. This is the default mode if GRIP is started without any configuration. The primarily driver + is based on [Badger](https://github.com/dgraph-io/badger). +- _Database Backends_ : GRIP can utilize a number of different database backends to store graph data. + In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same + as the Embedded deployment. Supported systems include Mongo, Portgres SQL. When deployed + using Mongo, GRIP will translate GripQL queries into [Mongo Aggregation Pipeline queries](https://docs.mongodb.com/manual/core/aggregation-pipeline/). +- _Plugin Existing Resources_ : This mode is designed to take advantage of existing data resources, mapping + them into a graph framework so they can be accessed using GripQL. This mode is currently read-only. # Future Plans GRIP is still under active development and there are plans for a number of additional features. These include: - - Batch queries. Ability to submit long running queries to be processed asynchronously and stored for later retrieval. - - Query Caching. - - Query Continuation. Ability to describe a graph query that starts off where another query ended. For example, - from batch or cached query and to filtering or a few additional steps. - - Optimized Plugable External Resource API. Adding additional operations, such as 'joins' or better filtering, to - external resources would allow GRIP to better optimize queries and reduce query time. - - Managed Plugin deployment. +- Batch queries. Ability to submit long running queries to be processed asynchronously and stored for later retrieval. +- Query Caching. +- Query Continuation. Ability to describe a graph query that starts off where another query ended. For example, + from batch or cached query and to filtering or a few additional steps. +- Optimized Plugable External Resource API. Adding additional operations, such as 'joins' or better filtering, to + external resources would allow GRIP to better optimize queries and reduce query time. +- Managed Plugin deployment. diff --git a/website/content/docs/queries/getting_started.md b/website/content/docs/clients.md similarity index 71% rename from website/content/docs/queries/getting_started.md rename to website/content/docs/clients.md index d7e8deec3..00abc5539 100644 --- a/website/content/docs/queries/getting_started.md +++ b/website/content/docs/clients.md @@ -1,11 +1,12 @@ --- -title: Getting Started +title: Client Library menu: main: - parent: Queries - weight: -10 + identifier: clients + weight: 25 --- + # Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step [operations](/docs/queries/operations). @@ -58,18 +59,19 @@ Now that we have a connection to a graph instance, we can use this to make all o One of the first things you probably want to do is find some vertex out of all of the vertexes available in the system. In order to do this, we need to know something about the vertex we are looking for. To start, let's see if we can find a specific gene: ```python -result = G.query().V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).execute() +result = G.V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).execute() print(result) ``` -A couple things about this first and simplest query. We start with `O`, our grip client instance connected to the "bmeg" graph, and create a new query with `.query()`. This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results. +A couple things about this first and simplest query. We start with `O`, our grip client instance connected to the "bmeg" graph, and create a new query with ``. This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results. Once we make this query, we get a result: ```python [ - {u'gid': u'ENSG00000141510', - u'data': { + { + u'_id': u'ENSG00000141510', + u'_label': u'Gene' u'end': 7687550, u'description': u'tumor protein p53 [Source:HGNC Symbol%3BAcc:HGNC:11998]', u'symbol': u'TP53', @@ -78,16 +80,14 @@ Once we make this query, we get a result: u'strand': u'-', u'id': u'ENSG00000141510', u'chromosome': u'17' - }, - u'label': u'Gene'}) + } ] ``` This represents the vertex we queried for above. All vertexes in the system will have a similar structure, basically: -* _gid_: This represents the global identifier for this vertex. In order to draw edges between different vertexes from different data sets we need an identifier that can be constructed from available data. Often, the `gid` will be the field that you query on as a starting point for a traversal. -* _label_: The label represents the type of the vertex. All vertexes with a given label will share many property keys and edge labels, and form a logical group within the system. -* _data_: This is where all the data goes. `data` can be an arbitrary map, and these properties can be referenced during traversals. +* _\_id_: This represents the global identifier for this vertex. In order to draw edges between different vertexes from different data sets we need an identifier that can be constructed from available data. Often, the `_id` will be the field that you query on as a starting point for a traversal. +* _\_label_: The label represents the type of the vertex. All vertexes with a given label will share many property keys and edge labels, and form a logical group within the system. The data on a query result can be accessed as properties on the result object; for example `result[0].data.symbol` would return: @@ -98,7 +98,7 @@ u'TP53' You can also do a `has` query with a list of items using `gripql.within([...])` (other conditions exist, see the `Conditions` section below): ```python -result = G.query().V().hasLabel("Gene").has(gripql.within("symbol", ["TP53", "BRCA1"])).render({"gid": "_gid", "symbol":"symbol"}).execute() +result = G.V().hasLabel("Gene").has(gripql.within("symbol", ["TP53", "BRCA1"])).render({"_id": "_id", "symbol":"symbol"}).execute() print(result) ``` @@ -106,8 +106,8 @@ This returns both Gene vertexes: ``` [ - {u'symbol': u'TP53', u'gid': u'ENSG00000141510'}, - {u'symbol': u'BRCA1', u'gid': u'ENSG00000012048'} + {u'symbol': u'TP53', u'_id': u'ENSG00000141510'}, + {u'symbol': u'BRCA1', u'_id': u'ENSG00000012048'} ] ``` @@ -118,7 +118,7 @@ Edges in the graph are directional, so there are both incoming and outgoing edge Starting with gene TP53, and see what kind of other vertexes it is connected to. ```python -result = G.query().V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).in_("TranscriptFor")render({"gid": "_gid", "label":"_label"}).execute() +result = G.V().hasLabel("Gene").has(gripql.eq("symbol", "TP53")).in_("TranscriptFor")render({"id": "_id", "label":"_label"}).execute() print(result) ``` @@ -128,10 +128,14 @@ Additionally, we have provided `TranscriptFor` as an argument to `.in_()`. This ``` [ - {u'label': u'Transcript', u'gid': u'ENST00000413465'}, - {u'label': u'Transcript', u'gid': u'ENST00000604348'}, + {u'_label': u'Transcript', u'_id': u'ENST00000413465'}, + {u'_label': u'Transcript', u'_id': u'ENST00000604348'}, ... ] ``` View a list of all available query operations [here](/docs/queries/operations). + +### Using the command line + +Grip command line syntax is defined at gripql/javascript/gripql.js diff --git a/website/content/docs/commands.md b/website/content/docs/commands.md index 88f9aa492..ed56bc043 100644 --- a/website/content/docs/commands.md +++ b/website/content/docs/commands.md @@ -5,3 +5,4 @@ menu: identifier: commands weight: 10 --- + diff --git a/website/content/docs/commands/create.md b/website/content/docs/commands/create.md new file mode 100644 index 000000000..bde4aa831 --- /dev/null +++ b/website/content/docs/commands/create.md @@ -0,0 +1,27 @@ + +--- +title: create + +menu: + main: + parent: commands + weight: 2 +--- + +# `create` + +## Usage + +```bash +gripql-cli create --host +``` + +- ``: The name of the graph to be created (required). +- `--host `: The URL of the GripQL server (default is "localhost:8202"). + +## Example + +```bash +gripql-cli create my_new_graph --host myserver.com:8202 +``` + diff --git a/website/content/docs/commands/delete.md b/website/content/docs/commands/delete.md new file mode 100644 index 000000000..e4deeab68 --- /dev/null +++ b/website/content/docs/commands/delete.md @@ -0,0 +1,42 @@ +--- +title: delete +menu: + main: + parent: commands + weight: 3 +--- + +# `delete` Command + +## Usage + +```bash +gripql-cli delete --host --file --edges --vertices +``` + +### Options + +- ``: Name of the graph (required) +- `--host `: GripQL server URL (default: "localhost:8202") +- `--file `: Path to a JSON file containing data to delete +- `--edges `: Comma-separated list of edge IDs to delete (ignored if JSON file is provided) +- `--vertices `: Comma-separated list of vertex IDs to delete (ignored if JSON file is provided) + +## Example + +```bash +gripql-cli delete my_graph --host myserver.com:8202 --edges edge1,edge2 --vertices vertex3,vertex4 +``` + +## JSON File Format + +JSON file format for data to be deleted: + +```json +{ + "graph": "graph_name", + "edges": ["list of edge ids"], + "vertices": ["list of vertex ids"] +} +``` + diff --git a/website/content/docs/commands/list.md b/website/content/docs/commands/list.md index f095cda26..f018b6ae3 100644 --- a/website/content/docs/commands/list.md +++ b/website/content/docs/commands/list.md @@ -7,13 +7,34 @@ menu: weight: 3 --- -``` -grip list -``` +The `list tables` command is used to display all available tables in the grip server. Each table is represented by its source, name, fields, and link map. Here's a breakdown of how to use this command: +- **Usage:** `gripql list tables` +- **Short Description:** List all available tables in the grip server. +- **Long Description:** This command connects to the grip server and retrieves information about all available tables. It then prints each table's source, name, fields, and link map to the console. +- **Arguments:** None +- **Flags:** + - `--host`: The URL of the grip server (default: "localhost:8202") +## `gripql list graphs` Command Documentation -# graphs -``` -grip list graphs -``` +The `list graphs` command is used to display all available graphs in the grip server. Here's a breakdown of how to use this command: + +- **Usage:** `gripql list graphs` +- **Short Description:** List all available graphs in the grip server. +- **Long Description:** This command connects to the grip server and retrieves information about all available graphs. It then prints each graph's name to the console. +- **Arguments:** None +- **Flags:** + - `--host`: The URL of the grip server (default: "localhost:8202") + +## `gripql list labels` Command Documentation + +The `list labels` command is used to display all available vertex and edge labels in a specific graph. Here's a breakdown of how to use this command: + +- **Usage:** `gripql list labels ` +- **Short Description:** List the vertex and edge labels in a specific graph. +- **Long Description:** This command takes one argument, the name of the graph, and connects to the grip server. It retrieves information about all available vertex and edge labels in that graph and prints them to the console in JSON format. +- **Arguments:** + - ``: The name of the graph to list labels for. +- **Flags:** + - `--host`: The URL of the grip server (default: "localhost:8202") \ No newline at end of file diff --git a/website/content/docs/commands/query.md b/website/content/docs/commands/query.md index 5a4c89ceb..bb4f7ec67 100644 --- a/website/content/docs/commands/query.md +++ b/website/content/docs/commands/query.md @@ -12,3 +12,9 @@ grip query ``` Run a query on a graph. + +Examples +```bash +grip query pc12 'V().hasLabel("Pathway").count()' +``` + diff --git a/website/content/docs/commands/server.md b/website/content/docs/commands/server.md index 212b02e17..fb7e82af4 100644 --- a/website/content/docs/commands/server.md +++ b/website/content/docs/commands/server.md @@ -1,28 +1,53 @@ --- title: server - menu: main: parent: commands weight: 1 --- -``` -grip server -``` - +# `server` The server command starts up a graph server and waits for incoming requests. ## Default Configuration -If invoked with no arguments or config files, GRIP will start up in embedded mode, -using a Badger based graph driver. +If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver. ## Networking -By default the GRIP server operates on 2 ports, `8201` is the HTTP based interface. -Port `8202` is a GRPC based interface. Python, R and Javascript clients are designed -to connect to the HTTP interface on `8201`. The `grip` command will often use -port `8202` in order to complete operations. For example if you call `grip list graphs` -it will contact port `8202`, rather then using the HTTP port. This means that if -you are working with a server that is behind a firewall, and only the HTTP port is -available, then the grip command line program will not be able to issue commands, -even if the server is visible to client libraries. +By default the GRIP server operates on 2 ports, `8201` is the HTTP based interface. Port `8202` is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on `8201`. The `grip` command will often use port `8202` in order to complete operations. For example if you call `grip list graphs` it will contact port `8202`, rather then using the HTTP port. This means that if you are working with a server that is behind a firewall, and only the HTTP port is available, then the grip command line program will not be able to issue commands, even if the server is visible to client libraries. + +## CLI Usage +The `server` command can take several flags for configuration: +- `--config` or `-c` - Specifies a YAML config file with server settings. This overwrites all other settings. Defaults to "" (empty string). +- `--http-port` - Sets the port used by the HTTP interface. Defaults to "8201". +- `--rpc-port` - Sets the port used by the GRPC interface. Defaults to "8202". +- `--read-only` - Start server in read-only mode. Defaults to false. +- `--log-level` or `--log-format` - Set logging level and format, respectively. Defaults are "info" for log level and "text" for format. +- `--log-requests` - Log all requests. Defaults to false. +- `--verbose` - Sets the log level to debug if true. +- `--plugins` or `-p` - Specifies a directory with GRIPPER plugins to load. If not specified, no plugins will be loaded by default. +- `--driver` or `-d` - Specifies the default driver for graph storage. Defaults to "badger". Other possible options are: "pebble", "mongo", "grids", and "sqlite". +- `--endpoint` or `-w` - Load a web endpoint plugin. Use multiple times to load multiple plugins. The format is key=value where key is the plugin name and value is the configuration string for the plugin. +- `--endpoint-config` or `-l` - Configure a loaded web endpoint plugin. Use multiple times to configure multiple plugins. The format is key=value where key is in the form 'pluginname:key' and value is the configuration value for that key. +- `--er` or `-e` - Set GRIPPER source addresses. This flag can be used multiple times to specify multiple addresses. Defaults to an empty map. + +## Examples + +```bash +# Load server with a specific config file +grip server --config /path/to/your_config.yaml + +# Set the HTTP port to 9001 +grip server --http-port 9001 + +# Start in read-only mode +grip server --read-only + +# Enable verbose logging (sets log level to debug) +grip server --verbose + +# Load a web endpoint plugin named 'foo' with configuration string 'config=value' +grip server --endpoint foo=config=value + +# Configure the loaded 'foo' web endpoint plugin, setting its key 'key1' to value 'val1' +grip server --endpoint-config foo:key1=val1 +``` diff --git a/website/content/docs/databases.md b/website/content/docs/databases.md index a674e0275..3ad6b01c4 100644 --- a/website/content/docs/databases.md +++ b/website/content/docs/databases.md @@ -5,3 +5,116 @@ menu: identifier: Databases weight: 20 --- + + +# Embedded Key Value Stores + +GRIP supports storing vertices and edges in a variety of key-value stores including: + + * [Pebble](https://github.com/cockroachdb/pebble) + * [Badger](https://github.com/dgraph-io/badger) + * [BoltDB](https://github.com/boltdb/bolt) + * [LevelDB](https://github.com/syndtr/goleveldb) + +Config: + +```yaml +Default: kv + +Driver: + kv: + Badger: grip.db +``` + +---- + +# MongoDB + +GRIP supports storing vertices and edges in [MongoDB][mongo]. + +Config: + +```yaml +Default: mongo + +Drivers: + mongo: + MongoDB: + URL: "mongodb://localhost:27000" + DBName: "gripdb" + Username: "" + Password: "" + UseCorePipeline: False + BatchSize: 0 +``` + +[mongo]: https://www.mongodb.com/ + +`UseCorePipeline` - Default is to use Mongo pipeline API to do graph traversals. +By enabling `UseCorePipeline`, GRIP will do the traversal logic itself, only using +Mongo for graph storage. + +`BatchSize` - For core engine operations, GRIP dispatches element lookups in +batches to minimize query overhead. If missing from config file (which defaults to 0) +the engine will default to 1000. + +---- + + +# GRIDS + +This is an indevelopment high performance graph storage system. + +Config: + +```yaml +Default: db + +Drivers: + db: + Grids: grip-grids.db + +``` + +---- + +# PostgreSQL + +GRIP supports storing vertices and edges in [PostgreSQL][psql]. + +Config: + +```yaml +Default: psql + +Drivers: + psql: + PSQL: + Host: localhost + Port: 15432 + User: "" + Password: "" + DBName: "grip" + SSLMode: disable +``` + +[psql]: https://www.postgresql.org/ + +--- + +# SQLite + +GRIP supports storing vertices and edges in [SQLite] + +Config: + +```yaml +Default: sqlite + +Drivers: + sqlite: + Sqlite: + DBName: tester/sqliteDB +``` + +[psql]: https://sqlite.org/ diff --git a/website/content/docs/databases/elastic.md b/website/content/docs/databases/elastic.md deleted file mode 100644 index 4996fa1ea..000000000 --- a/website/content/docs/databases/elastic.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: Elasticsearch - -menu: - main: - parent: Databases - weight: 1 ---- - -# Elasticsearch - -GRIP supports storing vertices and edges in [Elasticsearch][elastic]. - -Config: - -```yaml -Default: elastic - -Drivers: - elastic: - Elasticsearch: - URL: "http://localhost:9200" - DBName: "gripdb" - Username: "" - Password: "" -``` - -[elastic]: https://www.elastic.co/ diff --git a/website/content/docs/databases/gripper.md b/website/content/docs/databases/gripper.md deleted file mode 100644 index 04e7351c2..000000000 --- a/website/content/docs/databases/gripper.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -title: GRIPPER - -menu: - main: - parent: Databases - weight: 6 ---- - -# GRIPPER - -GRIP Plugable External Resources are data systems that GRIP can combine together -to create graphs. - -Example: - -```yaml -Drivers: - swapi-driver: - Gripper: - ConfigFile: ./swapi.yaml - Graph: swapi -``` - - -`ConfigFile` - Path to GRIPPER graph map - -`Graph` - Name of the graph for the mapped external resources. diff --git a/website/content/docs/databases/kvstore.md b/website/content/docs/databases/kvstore.md deleted file mode 100644 index 236efd909..000000000 --- a/website/content/docs/databases/kvstore.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: Embedded KV Store - -menu: - main: - parent: Databases - weight: 2 ---- - -# Embedded Key Value Stores - -GRIP supports storing vertices and edges in a variety of key-value stores including: - - * [Badger](https://github.com/dgraph-io/badger) - * [BoltDB](https://github.com/boltdb/bolt) - * [LevelDB](https://github.com/syndtr/goleveldb) - -Config: - -```yaml -Default: kv - -Driver: - kv: - Badger: grip.db -``` diff --git a/website/content/docs/databases/mongo.md b/website/content/docs/databases/mongo.md deleted file mode 100644 index 56f5fdafa..000000000 --- a/website/content/docs/databases/mongo.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: MongoDB - -menu: - main: - parent: Databases - weight: 3 ---- - -# MongoDB - -GRIP supports storing vertices and edges in [MongoDB][mongo]. - -Config: - -```yaml -Default: mongo - -Drivers: - mongo: - MongoDB: - URL: "mongodb://localhost:27000" - DBName: "gripdb" - Username: "" - Password: "" - UseCorePipeline: False - BatchSize: 0 -``` - -[mongo]: https://www.mongodb.com/ - -`UseCorePipeline` - Default is to use Mongo pipeline API to do graph traversals. -By enabling `UseCorePipeline`, GRIP will do the traversal logic itself, only using -Mongo for graph storage. - -`BatchSize` - For core engine operations, GRIP dispatches element lookups in -batches to minimize query overhead. If missing from config file (which defaults to 0) -the engine will default to 1000. diff --git a/website/content/docs/databases/psql.md b/website/content/docs/databases/psql.md deleted file mode 100644 index 7f204c52c..000000000 --- a/website/content/docs/databases/psql.md +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: PostgreSQL - -menu: - main: - parent: Databases - weight: 4 ---- - -# PostgreSQL - -GRIP supports storing vertices and edges in [PostgreSQL][psql]. - -Config: - -```yaml -Default: psql - -Drivers: - psql: - PSQL: - Host: localhost - Port: 15432 - User: "" - Password: "" - DBName: "grip" - SSLMode: disable -``` - -[psql]: https://www.postgresql.org/ diff --git a/website/content/docs/databases/sql.md b/website/content/docs/databases/sql.md deleted file mode 100644 index 3edd8307d..000000000 --- a/website/content/docs/databases/sql.md +++ /dev/null @@ -1,103 +0,0 @@ ---- -title: SQL - -menu: - main: - parent: Databases - weight: 4 ---- - -# Connect to an existing SQL database - -Note: This driver is being superseded by the [GRIPPER engine]({{< ref "../gripper/gripper.md" >}}) - -GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against [PostgreSQL][psql], but should work with -[MySQL][sql] (4.1+) and [MariaDB][maria]. - -Since GRIP uses Go's `database/sql` package, we could (in thoery) support any SQL databases listed on: -https://github.com/golang/go/wiki/SQLDrivers. Open an [issue](https://github.com/bmeg/grip/issues/new) if you -would like to request support for your favorite SQL database. - -## Configuration Notes - -* `DataSourceName` is a driver-specific data source name, usually consisting of at least a database name and connection information. Here are links for -to documentation for this field for each supported driver: - - * PostgreSQL - https://godoc.org/github.com/lib/pq#hdr-Connection_String_Parameters - * MySQL, Mariadb - https://github.com/go-sql-driver/mysql/#dsn-data-source-name - -* `Driver` should be one of: `postgres` or `mysql` (for MySQL or MariaDB). - -* `Graphs` is a list of graphs you want to define using the existing tables in the database. For each entry: - - * `Graph` is the name of the graph you want to define - * `Vertices` is a list of entries, each of which binds a table to a vertex `label` and defines which field in the table to use as the `gid`. - The remaining columns in the table are treated as the `data` associated with the vertex. - * `Edges` is a list of entries. Edge entries may be associate an edge `label` with a table, but they are not required to. - See below for examples of both types of edge definitions. - -## Example - -Given the following example database: https://github.com/bmeg/grip/blob/master/test/resources/postgres_smtest_data.dump - -Load this dump file into your own postgres instance by running: - -```bash -createdb --host localhost --port 15432 -U postgres smtest -psql --host localhost --port 15432 -U postgres smtest < postgres_smtest_data.dump -``` - -GRIP Configuration: - -```yaml - -Drivers: - esql: - ExistingSQL: - DataSourceName: "host=localhost port=15432 user=postgres dbname=smtest sslmode=disable" - Driver: postgres - - Graphs: - - Graph: test-graph - Vertices: - - Table: users - Label: users - GidField: id - - - Table: products - Label: products - GidField: id - - - Table: purchases - Label: purchases - GidField: id - - Edges: - - Table: purchase_items - Label: purchasedProducts - GidField: id - From: - SourceField: purchase_id - DestTable: purchases - DestField: id - To: - SourceField: product_id - DestTable: products - DestField: id - - - Table: "" - Label: userPurchases - GidField: "" - From: - SourceField: "" - DestTable: users - DestField: id - To: - SourceField: "" - DestTable: purchases - DestField: user_id -``` - -[psql]: https://www.postgresql.org/ -[sql]: https://www.mysql.com/ -[maria]: https://mariadb.org/ diff --git a/website/content/docs/developer/architecture.d2 b/website/content/docs/developer/architecture.d2 new file mode 100644 index 000000000..ecbd726e9 --- /dev/null +++ b/website/content/docs/developer/architecture.d2 @@ -0,0 +1,90 @@ + + +gripql-python: "gripql/python" { + text: |md +# gripql + +Python library +| +} + +gripql-python -> gripql.http + +grip-client : "cmd/" { + graph { + create + drop + stream + list + schema + } + + data { + kvload + load + dump + mongoload + query + delete + } + + config { + mapping + plugin + info + } + + jobs { + job + } +} + +grip-client -> gripql.grpc + +gripql : "gripql/" { + + text: |md +Protobuf defined code +| + grpc + grpc-gateway + + http -> grpc-gateway + grpc-gateway -> grpc : protobuf via network + + http -> grpc-dgw +} + + +gripql.grpc -> server +gripql.grpc-dgw -> server + +server : "server/" { + +} + +server -> pipeline + +pipeline { + gripql-parser + compiler +} + +gdbi { + mongo + mongo-core + pebble +} + +pipeline.compiler -> gdbi + +server -> jobs + +jobs { + store + search + drivers : { + opensearch + flat file + } +} \ No newline at end of file diff --git a/website/content/docs/graphql/graph_schemas.md b/website/content/docs/graphql/graph_schemas.md index 620444dbc..f68bff474 100644 --- a/website/content/docs/graphql/graph_schemas.md +++ b/website/content/docs/graphql/graph_schemas.md @@ -7,6 +7,7 @@ menu: --- # Graph Schemas + Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it's API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. @@ -19,73 +20,18 @@ The schema of a graph can be accessed via a GET request to `/v1/graph/{graph-nam Alternatively, you can use the grip CLI. `grip schema get {graph-name}` -## Describing Graph Schemas -There are several methods for describing the schema of a graph. +## Post a graph schema -- Provide the schema (as a YAML file) to the server at runtime. `grip server --schema {schema-file}` -- POST the schema `/v1/graph/{graph-name}/schema` via curl or use the CLI. `grip schema post --yaml {file} --json {file}` -- Configure GRIP to build the schema by sampling the data in each graph. +A schema can be attached to an existing graph via a POST request to `/v1/graph/{graph-name}/schema` -```yaml -Server: - # Should the server periodically build the graph schemas? - AutoBuildSchemas: true - # How often the server should rebuild the graph schemas. Set to 0 to turn off - SchemaRefreshInterval: "24h" - # How many vertices/edges to inspect to infer the schema - SchemaInspectN: 500 - # Strategy to use for selecting the vertices/edges to inspect. - # Random if True; first N otherwise - SchemaRandomSample: true -``` +Alternatively, you can use the grip CLI. `grip schema post [graph_name] --jsonSchema {file}` -## Example schema +Schemas must be loaded as a json file in JSON schema format. see [jsonschema](https://json-schema.org/) spec for more details - ```yaml - graph: example-graph +## Raw bulk loading - edges: -- data: {} - from: Human - gid: (Human)--starship->(Starship) - label: starship - to: Starship -- data: {} - from: Human - gid: (Human)--friend->(Human) - label: friend - to: Human -- data: {} - from: Human - gid: (Human)--friend->(Droid) - label: friend - to: Droid -- data: {} - from: Human - gid: (Human)--appearsIn->(Movie) - label: appearsIn - to: Movie +Once a schema is attached to a graph, raw json records can be loaded directly to grip without having to be in native grip vertex/edge format. +Schema validation is enforced when using this POST `/v1/rawJson` method. -vertices: -- data: - name: STRING - gid: Movie - label: Movie -- data: - length: NUMERIC - name: STRING - gid: Starship - label: Starship -- data: - name: STRING - primaryFunction: STRING - gid: Droid - label: Droid -- data: - height: NUMERIC - homePlanet: STRING - mass: NUMERIC - name: STRING - gid: Human - label: Human - ``` +A grip CLI alternative is also available with `grip jsonload [ndjson_file_path] [graph_name]` +See https://github.com/bmeg/grip/blob/develop/conformance/tests/ot_bulk_raw.py for a full example using gripql python package. diff --git a/website/content/docs/graphql/graphql.md b/website/content/docs/graphql/graphql.md index 05363b8a1..1de2f34cd 100644 --- a/website/content/docs/graphql/graphql.md +++ b/website/content/docs/graphql/graphql.md @@ -8,65 +8,22 @@ menu: # GraphQL -**GraphQL support is considered Alpha. The code is not stable and the API will likely change.** -**_GraphQL access is only supported when using the MongoDB driver_** +Grip graphql tools are defined as go standard library plugins and are located at https://github.com/bmeg/grip-graphql. +A schema based approach was used for defining read plugins. -GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph. +## Json Schema - -### Load built-in example graph - -Loading the example data and the example schema: - -``` -grip load example-graph -``` - -See the example graph - -``` -grip dump example-graph --vertex --edge -``` - -Sample components of the graph to produce a schema and store to a file -``` -grip schema sample example-graph > test.schema -``` - -You may want to edit the schema, but if it seems correct, post it to the server: - -``` -./grip schema post --json test.schema -``` - -See the graph schema +grip also supports using jsonschema with hypermedia extensions. Given an existing graph called TEST ``` -grip schema get example-graph +./grip schema post TEST --jsonSchema schema.json ``` -### Example queries - -Get Types: - -``` -curl -X POST -H "Content-Type:application/graphql" -d '{__schema{types{name}}}' http://localhost:8201/graphql/example-graph -``` +This schema will attach to the TEST graph, and subsequent calls to the bulkAddRaw method with raw Json +as defined by the attached the jsonschema will load directly into grip. -Get Info about Human object +see conformance/tests/ot_bulk_raw.py for an example -``` -curl -X POST -H "Content-Type:application/graphql" -d '{__type(name:"Human"){fields{name}}}' http://localhost:8201/graphql/example-graph -``` +## Future work -Get List of all Human ids - -``` -curl -X POST -H "Content-Type:application/graphql" -d 'query {Human{id}}' http://localhost:8201/graphql/example-graph -``` - -Get Human 1000 and list their friends - -``` -curl -X POST -H "Content-Type:application/graphql" -d 'query {Human(id:"1000"){name,friend_to_Human{name}}}' http://localhost:8201/graphql/example-graph -``` +In the future, autogenerated json schema may be added back to grip to continue to support graphql queries. Currently there is not support for graphql in base Grip without using the plugin repos specified above. diff --git a/website/content/docs/gripper.md b/website/content/docs/gripper.md index 2daf03e1c..40a181f05 100644 --- a/website/content/docs/gripper.md +++ b/website/content/docs/gripper.md @@ -3,5 +3,5 @@ title: GRIP Plugable External Resources menu: main: identifier: gripper - weight: 30 + weight: 120 --- diff --git a/website/content/docs/gripper/graphmodel.md b/website/content/docs/gripper/graphmodel.md index fffeae951..cd678cf4a 100644 --- a/website/content/docs/gripper/graphmodel.md +++ b/website/content/docs/gripper/graphmodel.md @@ -13,14 +13,14 @@ GRIP Plugable External Resources ## Graph Model -The graph model describes how GRIP will access multiple gripper servers. The mapping -of these data resources is done using a graph. The `vertices` represent how each vertex -type will be mapped, and the `edges` describe how edges will be created. The `gid` -of each vertex represents the prefix domain of all vertices that can be found in that -source. - -The `sources` referenced by the graph are provided to GRIP at run time, each named resource is a -different GRIPPER plugin that abstracts an external resource. +The graph model describes how GRIP will access multiple gripper servers. The mapping +of these data resources is done using a graph. The `vertices` represent how each vertex +type will be mapped, and the `edges` describe how edges will be created. The `_id` +of each vertex represents the prefix domain of all vertices that can be found in that +source. + +The `sources` referenced by the graph are provided to GRIP at run time, each named resource is a +different GRIPPER plugin that abstracts an external resource. The `vertices` section describes how different collections found in these sources will be turned into Vertex found in the graph. Finally, the `edges` section describes the different kinds of rules that can be used build the @@ -35,14 +35,16 @@ two other collections that have been mapped to vertices. ## Runtime External Resource Config External resources are passed to GRIP as command line options. For the command line: + ``` grip server config.yaml --er tableServer=localhost:50051 --er pfb=localhost:50052 ``` -`tableServer` is a ER plugin that serves table data (see `gripper/test-graph`) +`tableServer` is a ER plugin that serves table data (see `gripper/test-graph`) while `pfb` parses PFB based files (see https://github.com/bmeg/grip_pfb ) -The `config.yaml` is +The `config.yaml` is + ``` Default: badger @@ -57,220 +59,197 @@ Drivers: ``` -This runs with a default `badger` based driver, but also provides a GRIPPER based +This runs with a default `badger` based driver, but also provides a GRIPPER based graph from the `swapi` mapping (see example graph map below). - ## Example graph map ``` vertices: - - gid: "Character:" - label: Character - data: - source: tableServer - collection: Character + - _id: "Character:" + _label: Character + source: tableServer + collection: Character + + - _id: "Planet:" + _label: Planet + collection: Planet + source: tableServer + + - _id: "Film:" + _label: Film + collection: Film + source: tableServer + + - _id: "Species:" + _label: Species + source: tableServer + collection: Species + + - _id: "Starship:" + _label: Starship + source: tableServer + collection: Starship + + - _id: "Vehicle:" + _label: Vehicle + source: tableServer + collection: Vehicle - - gid: "Planet:" - label: Planet - data: - collection: Planet +edges: + - _id: "homeworld" + _from: "Character:" + _to: "Planet:" + _label: homeworld + fieldToField: + fromField: $.homeworld + toField: $.id + + - _id: species + _from: "Character:" + _to: "Species:" + _label: species + fieldToField: + fromField: $.species + toField: $.id + + - _id: people + _from: "Species:" + _to: "Character:" + _label: people + edgeTable: source: tableServer - - - gid: "Film:" - label: Film - data: - collection: Film + collection: speciesCharacter + fromField: $.from + toField: $.to + + - _id: residents + _from: "Planet:" + _to: "Character:" + _label: residents + edgeTable: source: tableServer - - - gid: "Species:" - label: Species - data: + collection: planetCharacter + fromField: $.from + toField: $.to + + - _id: filmVehicles + _from: "Film:" + _to: "Vehicle:" + _label: "vehicles" + edgeTable: source: tableServer - collection: Species - - - gid: "Starship:" - label: Starship - data: + collection: filmVehicles + fromField: "$.from" + toField: "$.to" + + - _id: vehicleFilms + _to: "Film:" + _from: "Vehicle:" + _label: "films" + edgeTable: source: tableServer - collection: Starship - - - gid: "Vehicle:" - label: Vehicle - data: + collection: filmVehicles + toField: "$.from" + fromField: "$.to" + + - _id: filmStarships + _from: "Film:" + _to: "Starship:" + _label: "starships" + edgeTable: source: tableServer - collection: Vehicle - -edges: - - gid: "homeworld" - from: "Character:" - to: "Planet:" - label: homeworld - data: - fieldToField: - fromField: $.homeworld - toField: $.id - - - gid: species - from: "Character:" - to: "Species:" - label: species - data: - fieldToField: - fromField: $.species - toField: $.id - - - gid: people - from: "Species:" - to: "Character:" - label: people - data: - edgeTable: - source: tableServer - collection: speciesCharacter - fromField: $.from - toField: $.to - - - gid: residents - from: "Planet:" - to: "Character:" - label: residents - data: - edgeTable: - source: tableServer - collection: planetCharacter - fromField: $.from - toField: $.to - - - gid: filmVehicles - from: "Film:" - to: "Vehicle:" - label: "vehicles" - data: - edgeTable: - source: tableServer - collection: filmVehicles - fromField: "$.from" - toField: "$.to" - - - gid: vehicleFilms - to: "Film:" - from: "Vehicle:" - label: "films" - data: - edgeTable: - source: tableServer - collection: filmVehicles - toField: "$.from" - fromField: "$.to" - - - gid: filmStarships - from: "Film:" - to: "Starship:" - label: "starships" - data: - edgeTable: - source: tableServer - collection: filmStarships - fromField: "$.from" - toField: "$.to" - - - gid: starshipFilms - to: "Film:" - from: "Starship:" - label: "films" - data: - edgeTable: - source: tableServer - collection: filmStarships - toField: "$.from" - fromField: "$.to" - - - gid: filmPlanets - from: "Film:" - to: "Planet:" - label: "planets" - data: - edgeTable: - source: tableServer - collection: filmPlanets - fromField: "$.from" - toField: "$.to" - - - gid: planetFilms - to: "Film:" - from: "Planet:" - label: "films" - data: - edgeTable: - source: tableServer - collection: filmPlanets - toField: "$.from" - fromField: "$.to" - - - gid: filmSpecies - from: "Film:" - to: "Species:" - label: "species" - data: - edgeTable: - source: tableServer - collection: filmSpecies - fromField: "$.from" - toField: "$.to" - - - gid: speciesFilms - to: "Film:" - from: "Species:" - label: "films" - data: - edgeTable: - source: tableServer - collection: filmSpecies - toField: "$.from" - fromField: "$.to" - - - gid: filmCharacters - from: "Film:" - to: "Character:" - label: characters - data: - edgeTable: - source: tableServer - collection: filmCharacters - fromField: "$.from" - toField: "$.to" - - - gid: characterFilms - from: "Character:" - to: "Film:" - label: films - data: - edgeTable: - source: tableServer - collection: filmCharacters - toField: "$.from" - fromField: "$.to" - - - gid: characterStarships - from: "Character:" - to: "Starship:" - label: "starships" - data: - edgeTable: - source: tableServer - collection: characterStarships - fromField: "$.from" - toField: "$.to" - - - gid: starshipCharacters - to: "Character:" - from: "Starship:" - label: "pilots" - data: - edgeTable: - source: tableServer - collection: characterStarships - toField: "$.from" - fromField: "$.to" + collection: filmStarships + fromField: "$.from" + toField: "$.to" + + - _id: starshipFilms + _to: "Film:" + _from: "Starship:" + _label: "films" + edgeTable: + source: tableServer + collection: filmStarships + toField: "$.from" + fromField: "$.to" + + - _id: filmPlanets + _from: "Film:" + _to: "Planet:" + _label: "planets" + edgeTable: + source: tableServer + collection: filmPlanets + fromField: "$.from" + toField: "$.to" + + - _id: planetFilms + _to: "Film:" + _from: "Planet:" + _label: "films" + edgeTable: + source: tableServer + collection: filmPlanets + toField: "$.from" + fromField: "$.to" + + - _id: filmSpecies + _from: "Film:" + _to: "Species:" + _label: "species" + edgeTable: + source: tableServer + collection: filmSpecies + fromField: "$.from" + toField: "$.to" + + - _id: speciesFilms + _to: "Film:" + _from: "Species:" + _label: "films" + edgeTable: + source: tableServer + collection: filmSpecies + toField: "$.from" + fromField: "$.to" + + - _id: filmCharacters + _from: "Film:" + _to: "Character:" + _label: characters + edgeTable: + source: tableServer + collection: filmCharacters + fromField: "$.from" + toField: "$.to" + + - _id: characterFilms + _from: "Character:" + _to: "Film:" + _label: films + edgeTable: + source: tableServer + collection: filmCharacters + toField: "$.from" + fromField: "$.to" + + - _id: characterStarships + _from: "Character:" + _to: "Starship:" + _label: "starships" + edgeTable: + source: tableServer + collection: characterStarships + fromField: "$.from" + toField: "$.to" + + - _id: starshipCharacters + _to: "Character:" + _from: "Starship:" + _label: "pilots" + edgeTable: + source: tableServer + collection: characterStarships + toField: "$.from" + fromField: "$.to" ``` diff --git a/website/content/docs/queries/jobs_api.md b/website/content/docs/jobs_api.md similarity index 86% rename from website/content/docs/queries/jobs_api.md rename to website/content/docs/jobs_api.md index fe443a89a..7589015a3 100644 --- a/website/content/docs/queries/jobs_api.md +++ b/website/content/docs/jobs_api.md @@ -2,8 +2,8 @@ title: Jobs API menu: main: - parent: Queries - weight: 20 + identifier: Jobs + weight: 40 --- # Jobs API @@ -16,7 +16,7 @@ that will be evaluated asynchronously and can be retrieved at a later time. ### Submitting a job ``` -job = G.query().V().hasLabel("Planet").out().submit() +job = G.V().hasLabel("Planet").out().submit() ``` ### Getting job status @@ -44,10 +44,10 @@ for row in G.readJob(job["id"]): ### Search for jobs -Find jobs that match the prefix of the current request (example should find job from G.query().V().hasLabel("Planet").out()) +Find jobs that match the prefix of the current request (example should find job from G.V().hasLabel("Planet").out()) ``` -jobs = G.query().V().hasLabel("Planet").out().out().count().searchJobs() +jobs = G.V().hasLabel("Planet").out().out().count().searchJobs() ``` If there are multiple jobs that match the prefix of the search, all of them will be returned. It will be a client side diff --git a/website/content/docs/queries/aggregation.md b/website/content/docs/queries/aggregation.md new file mode 100644 index 000000000..0012a811c --- /dev/null +++ b/website/content/docs/queries/aggregation.md @@ -0,0 +1,84 @@ +--- +title: Aggregation +menu: + main: + parent: Queries + weight: 6 +--- + +# Aggregation + +These methods provide a powerful way to analyze and summarize data in your GripQL graph database. They allow you to perform various types of aggregations, including term frequency, histograms, percentiles, and more. By combining these with other traversal functions like `has`, `hasLabel`, etc., you can create complex queries that extract specific insights from your data. + +## `.aggregate([aggregations])` +Groups and summarizes data from the graph. It allows you to perform calculations on vertex or edge properties. The following aggregation types are available: + +## Aggregation Types +### `.gripql.term(name, field, size)` +Return top n terms and their counts for a field. +```python +G.V().hasLabel("Person").aggregate(gripql.term("top-names", "name", 10)) +``` +Counts `name` occurrences across `Person` vertices and returns the 10 most frequent `name` values. + +### `.gripql.histogram(name, field, interval)` +Return binned counts for a field. +```python +G.V().hasLabel("Person").aggregate(gripql.histogram("age-hist", "age", 5)) +``` +Creates a histogram of `age` values with bins of width 5 across `Person` vertices. + +### `.gripql.percentile(name, field, percents=[])` +Return percentiles for a field. +```python +G.V().hasLabel("Person").aggregate(gripql.percentile("age-percentiles", "age", [25, 50, 75])) +``` +Calculates the 25th, 50th, and 75th percentiles for `age` values across `Person` vertices. + +### `.gripql.field("fields", "$")` +Returns all of the fields found in the data structure. Use `$` to get a listing of all fields found at the root level of the `data` property of vertices or edges. + +--- + +## `.count()` +Returns the total number of elements in the traversal. +```python +G.V().hasLabel("Person").count() +``` +This query returns the total number of vertices with the label "Person". + +--- + +## `.distinct([fields])` +Filters the traversal to return only unique elements. If `fields` are provided, uniqueness is determined by the combination of values in those fields; otherwise, the `_id` is used. +```python +G.V().hasLabel("Person").distinct(["name", "age"]) +``` +This query returns only unique "Person" vertices, where uniqueness is determined by the combination of "name" and "age" values. + +--- + +## `.sort([fields])` +Sort the output using the field values. You can sort in ascending or descending order by providing `descending=True` as an argument to `sort()` method. +```python +G.V().hasLabel("Person").sort("age") +``` +This query sorts "Person" vertices based on their age in ascending order. + +## `.limit(n)` +Limits the number of results returned by your query. +```python +G.V().hasLabel("Person").limit(10) +``` +This query limits the results to the first 10 "Person" vertices found. + +--- + +## `.skip(n)` +Offsets the results returned by your query. +```python +G.V().hasLabel("Person").skip(5) +``` +This query skips the first 5 "Person" vertices and returns the rest. + + diff --git a/website/content/docs/queries/filtering.md b/website/content/docs/queries/filtering.md new file mode 100644 index 000000000..2baac7014 --- /dev/null +++ b/website/content/docs/queries/filtering.md @@ -0,0 +1,151 @@ +--- +title: Filtering +menu: + main: + parent: Queries + weight: 4 +--- + +# Filtering in GripQL + +GripQL provides powerful filtering capabilities using the .has() method and various condition functions. +Here's a comprehensive guide:.has()The .has() method is used to filter elements (vertices or edges) based on specified conditions. + +Conditions are functions provided by the gripql module that define the filtering criteria. + +## Comparison Operators + +### `gripql.eq(variable, value)` +Equal to (==) + +``` +G.V().has(gripql.eq("symbol", "TP53")) +# Returns vertices where the 'symbol' property is equal to 'TP53'. +``` + +### `gripql.neq(variable, value)` +Not equal to (!=) + +``` +G.V().has(gripql.neq("symbol", "TP53")) +# Returns vertices where the 'symbol' property is not equal to 'TP53'. +``` + +### `gripql.gt(variable, value)` +Greater than (>) + +``` +G.V().has(gripql.gt("age", 45)) +# Returns vertices where the 'age' property is greater than 45. +``` + +### `gripql.lt(variable, value)` +Less than (<) +``` +G.V().has(gripql.lt("age", 45)) +# Returns vertices where the 'age' property is less than 45. +``` + +### `gripql.gte(variable, value)` +Greater than or equal to (>=) +``` +G.V().has(gripql.gte("age", 45)) +# Returns vertices where the 'age' property is greater than or equal to 45. +``` + +### `gripql.lte(variable, value)` +Less than or equal to (<=) + +``` +G.V().has(gripql.lte("age", 45)) +# Returns vertices where the 'age' property is less than or equal to 45. +``` + +--- + +## Range Operators + +### `gripql.inside(variable, [lower_bound, upper_bound])` +lower_bound < variable < upper_bound (exclusive) + +``` +G.V().has(gripql.inside("age", [30, 45])) +# Returns vertices where the 'age' property is greater than 30 and less than 45. +``` + +### `gripql.outside(variable, [lower_bound, upper_bound])` +variable < lower_bound OR variable > upper_bound + +``` +G.V().has(gripql.outside("age", [30, 45])) +# Returns vertices where the 'age' property is less than 30 or greater than 45. +``` + +### `gripql.between(variable, [lower_bound, upper_bound])` +lower_bound <= variable < upper_bound + +``` +G.V().has(gripql.between("age", [30, 45])) +# Returns vertices where the 'age' property is greater than or equal to 30 and less than 45. +``` + +--- + +## Set Membership Operators + +### `gripql.within(variable, values)` +variable is in values + +``` +G.V().has(gripql.within("symbol", ["TP53", "BRCA1"])) +# Returns vertices where the 'symbol' property is either 'TP53' or 'BRCA1'. +``` + +### `gripql.without(variable, values)` +variable is not in values + +``` +G.V().has(gripql.without("symbol", ["TP53", "BRCA1"])) +# Returns vertices where the 'symbol' property is neither 'TP53' nor 'BRCA1'. +``` + +--- + +## String/Array Containment + +### `gripql.contains(variable, value)` +The variable (which is typically a list/array) contains value. + +``` +G.V().has(gripql.contains("groups", "group1")) +# Returns vertices where the 'groups' property (which is a list) contains the value "group1". +# Example: {"groups": ["group1", "group2", "group3"]} would match. +``` + +--- + +## Logical Operators + +### `gripql.and_([condition1, condition2, ...])` +Logical AND; all conditions must be true. + +``` +G.V().has(gripql.and_([gripql.lte("age", 45), gripql.gte("age", 35)])) +# Returns vertices where the 'age' property is less than or equal to 45 AND greater than or equal to 35. +``` + +### `gripql.or_([condition1, condition2, ...])` +Logical OR; at least one condition must be true. + +``` +G.V().has(gripql.or_([gripql.eq("symbol", "TP53"), gripql.eq("symbol", "BRCA1")])) +# Returns vertices where the 'symbol' property is either 'TP53' OR 'BRCA1'. +``` + +### `gripql.not_(condition)` +Logical NOT; negates the condition + +``` +G.V().has(gripql.not_(gripql.eq("symbol", "TP53"))) +# Returns vertices where the 'symbol' property is NOT equal to 'TP53'. +``` diff --git a/website/content/docs/queries/iterations.md b/website/content/docs/queries/iterations.md index 5d913b6dd..5af26c9fe 100644 --- a/website/content/docs/queries/iterations.md +++ b/website/content/docs/queries/iterations.md @@ -3,50 +3,59 @@ title: Iteration menu: main: parent: Queries - weight: 10 + weight: 16 --- -# Iteration API +# Iteration Commands -A common operation in graph search is the ability to iterative repeat a search pattern. -For example, a 'friend of a friend' search may become a 'friend of a friend of a friend' search. +A common operation in graph search is the ability to iteratively repeat a search pattern. For example, a 'friend of a friend' search may become a 'friend of a friend of a friend' search. In the GripQL language cycles, iterations and conditional operations are encoded using 'mark' and 'jump' based interface. This operation is similar to using a 'goto' statement in traditional programming languages. While more primitive than the repeat mechanisms seen in Gremlin, this pattern allows for much simpler query compilation and implementation. -In the GripQL language cycles, iterations and conditional operations are encoded using -'mark' and 'jump' based interface. This operations are similar to using a 'goto' -statement in a traditional programming language. While more primitive than the -repeat mechanisms seen in Gremlin, this pattern allows for a much more simple -query compilation and implementation. - -Because the mark and jump pattern can be abused for denial of service attacks, -ie to create infinite loops, the authorization model will allow this particular set -of operations to be turned off for some accounts. This means that queries from -unauthorized users that utilize the 'mark' or 'jump' commands will be rejected -by the server without execution. One additional proposed security feature, that -is being discussed for in future upgrades, will allow the server to -track the total number of iterations a traveler has made in a cycle, and provide a -hard cutoff. For example, a user could submit code with a maximum of 5 iterations. +However, due to security concerns regarding potential denial of service attacks that could be created with the use of 'mark' and 'jump', these operations are restricted in most accounts. This is enforced by the server rejecting any queries from unauthorized users that utilize these commands without execution. In future upgrades, a proposed security feature will also allow the server to track the total number of iterations a traveler has made in a cycle and provide a hard cutoff. For example, a user could submit code with a maximum of 5 iterations. ## Operation Commands -### mark(name) -Mark a segment in the stream processor, with a name, that can receive jumps +### `.mark(name)` +Mark a segment in the stream processor, with a name, that can receive jumps. This command is used to label sections of the query operation list that can accept travelers from the `jump` command. + +**Parameters:** +- `name` (str): The name given to the marked segment. ### jump(dest, condition, emit) -If a condition is true, send traveler to mark. If emit is true, also send a -copy down the processing chain. If condition is None, always do the jump. +If a condition is true, send traveler to mark. If `emit` is True, also send a copy down the processing chain. If `condition` is None, always do the jump. This command is used to move travelers from one marked segment to another based on a specified condition. +**Parameters:** +- `dest` (str): The name of the destination mark segment. Travelers are moved to this point when their position matches the `condition` parameter. +- `condition` (_expr_ or None): An expression that determines if the traveler should jump. If it evaluates to True, the traveler jumps to the specified destination. If None, the traveler always jumps to the specified destination. +- `emit` (bool): Determines whether a copy of the traveler is emitted down the processing chain after jumping. If False, only the original traveler is processed. -### set(field, value) -Set values within the travelers memory. These values be used to store cycle counts +### `.set(field, value)` +Set values within the traveler's memory. These values can be used to store cycle counts. This command sets a field in the traveler's memory to a specified value. -### increment(field, value) -Increment field, ie `data[field] = data[field] + value`. Can be used to increment counter every cycle +**Parameters:** +- `field` (str): The name of the field to set. +- `value` (_expr_): The value to set for the specified field. This can be any valid GripQL expression that resolves to a scalar value. +### `.increment(field, value)` +Increment a field by a specified value. This command increments a field in the traveler's memory by a specified amount. -## Example queries +**Parameters:** +- `field` (str): The name of the field to increment. +- `value` (_expr_): The amount to increment the specified field by. This can be any valid GripQL expression that resolves to an integer value. -``` -q = G.query().V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") +## Example Queries +The following examples demonstrate how to use these commands in a query: + +```python +q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") q = q.has(gripql.lt("$start.count", 2)) q = q.jump("a", None, True) ``` +This query starts from a vertex with the ID "Character:1". It sets a field named "count" to 0 and annotates this vertex as "start". Then it marks this position in the operation list for future reference. The `out` command moves travelers to the outgoing edges of their current positions, incrementing the "count" field each time. If the count is less than 2, the traveler jumps back to the marked location, effectively creating a loop. + +```python +q = G.V("Character:1").set("count", 0).as_("start").mark("a").out().increment("$start.count") +q = q.has(gripql.lt("$start.count", 2)) +q = q.jump("a", None, False) +``` +This query is similar to the previous one, but in this case, the traveler only jumps back without emitting a copy down the processing chain. The result is that only one vertex will be included in the output, even though there are multiple iterations due to the jump command. +In both examples, the use of `mark` and `jump` commands create an iterative pattern within the query operation list, effectively creating a 'friend of a friend' search that can repeat as many times as desired. These patterns are crucial for complex graph traversals in GripQL. diff --git a/website/content/docs/queries/jobs.md b/website/content/docs/queries/jobs.md new file mode 100644 index 000000000..49e132f74 --- /dev/null +++ b/website/content/docs/queries/jobs.md @@ -0,0 +1,26 @@ + + + +## .submit() +Post the traversal as an asynchronous job and get a job ID. + +Example: Submit a query to be processed in the background + +```python +job_id = G.V('vertexID').hasLabel('Vertex').submit() +print(job_id) # print job ID +``` +--- + +## .searchJobs() +Find jobs that match this query and get their status and results if available. + +Example: Search for jobs with the specified query and print their statuses and results + +```python +for result in G.V('vertexID').hasLabel('Vertex').searchJobs(): + print(result['status']) # print job status + if 'results' in result: + print(result['results']) # print job results +``` +--- diff --git a/website/content/docs/queries/jsonpath.md b/website/content/docs/queries/jsonpath.md index 52dd09af5..2f2651198 100644 --- a/website/content/docs/queries/jsonpath.md +++ b/website/content/docs/queries/jsonpath.md @@ -3,7 +3,7 @@ title: Referencing Fields menu: main: parent: Queries - weight: 5 + weight: 2 --- # Referencing Vertex/Edge Properties @@ -14,46 +14,42 @@ GRIP uses a variation on JSONPath syntax as described in http://goessner.net/art The following query: ``` -O.query().V(["ENSG00000012048"]).as_("gene").out("variant") +O.V(["ENSG00000012048"]).as_("gene").out("variant") ``` Starts at vertex `ENSG00000012048` and marks as `gene`: -``` +```json { - "gid": "ENSG00000012048", - "label": "gene", - "data": { - "symbol": { - "ensembl": "ENSG00000012048", - "hgnc": 1100, - "entrez": 672, - "hugo": "BRCA1" - } - "transcipts": ["ENST00000471181.7", "ENST00000357654.8", "ENST00000493795.5"] - } + "_id": "ENSG00000012048", + "_label": "gene", + "symbol": { + "ensembl": "ENSG00000012048", + "hgnc": 1100, + "entrez": 672, + "hugo": "BRCA1" + }, + "transcipts": ["ENST00000471181.7", "ENST00000357654.8", "ENST00000493795.5"] } ``` as "gene" and traverses the graph to: -``` +```json { - "gid": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG", - "label": "variant", - "data": { - "type": "deletion" - "publications": [ - { - "pmid": 29480828, - "doi": "10.1097/MD.0000000000009380" - }, - { - "pmid": 23666017, - "doi": "10.1097/IGC.0b013e31829527bd" - } - ] - } + "_id": "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG", + "_label": "variant", + "type": "deletion", + "publications": [ + { + "pmid": 29480828, + "doi": "10.1097/MD.0000000000009380" + }, + { + "pmid": 23666017, + "doi": "10.1097/IGC.0b013e31829527bd" + } + ] } ``` @@ -61,9 +57,8 @@ Below is a table of field and the values they would reference in subsequent trav | jsonpath | result | | :------------------------- | :------------------- | -| _gid | "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG" | +| _id | "NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG" | | _label | "variant" | -| _data.type | "deletion" | | type | "deletion" | | publications[0].pmid | 29480828 | | publications[:].pmid | [29480828, 23666017] | @@ -75,7 +70,7 @@ Below is a table of field and the values they would reference in subsequent trav ## Usage Example: ``` -O.query().V(["ENSG00000012048"]).as_("gene").out("variant").render({"variant_id": "_gid", "variant_type": "type", "gene_id": "$gene._gid"}) +O.V(["ENSG00000012048"]).as_("gene").out("variant").render({"variant_id": "_id", "variant_type": "type", "gene_id": "$gene._id"}) ``` returns diff --git a/website/content/docs/queries/operations.md b/website/content/docs/queries/operations.md deleted file mode 100644 index 2f36d84c6..000000000 --- a/website/content/docs/queries/operations.md +++ /dev/null @@ -1,260 +0,0 @@ ---- -title: Operations -menu: - main: - parent: Queries - weight: -5 ---- - - -# Start a Traversal -## .V([ids]) -Start query from Vertex - -```python -G.query().V() -``` -Returns all vertices in graph - -```python -G.query().V(["vertex1]") -``` -Returns: -```json -{"gid" : "vertex1", "label":"TestVertex", "data":{}} -``` - -## .E([ids]) -Start query from Edge - -```python -G.query().E() -``` -Returns all edges in graph - -```python -G.query().E(["edge1"]) -``` -Returns: -```json -{"gid" : "edge1", "label":"TestEdge", From: "vertex1", To: "vertex2", data":{}} -``` - - -# Traverse the graph -## .in_(), inV() -Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges. - -## .out(), .outV() -Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges. - -## .both(), .bothV() -Following all edges (both in and out). Optional argument is the edge label (or list of labels) that should be followed. - -## .inE() -Following incoming edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` - -## .outE() -Following outgoing edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` - -## .bothE() -Following all edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` - - -# Filtering -## .has() -Filter elements using conditional statements - -```python -G.query().V().has(gripql.eq("_label", "Gene")).has(gripql.eq("symbol", "TP53")) -``` - -## Conditions -Conditions are arguments to `.has()` that define selection conditions - -### gripql.eq(variable, value) -Returns rows where variable == value -```python -.has(gripql.eq("symbol", "TP53")) -``` - -### gripql.neq(variable, value) -Returns rows where variable != value -```python -.has(gripql.neq("symbol", "TP53")) -``` - -### gripql.gt(variable, value) -Returns rows where variable > value -```python -.has(gripql.gt("age", 45)) -``` - -### gripql.lt(variable, value) -Returns rows where variable < value -```python -.has(gripql.lt("age", 45)) -``` - -### gripql.gte(variable, value) -Returns rows where variable >= value -```python -.has(gripql.gte("age", 45)) -``` - -### gripql.lte(variable, value) -Returns rows where variable <= value -```python -.has(gripql.lte("age", 45)) -``` - - -### gripql.inside(variable, [lower_bound, upper_bound]) -Returns rows where variable > lower_bound && variable < upper_bound -```python -.has(gripql.inside("age", [30, 45])) -``` - - -### gripql.outside(variable, [lower_bound, upper_bound]) -Returns rows where variable < lower_bound || variable > upper_bound -```python -.has(gripql.outside("age", [30, 45])) -``` - - -### gripql.between(variable, [lower_bound, upper_bound]) -Returns rows where variable >= lower_bound && variable < upper_bound -```python -.has(gripql.between("age", [30, 45])) -``` - - -### gripql.within(variable, value) -Returns rows where variable is within provided values -```python -.has(gripql.within("symbol", ["TP53", "BRCA1"])) -``` - -### gripql.without(variable, value) -Returns rows where variable is not within provided values -```python -.has(gripql.within("symbol", ["TP53", "BRCA1"])) -``` - -### gripql.contains(variable, value) -Returns rows where variable contains value -```python -.has(gripql.in_("groups", "group1")) -``` - -Returns: -``` -{"data" : {"groups" : ["group1", "group2"]}} -``` - -### gripql.and_([conditions]) -```python -.has(gripql.and_( [gripql.lte("age", 45), gripql.gte("age", 35)] )) -``` - -### gripql.or_([conditions]) -```python -.has(gripql.or_( [...] )) -``` - -### gripql.not_(condition) -```python -.has(gripql.not_( [...] )) -``` - -# Output -## .as_(name) -Store current row for future reference -```python -G.query().V().as_("a").out().as_("b") -``` - -## .select([names]) -Output previously marked elements -```python -G.query().V().mark("a").out().mark("b").select(["a", "b"]) -``` - -## .limit(count) -Limit number of total output rows -```python -G.query().V().limit(5) -``` - -## .skip(count) -Start return after offset -```python -G.query().V().skip(5).limit(5) -``` - -## .range(start, stop) -As results are iterated return objects starting with lower index As traversers propagate through the traversal, it is possible to only allow a certain number of them to pass through with range()-step (filter). When the low-end of the range is not met, objects are continued to be iterated. When within the low (inclusive) and high (exclusive) range, traversers are emitted. When above the high range, the traversal breaks out of iteration. Finally, the use of -1 on the high range will emit remaining traversers after the low range begins. -```python -G.query().V().range(5, 15) -``` - - -## .fields([fields]) -Select which vertex/edge fields to return or exlucde. Operation with no arguments exlcudes all properties. -"gid", "label", "from" and "to" are included by default. -```python -O.query().V("vertex1").fields("symbol") # include only symbol property -O.query().V("vertex1").fields("-symbol") # exclude symbol property -O.query().V("vertex1").fields() # exclude all properties -``` - -## .render(template) -Render current selection into arbitrary data structure -```python -G.query().V("vertex1").render() -``` - -## .aggregate([aggregations]) -Aggregate fields in the returned edges/vertices. - -## Aggregation Types -### .gripql.term(name, field, size) -Return top n terms and their counts for a field. -``` -G.query().V().hasLabel("Person").aggregate(gripql.term("top-names", "name", 10)) -``` -Counts `name` occurences across `Person` vertices and returns the 10 most frequent `name` values. - - -### .gripql.histogram(name, field, interval) -Return binned counts for a field. -``` -G.query().V().hasLabel("Person").aggregate(gripql.histogram("age-hist", "age", 5)) -``` -Creates a histogram of `age` values with bins of width 5 across `Person` vertices. - - -### .gripql.percentile(name, field, percents=[]) -Return percentiles for a field. -``` -G.query().V().hasLabel("Person").aggregate(gripql.percentile("age-percentiles", "age", [25,50,75])) -``` -Calculates the 25th, 50th, and 75th percentiles for `age` values across `Person` vertices. - -### .gripql.gripql.field("fields", "$._data")) -Returns all of the fields found in the data structure. Use `$._data` to get a listing -of all fields found at the root level of records. - -### gripql.type(name, field) -Returns the data type of requested field. For the python client, if `field` is not provided, it is copied from `name`. -Current returned types include `NUMERIC`, `STRING` and `UNKNOWN`. If a field is always null, or has multiple types, it will -be returned as `UNKNOWN`. - -## .count() -Return the total count of returned edges/vertices. - - -## .distinct([fields]) -Only return distinct elements. An array of one or more fields may be passed in to define what elements are used to identify uniqueness. If none are -provided, the `gid` is used. diff --git a/website/content/docs/queries/output.md b/website/content/docs/queries/output.md new file mode 100644 index 000000000..964e7766d --- /dev/null +++ b/website/content/docs/queries/output.md @@ -0,0 +1,74 @@ +--- +title: Output Control +menu: + main: + parent: Queries + weight: 10 +--- + +--- + +# Output control + +## `.limit(count)` +Limit number of total output rows +```python +G.V().limit(5) +``` +--- +## `.skip(count)` +Start return after offset + +Example: +```python +G.V().skip(10).limit(5) + +``` +This query skips the first 10 vertices and then returns the next 5. +--- +## `.range(start, stop)` +Selects a subset of the results based on their index. `start` is inclusive, and `stop` is exclusive. +Example: +```python +G.V().range(5, 10) +``` +--- +## `.fields([fields])` +Specifies which fields of a vertex or edge to include or exclude in the output. By default, `_id`, `_label`, `_from`, and `_to` are included. + +If `fields` is empty, all properties are excluded. +If `fields` contains field names, only those properties are included. +If `fields` contains field names prefixed with `-`, those properties are excluded, and all others are included. + +Examples: + +Include only the 'symbol' property: +```python +G.V("vertex1").fields(["symbol"]) +``` + +Exclude the 'symbol' property: +```python +G.V("vertex1").fields(["-symbol"]) +``` +Exclude all properties: +```python +G.V("vertex1").fields([]) +``` + +--- + +## `.render(template)` + +Transforms the current selection into an arbitrary data structure defined by the `template`. The `template` is a string that can include placeholders for vertex/edge properties. + +Example: +```python +G.V("vertex1").render( {"node_info" : {"id": "$._id", "label": "$._label"}, "data" : {"whatToExpect": "$.climate"}} ) +``` + +Assuming `vertex1` has `_id`, `_label`, and `symbol` properties, this would return a JSON object with those fields. + +```json +{"node_info" : {"id" :"Planet:2", "label":"Planet"}, "data":{"whatToExpect":"arid"} } +``` diff --git a/website/content/docs/queries/record_transforms.md b/website/content/docs/queries/record_transforms.md new file mode 100644 index 000000000..bf3d5892e --- /dev/null +++ b/website/content/docs/queries/record_transforms.md @@ -0,0 +1,131 @@ +--- +title: Record Transforms +menu: + main: + parent: Queries + weight: 5 +--- + + +# Record Manipulation + +## `.unwind(fields)` +Expands an array-valued field into multiple rows, one for each element in the array. +Example: + +Graph +```python +{"vertex" : {"_id":"1", "_label":"Thing", "stuff" : ["1", "2", "3"]}} +``` + +Query +```python +G.V("1").unwind("stuff") +``` + +Result +```json +{"_id":"1", "_label":"Thing", "stuff" : "1"} +{"_id":"1", "_label":"Thing", "stuff" : "2"} +{"_id":"1", "_label":"Thing", "stuff" : "3"} +``` + +## `.group({"dest":"field"})` +Collect all travelers that are on the same element while aggregating specific fields + +For the example: +```python +G.V().hasLabel("Planet").as_("planet").out("residents").as_("character").select("planet").group( {"people" : "$character.name"} ) +``` + +All of the travelers that start on the same planet go out to residents, collect them using the `as_` and then returning to the origin + +using the `select` statement. The group statement aggrigates the `name` fields from the character nodes that were visited and collects them + +into a list named `people` that is added to the current planet node. + +Output: +```json +{ + "vertex": { + "_id": "Planet:2", + "_label": "Planet", + "climate": "temperate", + "diameter": 12500, + "gravity": null, + "name": "Alderaan", + "orbital_period": 364, + "people": [ + "Leia Organa", + "Raymus Antilles" + ], + "population": 2000000000, + "rotation_period": 24, + "surface_water": 40, + "system": { + "created": "2014-12-10T11:35:48.479000Z", + "edited": "2014-12-20T20:58:18.420000Z" + }, + "terrain": [ + "grasslands", + "mountains" + ], + "url": "https://swapi.co/api/planets/2/" + } +} +{ + "vertex": { + "_id": "Planet:1", + "_label": "Planet", + "climate": "arid", + "diameter": 10465, + "gravity": null, + "name": "Tatooine", + "orbital_period": 304, + "people": [ + "Luke Skywalker", + "C-3PO", + "Darth Vader", + "Owen Lars", + "Beru Whitesun lars", + "R5-D4", + "Biggs Darklighter" + ], + "population": 200000, + "rotation_period": 23, + "surface_water": 1, + "system": { + "created": "2014-12-09T13:50:49.641000Z", + "edited": "2014-12-21T20:48:04.175778Z" + }, + "terrain": [ + "desert" + ], + "url": "https://swapi.co/api/planets/1/" + } +} +``` + +## `.pivot(id, key, value)` + +Aggregate fields across multiple records into a single record using a pivot operations. A pivot is +an operation where a two column matrix, with one columns for keys and another column for values, is +transformed so that the keys are used to name the columns and the values are put in those columns. + +So the stream of vertices: + +``` +{"_id":"observation_a1", "_label":"Observation", "subject":"Alice", "key":"age", "value":36} +{"_id":"observation_a2", "_label":"Observation", "subject":"Alice", "key":"sex", "value":"Female"} +{"_id":"observation_a3", "_label":"Observation", "subject":"Alice", "key":"blood_pressure", "value":"111/78"} +{"_id":"observation_b1", "_label":"Observation", "subject":"Bob", "key":"age", "value":42} +{"_id":"observation_b2", "_label":"Observation", "subject":"Bob", "key":"sex", "value":"Male"} +{"_id":"observation_b3", "_label":"Observation", "subject":"Bob", "key":"blood_pressure", "value":"120/80"} +``` + +with `.pivot("subject", "key", "value")` will produce: + +``` +{"_id":"Alice", "age":36, "sex":"Female", "blood_pressure":"111/78"} +{"_id":"Bob", "age":42, "sex":"Male", "blood_pressure":"120/80"} +``` diff --git a/website/content/docs/queries/traversal_start.md b/website/content/docs/queries/traversal_start.md new file mode 100644 index 000000000..6a4fd1d45 --- /dev/null +++ b/website/content/docs/queries/traversal_start.md @@ -0,0 +1,30 @@ + +--- +title: Start a Traversal +menu: + main: + parent: Queries + weight: 1 +--- + +# Start a Traversal + +All traversal based queries must start with a `V()` command, starting the travalers on the vertices of the graph. + +## `.V([ids])` +Start query from Vertex + +```python +G.V() +``` + +Returns all vertices in graph + +```python +G.V(["vertex1"]) +``` + +Returns: +```json +{"_id" : "vertex1", "_label":"TestVertex"} +``` diff --git a/website/content/docs/queries/traverse_graph.md b/website/content/docs/queries/traverse_graph.md new file mode 100644 index 000000000..568f27d7a --- /dev/null +++ b/website/content/docs/queries/traverse_graph.md @@ -0,0 +1,76 @@ +--- +title: Traverse the Graph +menu: + main: + parent: Queries + weight: 3 +--- + +# Traverse the graph +To move travelers between different elements of the graph, the traversal commands `in_` and `out` move along the edges, respecting the directionality. The `out` commands follow `_from` to `_to`, while the `in_` command follows `_to` to `_from`. + +## `.in_(), inV()` +Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges. + +```python +G.V().in_(label=['edgeLabel1', 'edgeLabel2']) +``` +--- + +## `.out(), .outV()` +Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges. + +```python +G.V().out(label='edgeLabel') +``` +--- + +## `.both(), .bothV()` +Following all edges (both in and out). Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all edges. + +```python +G.V().outE().both(label='edgeLabel') +``` +--- + +## `.inE()` +Following incoming edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` + +```python +G.V().inE(label='edgeLabel') +``` +--- + +## `.outE()` +Following outgoing edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` + +```python +G.V().outE(label='edgeLabel') +``` +--- + +## `.bothE()` +Following all edges, but return the edge as the next element. This can be used to inspect edge properties. Optional argument is the edge label (or list of labels) that should be followed. To return back to a vertex, use `.in_` or `.out` + +```python +G.V().bothE(label='edgeLabel') +``` +--- + +# AS and SELECT + +The `as_` and `select` commands allow a traveler to mark a step in the traversal and return to it as a later step. + +## `.as_(name)` +Store current row for future reference + +```python +G.V().as_("a").out().as_("b") +``` + +## `.select(name)` +Move traveler to previously marked position + +```python +G.V().mark("a").out().mark("b").select("a") +``` diff --git a/website/content/docs/tutorials/amazon.md b/website/content/docs/tutorials/amazon.md index ff243546d..f215d7c48 100644 --- a/website/content/docs/tutorials/amazon.md +++ b/website/content/docs/tutorials/amazon.md @@ -21,10 +21,10 @@ Convert the data into vertices and edges python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data ``` -Create a graph called 'amazon' +Turn on grip and create a graph called 'amazon' ``` -grip create amazon +grip server & ; sleep 1 ; grip create amazon ``` Load the vertices/edges into the graph @@ -38,15 +38,22 @@ Query the graph _command line client_ ``` -grip query amazon 'O.query().V().out()' +grip query amazon 'V().hasLabel("Video").out()' ``` +The full command syntax and command list can be found at grip/gripql/javascript/gripql.js + _python client_ +Initialize a virtual environment and install gripql python package + ``` -pip install "git+https://github.com/bmeg/grip.git#egg=gripql&subdirectory=gripql/python/" +python -m venv venv ; source venv/bin/activate +pip install -e gripql/python ``` +Example code + ```python import gripql @@ -55,14 +62,14 @@ conn = gripql.Connection("http://localhost:8201") g = conn.graph("amazon") # Count the Vertices -print g.query().V().count().execute() +print("Total vertices: ", g.V().count().execute()) # Count the Edges -print g.query().E().count().execute() +print("Total edges: ", g.V().outE().count().execute()) # Try simple travesral -print g.query().V("B00000I06U").outE().execute() +print("Edges connected to 'B00000I06U' vertex: %s" %g.V("B00000I06U").outE().execute()) # Find every Book that is similar to a DVD -for result in g.query().V().has(gripql.eq("group", "Book")).as_("a").out("similar").has(gripql.eq("group", "DVD")).as_("b").select(["a", "b"]): - print result +for result in g.V().has(gripql.eq("group", "Book")).as_("a").out("similar").has(gripql.eq("group", "DVD")).as_("b").select("a"): + print(result) ``` diff --git a/website/content/docs/tutorials/tcga-rna.md b/website/content/docs/tutorials/tcga-rna.md index 87b65677b..3098295a8 100644 --- a/website/content/docs/tutorials/tcga-rna.md +++ b/website/content/docs/tutorials/tcga-rna.md @@ -16,42 +16,50 @@ grip create tcga-rna ``` Get the data + ``` curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz ``` Load clinical data + ``` ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor' ``` Load RNASeq data + ``` ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix "RNA:" --exclude RNA:Hugo_Symbol ``` Connect RNASeq data to Clinical data + ``` -./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge 'RNA:{_gid}' rna +./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge 'RNA:{_id}' rna ``` Connect Clinical data to subtypes + ``` ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e "{EXPRESSION_SUBTYPE}" subtype --dst-vertex "{EXPRESSION_SUBTYPE}" Subtype ``` Load Hugo Symbol to EntrezID translation table from RNA matrix annotations + ``` ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt --column-include Entrez_Gene_Id --row-label Gene ``` Load Mutation Information + ``` ./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_mutations_extended.txt --skiprows 1 --index-col -1 --regex Matched_Norm_Sample_Barcode '\-\d\d$' '' --edge '{Matched_Norm_Sample_Barcode}' variantIn --edge '{Hugo_Symbol}' effectsGene --column-exclude ma_func.impact ma_fi.score MA_FI.score MA_Func.Impact MA:link.MSA MA:FImpact MA:protein.change MA:link.var MA:FIS MA:link.PDB --row-label Variant ``` Load Proneural samples into a matrix + ```python import pandas import gripql @@ -59,15 +67,14 @@ import gripql conn = gripql.Connection("http://localhost:8201") g = conn.graph("tcga-rna") genes = {} -for k, v in g.query().V().hasLabel("Gene").render(["_gid", "Hugo_Symbol"]): +for k, v in g.V().hasLabel("Gene").render(["_id", "Hugo_Symbol"]): genes[k] = v data = {} -for row in g.query().V("Proneural").in_().out("rna").render(["_gid", "_data"]): +for row in g.V("Proneural").in_().out("rna").render(["_id", "_data"]): data[row[0]] = row[1] samples = pandas.DataFrame(data).rename(genes).transpose().fillna(0.0) ``` - # Matrix Load project ``` @@ -93,17 +100,17 @@ optional arguments: --row-label ROW_LABEL Vertex Label used when loading rows --row-prefix ROW_PREFIX - Prefix added to row vertex gid + Prefix added to row vertex id -t, --transpose Transpose matrix --index-col INDEX_COL - Column number to use as index (and gid for vertex + Column number to use as index (and id for vertex load) --connect Switch to 'fully connected mode' and load matrix cell values on edges between row and column names --col-label COL_LABEL Column vertex label in 'connect' mode --col-prefix COL_PREFIX - Prefix added to col vertex gid in 'connect' mode + Prefix added to col vertex id in 'connect' mode --edge-label EDGE_LABEL Edge label for edges in 'connect' mode --edge-prop EDGE_PROP diff --git a/website/content/download.md b/website/content/download.md index 55f877312..1ba9bccbe 100644 --- a/website/content/download.md +++ b/website/content/download.md @@ -20,7 +20,7 @@ docker run bmeg/grip grip server ```

    Build From Source

    -Recommended [Go](https://golang.org/) version 1.18 or later. +Recommended [Go](https://golang.org/) version 1.24 or later. ```shell $ git clone https://github.com/bmeg/grip.git diff --git a/website/layouts/index.html b/website/layouts/index.html index d6be62aa9..d68101e20 100644 --- a/website/layouts/index.html +++ b/website/layouts/index.html @@ -1,149 +1,153 @@ - {{ partial "head.html" . }} -
    -

    GRaph Integration Platform (GRIP)

    - Download - Documentation -
    +
    +
    +

    GRaph Integration Platform (GRIP)

    + Download + Documentation +
    +
    - -
    - -
    - +
    +
    -
    +
    +
    + The GRaph Integration Platform (GRIP) is a graph query engine + designed to span across multiple database backends. It supports + Mongo, SQL and has a plug in architecture to allow new resource to + be added. +
    -
    -
    - The GRaph Integration Platform (GRIP) is a graph query engine designed to - span across multiple database backends. It supports Mongo, SQL, ElasticSearch - and has a plug in architecture to allow new resource to be added. -
    +

    A quick introduction

    -

    A quick introduction

    +
    +
    +

    Start an GRIP server

    +
    -
    -
    -

    Start an GRIP server

    +
    + 
    $ grip server --config grip.yml
    +
    -
    - 
    $ grip server --config grip.yml
    -
    -
    +
    +
    +

    List all graphs

    +
    -
    -
    -

    List all graphs

    +
    + 
    $ grip list
    +
    -
    - 
    $ grip list
    -
    -
    +
    +
    +

    Create a graph

    +
    -
    -
    -

    Create a graph

    +
    + 
    $ grip create example
    +
    -
    - 
    $ grip create example
    -
    -
    +
    +
    +

    Drop a graph

    +
    -
    -
    -

    Drop a graph

    +
    + 
    $ grip drop example
    +
    -
    - 
    $ grip drop example
    -
    -
    +
    +
    +

    Load data into a graph

    +
    -
    -
    -

    Load data into a graph

    +
    + 
    $ grip load example --edge edges.txt --vertex vertices.txt
    +
    -
    - 
    $ grip load example --edge edges.txt --vertex vertices.txt
    -
    -
    +
    +
    +

    Query a graph

    +
    -
    -
    -

    Query a graph

    +
    + 
    $ grip query example 'V().hasLabel("users")'
    +
    -
    - 
    $ grip query example 'V().hasLabel("users")'
    -
    -
    +
    +
    +

    Get vertex/edge counts for a graph

    +
    -
    -
    -

    Get vertex/edge counts for a graph

    +
    + 
    $ grip info example
    +
    -
    - 
    $ grip info example
    -
    -
    +
    +
    +

    Get the schema for a graph

    +
    -
    -
    -

    Get the schema for a graph

    +
    + 
    $ grip schema get example
    +
    -
    - 
    $ grip schema get example
    -
    -
    +
    +
    +

    Dump vertices/edges from a graph

    +
    -
    -
    -

    Dump vertices/edges from a graph

    +
    + 
    $ grip dump example --vertex
    +
    +
    -
    - 
    $ grip dump example --vertex
    +
    +
    +
    +

    Drop in for a chat.

    +

    + Join the + Gitter channel. +

    +
    + +
    +

    Get the code.

    +

    + Head over to + GitHub and dig + in. +

    +
    + +
    +

    Give feedback.

    +

    + Let us know + what you think. +

    +
    -
    - -
    - -
    - -
    - -
    -

    Drop in for a chat.

    -

    Join the Gitter channel.

    -
    - -
    -

    Get the code.

    -

    Head over to GitHub and dig in.

    -
    - -
    -

    Give feedback.

    -

    - Let us know what you think.

    -
    -
    -
    - -
    - +
    {{ partial "tail.html" . }} diff --git a/website/layouts/partials/head.html b/website/layouts/partials/head.html index 0db56e5a5..8ab9b152e 100644 --- a/website/layouts/partials/head.html +++ b/website/layouts/partials/head.html @@ -14,18 +14,18 @@ {{ end }} - - - - - + + + + + - + @@ -37,8 +37,8 @@

    GRIP
    diff --git a/website/layouts/shortcodes/download-links.html b/website/layouts/shortcodes/download-links.html index cc894846e..044865d28 100644 --- a/website/layouts/shortcodes/download-links.html +++ b/website/layouts/shortcodes/download-links.html @@ -3,6 +3,6 @@

    Download {{ getenv "GRIP_VERSION" }}