Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add msgpack support for data transfer #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add msgpack support for data transfer #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/trino-main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,11 @@
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
</dependency>
<dependency>
<groupId>org.msgpack</groupId>
<artifactId>jackson-dataformat-msgpack</artifactId>
<version>0.9.3</version>
</dependency>

<dependency>
<groupId>org.openjdk.jol</groupId>
Expand Down
60 changes: 52 additions & 8 deletions core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*/
package io.trino.server.protocol;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Ordering;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
Expand All @@ -30,6 +32,7 @@
import io.trino.server.security.ResourceSecurity;
import io.trino.spi.QueryId;
import io.trino.spi.block.BlockEncodingSerde;
import org.msgpack.jackson.dataformat.MessagePackFactory;

import javax.annotation.PreDestroy;
import javax.inject.Inject;
Expand All @@ -44,11 +47,14 @@
import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Variant;

import java.net.URLEncoder;
import java.util.List;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -90,6 +96,7 @@ public class ExecutingStatementResource
private final ScheduledExecutorService queryPurger = newSingleThreadScheduledExecutor(threadsNamed("execution-query-purger"));
private final PreparedStatementEncoder preparedStatementEncoder;
private final boolean compressionEnabled;
private final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory().setReuseResourceInGenerator(false));

@Inject
public ExecutingStatementResource(
Expand Down Expand Up @@ -146,18 +153,19 @@ public void stop()
@ResourceSecurity(PUBLIC)
@GET
@Path("{queryId}/{slug}/{token}")
@Produces(MediaType.APPLICATION_JSON)
@Produces({MediaType.APPLICATION_JSON, "application/msgpack"})
public void getQueryResults(
@PathParam("queryId") QueryId queryId,
@PathParam("slug") String slug,
@PathParam("token") long token,
@QueryParam("maxWait") Duration maxWait,
@QueryParam("targetResultSize") DataSize targetResultSize,
@Context UriInfo uriInfo,
@Suspended AsyncResponse asyncResponse)
@Suspended AsyncResponse asyncResponse,
@Context Request request)
{
Query query = getQuery(queryId, slug, token);
asyncQueryResults(query, token, maxWait, targetResultSize, uriInfo, asyncResponse);
asyncQueryResults(query, token, maxWait, targetResultSize, uriInfo, asyncResponse, request);
}

protected Query getQuery(QueryId queryId, String slug, long token)
Expand Down Expand Up @@ -202,7 +210,8 @@ private void asyncQueryResults(
Duration maxWait,
DataSize targetResultSize,
UriInfo uriInfo,
AsyncResponse asyncResponse)
AsyncResponse asyncResponse,
Request request)
{
Duration wait = WAIT_ORDERING.min(MAX_WAIT_TIME, maxWait);
if (targetResultSize == null) {
Expand All @@ -213,14 +222,49 @@ private void asyncQueryResults(
}
ListenableFuture<QueryResults> queryResultsFuture = query.waitForResults(token, uriInfo, wait, targetResultSize);

ListenableFuture<Response> response = Futures.transform(queryResultsFuture, queryResults -> toResponse(query, queryResults), directExecutor());
// Detect the Mediatype we can use.
MediaType responseMediaType = detectResponseMediaType(request);
ListenableFuture<Response> response = Futures.transform(queryResultsFuture, queryResults -> toResponse(query, queryResults, responseMediaType), directExecutor());

bindAsyncResponse(asyncResponse, response, responseExecutor);
}

private Response toResponse(Query query, QueryResults queryResults)
private MediaType detectResponseMediaType(Request request)
{
ResponseBuilder response = Response.ok(queryResults);
List<Variant> responseVariants = Variant.mediaTypes(
new MediaType("application", "msgpack"),
MediaType.valueOf(MediaType.APPLICATION_JSON)
).build();
Variant bestResponseVariant = request.selectVariant(responseVariants);
if (bestResponseVariant == null) {
return MediaType.APPLICATION_JSON_TYPE; // Defaulting to JSON type.
}
return bestResponseVariant.getMediaType();
}

private ResponseBuilder prepareResponseBuilder(QueryResults queryResults, MediaType responseMediaType)
{
ResponseBuilder responseBuilder;
if (responseMediaType.getSubtype().equals("msgpack")) {
try {
responseBuilder = Response.ok(objectMapper.writeValueAsBytes(queryResults));
responseBuilder.type("application/msgpack");
}
catch (JsonProcessingException e) {
log.debug("data encoding using msgpack failed. %s", e.getMessage());
// Switching back to JSON encoding.
responseBuilder = Response.ok(queryResults);
}
}
else {
responseBuilder = Response.ok(queryResults);
}
return responseBuilder;
}

private Response toResponse(Query query, QueryResults queryResults, MediaType responseMediaType)
{
ResponseBuilder response = prepareResponseBuilder(queryResults, responseMediaType);

ProtocolHeaders protocolHeaders = query.getProtocolHeaders();
query.getSetCatalog().ifPresent(catalog -> response.header(protocolHeaders.responseSetCatalog(), catalog));
Expand Down Expand Up @@ -270,7 +314,7 @@ private Response toResponse(Query query, QueryResults queryResults)
@ResourceSecurity(PUBLIC)
@DELETE
@Path("{queryId}/{slug}/{token}")
@Produces(MediaType.APPLICATION_JSON)
@Produces({MediaType.APPLICATION_JSON, "application/msgpack"})
public Response cancelQuery(
@PathParam("queryId") QueryId queryId,
@PathParam("slug") String slug,
Expand Down
4 changes: 2 additions & 2 deletions service/trino-proxy/src/main/java/io/trino/proxy/ProxyResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void getInfo(

@POST
@Path("/v1/statement")
@Produces(APPLICATION_JSON)
@Produces({APPLICATION_JSON, "application/msgpack"})
public void postStatement(
String statement,
@Context HttpServletRequest servletRequest,
Expand All @@ -149,7 +149,7 @@ public void postStatement(

@GET
@Path("/v1/proxy")
@Produces(APPLICATION_JSON)
@Produces({APPLICATION_JSON, "application/msgpack"})
public void getNext(
@QueryParam("uri") String uri,
@QueryParam("hmac") String hash,
Expand Down