Move request slug from path to query

This prevents the airlift HTTP server from logging the slug in the http request log.
prestodb · Sep 5, 2019 · 67efdcf · 67efdcf
1 parent 6c1aab7
commit 67efdcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/Query.java
@@ -579,9 +579,9 @@ private synchronized URI createNextResultsUri(String scheme, UriInfo uriInfo)
                 .scheme(scheme)
                 .replacePath("/v1/statement")
                 .path(queryId.toString())
-                .path(slug)
                 .path(String.valueOf(resultId.incrementAndGet()))
                 .replaceQuery("")
+                .queryParam("slug", slug)
                 .build();
     }
 

diff --git a/presto-main/src/main/java/com/facebook/presto/server/protocol/StatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/protocol/StatementResource.java
@@ -172,12 +172,12 @@ public Response createQuery(
     }
 
     @GET
-    @Path("{queryId}/{slug}/{token}")
+    @Path("{queryId}/{token}")
     @Produces(MediaType.APPLICATION_JSON)
     public void getQueryResults(
             @PathParam("queryId") QueryId queryId,
-            @PathParam("slug") String slug,
             @PathParam("token") long token,
+            @QueryParam("slug") String slug,
             @QueryParam("maxWait") Duration maxWait,
             @QueryParam("targetResultSize") DataSize targetResultSize,
             @HeaderParam(X_FORWARDED_PROTO) String proto,
@@ -274,12 +274,12 @@ private static Response toResponse(Query query, QueryResults queryResults)
     }
 
     @DELETE
-    @Path("{queryId}/{slug}/{token}")
+    @Path("{queryId}/{token}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response cancelQuery(
             @PathParam("queryId") QueryId queryId,
-            @PathParam("slug") String slug,
-            @PathParam("token") long token)
+            @PathParam("token") long token,
+            @QueryParam("slug") String slug)
     {
         Query query = getQuery(queryId, slug);
         if (query == null) {