Merge branch 'perf/reduce-cloning-for-dedupe' into perf/graphql-exe-c…

…lean-up

Cargo.toml

@@ -170,6 +170,7 @@ indenter = "0.3.3"
 derive_more = { workspace = true }
 strum = "0.26.2"
 dashmap = "6.1.0"
+urlencoding = "2.1.3"
 
 [dev-dependencies]
 datatest-stable = "0.2.9"

ci-benchmark/benchmark.graphql

@@ -1,9 +1,9 @@
-schema @server(port: 8000, hostname: "0.0.0.0") @upstream(baseURL: "http://jsonplaceholder.typicode.com") {
+schema @server(port: 8000, hostname: "0.0.0.0") {
   query: Query
 }
 
 type Query @cache(maxAge: 30000) {
-  posts: [Post] @http(path: "/posts")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }
 
 type User {
@@ -20,5 +20,5 @@ type Post {
   userId: Int!
   title: String!
   body: String!
-  user: User @http(path: "/users/{{.value.userId}}")
+  user: User @http(url: "http://jsonplaceholder.typicode.com/users/{{.value.userId}}")
 }

ci-benchmark/nginx-benchmark.graphql

@@ -1,16 +1,11 @@
 schema
   @server(hostname: "0.0.0.0", port: 8000)
-  @upstream(
-    baseURL: "http://jsonplaceholder.typicode.com"
-    poolMaxIdlePerHost: 200
-    tcpKeepAlive: 60
-    proxy: {url: "http://127.0.0.1:3000"}
-  ) {
+  @upstream(poolMaxIdlePerHost: 200, tcpKeepAlive: 60, proxy: {url: "http://127.0.0.1:3000"}) {
   query: Query
 }
 
 type Query {
-  posts: [Post] @http(path: "/posts")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }
 
 type User {
@@ -27,5 +22,5 @@ type Post {
   userId: Int!
   title: String!
   body: String!
-  user: User @http(path: "/users/{{value.userId}}")
+  user: User @http(url: "http://jsonplaceholder.typicode.com/users/{{value.userId}}")
 }

examples/apollo-tracing.graphql

@@ -1,12 +1,9 @@
-schema
-  @server(port: 8000, hostname: "0.0.0.0")
-  @upstream(baseURL: "http://jsonplaceholder.typicode.com")
-  @telemetry(export: {apollo: {apiKey: "1234", graphRef: "abc@123"}}) {
+schema @server(port: 8000, hostname: "0.0.0.0") @telemetry(export: {apollo: {apiKey: "1234", graphRef: "abc@123"}}) {
   query: Query
 }
 
 type Query @cache(maxAge: 30000) {
-  posts: [Post] @http(path: "/posts")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }
 
 type Post {

examples/apollo_federation_subgraph_post.graphql

@@ -1,18 +1,26 @@
-schema
-  @server(port: 8001, enableFederation: true)
-  @upstream(baseURL: "http://jsonplaceholder.typicode.com", httpCache: 42, batch: {delay: 100}) {
+schema @server(port: 8001, enableFederation: true) @upstream(httpCache: 42, batch: {delay: 100}) {
   query: Query
 }
 
 type Query {
-  posts: [Post] @http(path: "/posts")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }
 
-type User @http(path: "/users", query: [{key: "id", value: "{{.value.id}}"}], batchKey: ["id"]) {
+type User
+  @http(
+    url: "http://jsonplaceholder.typicode.com/users"
+    query: [{key: "id", value: "{{.value.id}}"}]
+    batchKey: ["id"]
+  ) {
   id: Int!
 }
 
-type Post @http(path: "/posts", query: [{key: "id", value: "{{.value.id}}"}], batchKey: ["id"]) {
+type Post
+  @http(
+    url: "http://jsonplaceholder.typicode.com/posts"
+    query: [{key: "id", value: "{{.value.id}}"}]
+    batchKey: ["id"]
+  ) {
   id: Int!
   userId: Int!
   title: String!

examples/apollo_federation_subgraph_user.graphql

@@ -1,14 +1,17 @@
-schema
-  @server(port: 8002, enableFederation: true)
-  @upstream(baseURL: "http://jsonplaceholder.typicode.com", httpCache: 42, batch: {delay: 100}) {
+schema @server(port: 8002, enableFederation: true) @upstream(httpCache: 42, batch: {delay: 100}) {
   query: Query
 }
 
 type Query {
-  user(id: Int!): User @http(path: "/users/{{.args.id}}")
+  user(id: Int!): User @http(url: "http://jsonplaceholder.typicode.com/users/{{.args.id}}")
 }
 
-type User @http(path: "/users", query: [{key: "id", value: "{{.value.id}}"}], batchKey: ["id"]) {
+type User
+  @http(
+    url: "http://jsonplaceholder.typicode.com/users"
+    query: [{key: "id", value: "{{.value.id}}"}]
+    batchKey: ["id"]
+  ) {
   id: Int!
   name: String
   username: String

examples/auth.graphql

@@ -1,19 +1,19 @@
 schema
   @server(port: 8000)
-  @upstream(baseURL: "http://jsonplaceholder.typicode.com", httpCache: 42)
+  @upstream(httpCache: 42)
   @link(id: "auth-basic", type: Htpasswd, src: ".htpasswd")
   @link(id: "auth-jwt", type: Jwks, src: ".jwks") {
   query: Query
   mutation: Mutation
 }
 
 type Query {
-  posts: [Post] @http(path: "/posts")
-  user(id: Int!): User @http(path: "/users/{{.args.id}}")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
+  user(id: Int!): User @http(url: "http://jsonplaceholder.typicode.com/users/{{.args.id}}")
 }
 
 type Mutation {
-  user(id: Int!): User @http(path: "/users/{{.args.id}}")
+  user(id: Int!): User @http(url: "http://jsonplaceholder.typicode.com/users/{{.args.id}}")
 }
 
 type User @protected {
@@ -30,5 +30,5 @@ type Post {
   userId: Int!
   title: String!
   body: String! @protected
-  user: User @http(path: "/users/{{.value.userId}}")
+  user: User @http(url: "http://jsonplaceholder.typicode.com/users/{{.value.userId}}")
 }

examples/call.graphql

@@ -1,4 +1,4 @@
-schema @upstream(baseURL: "http://jsonplaceholder.typicode.com") {
+schema {
   query: Query
 }
 
@@ -10,9 +10,9 @@ type Post {
 }
 
 type Query {
-  user(id: Int!): User @http(path: "/users/{{.args.id}}")
+  user(id: Int!): User @http(url: "http://jsonplaceholder.typicode.com/users/{{.args.id}}")
   firstUser: User @call(steps: [{query: "user", args: {id: 1}}])
-  postFromUser(userId: Int!): [Post] @http(path: "/posts?userId={{.args.userId}}")
+  postFromUser(userId: Int!): [Post] @http(url: "http://jsonplaceholder.typicode.com/posts?userId={{.args.userId}}")
 }
 
 type User {

examples/cors.graphql

@@ -3,13 +3,12 @@ schema
     port: 8000
     hostname: "0.0.0.0"
     headers: {cors: {allowOrigins: ["*"], allowHeaders: ["*"], allowMethods: [POST, GET, OPTIONS]}}
-  )
-  @upstream(baseURL: "http://jsonplaceholder.typicode.com") {
+  ) {
   query: Query
 }
 
 type Query {
-  posts: [Post] @http(path: "/posts")
+  posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }
 
 type Post {

examples/graphql-composition.graphql

@@ -2,22 +2,21 @@
 # i.e. `tc start examples/jsonplaceholder.graphql`
 # and then you can run this example and test it on 8001 port
 
-schema
-  @server(port: 8001, queryValidation: false, hostname: "0.0.0.0")
-  @upstream(baseURL: "http://localhost:8000/graphql", httpCache: 42, batch: {delay: 1}) {
+schema @server(port: 8001, queryValidation: false, hostname: "0.0.0.0") @upstream(httpCache: 42, batch: {delay: 1}) {
   query: Query
 }
 
 type Query {
-  posts: [Post] @graphQL(name: "posts")
+  posts: [Post] @graphQL(url: "http://jsonplaceholder.typicode.com", name: "posts")
 }
 
 type Post {
   id: Int!
   userId: Int!
   title: String!
   body: String!
-  user: User @graphQL(name: "user", args: [{key: "id", value: "{{.value.userId}}"}])
+  user: User
+    @graphQL(url: "http://jsonplaceholder.typicode.com", name: "user", args: [{key: "id", value: "{{.value.userId}}"}])
 }
 
 type User {

examples/grpc-reflection.graphql

@@ -1,16 +1,22 @@
 # for test upstream server see [repo](https://github.com/tailcallhq/tailcall/tree/main/tailcall-upstream-grpc)
 schema
   @server(port: 8000)
-  @upstream(baseURL: "http://localhost:50051", httpCache: 42, batch: {delay: 10})
+  @upstream(httpCache: 42, batch: {delay: 10})
   @link(src: "http://localhost:50051", type: Grpc, headers: [{key: "authorization", value: "Bearer 123"}]) {
   query: Query
 }
 
 type Query {
-  news: NewsData! @grpc(method: "news.NewsService.GetAllNews")
-  newsById(news: NewsInput!): News! @grpc(method: "news.NewsService.GetNews", body: "{{args.news}}")
+  news: NewsData! @grpc(url: "http://localhost:50051", method: "news.NewsService.GetAllNews")
+  newsById(news: NewsInput!): News!
+    @grpc(url: "http://localhost:50051", method: "news.NewsService.GetNews", body: "{{args.news}}")
   newsByIdBatch(news: NewsInput!): News!
-    @grpc(method: "news.NewsService.GetMultipleNews", body: "{{args.news}}", batchKey: ["news", "id"])
+    @grpc(
+      url: "http://localhost:50051"
+      method: "news.NewsService.GetMultipleNews"
+      body: "{{args.news}}"
+      batchKey: ["news", "id"]
+    )
 }
 
 type News {

examples/grpc.graphql

@@ -1,16 +1,22 @@
 # for test upstream server see [repo](https://github.com/tailcallhq/rust-grpc)
 schema
   @server(port: 8000)
-  @upstream(baseURL: "http://localhost:50051", httpCache: 42, batch: {delay: 10})
+  @upstream(httpCache: 42, batch: {delay: 10})
   @link(id: "news", src: "../tailcall-fixtures/fixtures/protobuf/news.proto", type: Protobuf) {
   query: Query
 }
 
 type Query {
-  news: NewsData! @grpc(method: "news.NewsService.GetAllNews")
-  newsById(news: NewsInput!): News! @grpc(method: "news.NewsService.GetNews", body: "{{.args.news}}")
+  news: NewsData! @grpc(url: "http://localhost:50051", method: "news.NewsService.GetAllNews")
+  newsById(news: NewsInput!): News!
+    @grpc(url: "http://localhost:50051", method: "news.NewsService.GetNews", body: "{{.args.news}}")
   newsByIdBatch(news: NewsInput!): News!
-    @grpc(method: "news.NewsService.GetMultipleNews", body: "{{.args.news}}", batchKey: ["news", "id"])
+    @grpc(
+      url: "http://localhost:50051"
+      method: "news.NewsService.GetMultipleNews"
+      body: "{{.args.news}}"
+      batchKey: ["news", "id"]
+    )
 }
 
 type News {