Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the default format from OBJECT to OBJECTLINES (#14700)

This commit is contained in:
Adarsh Sanjeev 2023-08-01 00:09:58 +05:30 committed by GitHub
parent 21d023b62b
commit 339b8d959f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlStatementResource.java
View File

@ -773,7 +773,7 @@ public class SqlStatementResource
) throws IOException
{
try {
try (final ResultFormat.Writer writer = ResultFormat.OBJECT.createFormatter(os, jsonMapper)) {
try (final ResultFormat.Writer writer = ResultFormat.OBJECTLINES.createFormatter(os, jsonMapper)) {
Yielder<Object[]> yielder = results.get();
List<ColumnNameAndTypes> rowSignature = signature.get();
writer.writeResponseStart();

65
extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/SqlMSQStatementResourcePostTest.java
View File

@ -20,6 +20,7 @@
package org.apache.druid.msq.sql;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.calcite.sql.type.SqlTypeName;
@ -49,8 +50,10 @@ import org.junit.Before;
import org.junit.Test;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -315,26 +318,52 @@ public class SqlMSQStatementResourcePostTest extends MSQTestBase
SqlStatementResourceTest.makeOkRequest()
).getEntity();
assertExpectedResults(
"{\"cnt\":1,\"dim1\":\"\"}\n"
+ "{\"cnt\":1,\"dim1\":\"10.1\"}\n"
+ "{\"cnt\":1,\"dim1\":\"2\"}\n"
+ "{\"cnt\":1,\"dim1\":\"1\"}\n"
+ "{\"cnt\":1,\"dim1\":\"def\"}\n"
+ "{\"cnt\":1,\"dim1\":\"abc\"}\n"
+ "\n",
resource.doGetResults(
sqlStatementResult.getQueryId(),
null,
SqlStatementResourceTest.makeOkRequest()
),
objectMapper);
List<Map<String, Object>> rows = new ArrayList<>();
rows.add(ImmutableMap.of("cnt", 1, "dim1", ""));
rows.add(ImmutableMap.of("cnt", 1, "dim1", "10.1"));
rows.add(ImmutableMap.of("cnt", 1, "dim1", "2"));
rows.add(ImmutableMap.of("cnt", 1, "dim1", "1"));
rows.add(ImmutableMap.of("cnt", 1, "dim1", "def"));
rows.add(ImmutableMap.of("cnt", 1, "dim1", "abc"));
assertExpectedResults(
"{\"cnt\":1,\"dim1\":\"\"}\n"
+ "{\"cnt\":1,\"dim1\":\"10.1\"}\n"
+ "{\"cnt\":1,\"dim1\":\"2\"}\n"
+ "{\"cnt\":1,\"dim1\":\"1\"}\n"
+ "{\"cnt\":1,\"dim1\":\"def\"}\n"
+ "{\"cnt\":1,\"dim1\":\"abc\"}\n"
+ "\n",
resource.doGetResults(
sqlStatementResult.getQueryId(),
0L,
SqlStatementResourceTest.makeOkRequest()
),
objectMapper);
}
Assert.assertEquals(rows, SqlStatementResourceTest.getResultRowsFromResponse(resource.doGetResults(
sqlStatementResult.getQueryId(),
null,
SqlStatementResourceTest.makeOkRequest()
)));
private void assertExpectedResults(String expectedResult, Response resultsResponse, ObjectMapper objectMapper) throws IOException
{
byte[] bytes = responseToByteArray(resultsResponse, objectMapper);
Assert.assertEquals(expectedResult, new String(bytes, StandardCharsets.UTF_8));
}
Assert.assertEquals(rows, SqlStatementResourceTest.getResultRowsFromResponse(resource.doGetResults(
sqlStatementResult.getQueryId(),
0L,
SqlStatementResourceTest.makeOkRequest()
)));
public static byte[] responseToByteArray(Response resp, ObjectMapper objectMapper) throws IOException
{
if (resp.getEntity() instanceof StreamingOutput) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
((StreamingOutput) resp.getEntity()).write(baos);
return baos.toByteArray();
} else {
return objectMapper.writeValueAsBytes(resp.getEntity());
}
}
@Test

30
extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/SqlStatementResourceTest.java
View File

@ -95,7 +95,6 @@ import javax.ws.rs.core.Response;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -747,33 +746,32 @@ public class SqlStatementResourceTest extends MSQTestBase
Response resultsResponse = resource.doGetResults(FINISHED_SELECT_MSQ_QUERY, 0L, makeOkRequest());
Assert.assertEquals(Response.Status.OK.getStatusCode(), resultsResponse.getStatus());
List<Map<String, Object>> rows = new ArrayList<>();
rows.add(ROW1);
rows.add(ROW2);
String expectedResult = "{\"_time\":123,\"alias\":\"foo\",\"market\":\"bar\"}\n"
+ "{\"_time\":234,\"alias\":\"foo1\",\"market\":\"bar1\"}\n\n";
Assert.assertEquals(rows, getResultRowsFromResponse(resultsResponse));
assertExpectedResults(expectedResult, resultsResponse);
Assert.assertEquals(
Response.Status.OK.getStatusCode(),
resource.deleteQuery(FINISHED_SELECT_MSQ_QUERY, makeOkRequest()).getStatus()
);
Assert.assertEquals(
rows,
getResultRowsFromResponse(resource.doGetResults(
assertExpectedResults(
expectedResult,
resource.doGetResults(
FINISHED_SELECT_MSQ_QUERY,
0L,
makeOkRequest()
))
)
);
Assert.assertEquals(
rows,
getResultRowsFromResponse(resource.doGetResults(
assertExpectedResults(
expectedResult,
resource.doGetResults(
FINISHED_SELECT_MSQ_QUERY,
null,
makeOkRequest()
))
)
);
Assert.assertEquals(
@ -782,6 +780,12 @@ public class SqlStatementResourceTest extends MSQTestBase
);
}
private void assertExpectedResults(String expectedResult, Response resultsResponse) throws IOException
{
byte[] bytes = SqlResourceTest.responseToByteArray(resultsResponse);
Assert.assertEquals(expectedResult, new String(bytes, StandardCharsets.UTF_8));
}
@Test
public void testFailedMSQQuery()
{