You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2020/06/08 21:50:26 UTC
[asterixdb] 02/02: Merge branch 'gerrit/mad-hatter'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 047c9e04c1720ad353586c6ee7d1bbd1673a56b5
Merge: c662b16 c77ab0d
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Jun 8 10:34:16 2020 -0400
Merge branch 'gerrit/mad-hatter'
Change-Id: I85867c451c84aaa94f008c6b718ab7805983c503
.../algebra/extension/ExtensionStatement.java | 2 +
.../asterix/translator/IRequestParameters.java | 7 ++
.../asterix/translator/IStatementExecutor.java | 33 +++++++
.../apache/asterix/api/http/server/ApiServlet.java | 2 +-
.../api/http/server/NCQueryServiceServlet.java | 27 ++++--
.../http/server/QueryServiceRequestParameters.java | 10 ++
.../api/http/server/QueryServiceServlet.java | 106 +++++++++++++--------
.../apache/asterix/api/java/AsterixJavaClient.java | 4 +-
.../message/ExecuteStatementRequestMessage.java | 7 +-
.../message/ExecuteStatementResponseMessage.java | 10 ++
.../asterix/app/translator/QueryTranslator.java | 12 ++-
.../asterix/app/translator/RequestParameters.java | 27 ++++--
.../http/servlet/QueryCancellationServletTest.java | 8 +-
.../asterix/test/common/ResultExtractor.java | 4 +-
.../apache/asterix/test/common/TestExecutor.java | 1 -
.../asterix/common/api/IRequestReference.java | 14 +++
16 files changed, 202 insertions(+), 72 deletions(-)
diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
index c0cf8eb,5911c1e..083fa83
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java
@@@ -35,8 -35,8 +35,9 @@@ import java.util.stream.Collectors
import org.apache.asterix.common.api.IResponsePrinter;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.metadata.DataverseName;
import org.apache.asterix.lang.common.base.IStatementRewriter;
+ import org.apache.asterix.lang.common.base.Statement;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.om.base.IAObject;
diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index 12fe09b,b814b0a..50f2e9f
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@@ -322,9 -308,9 +323,11 @@@ public class QueryTranslator extends Ab
metadataProvider.setWriterFactory(writerFactory);
metadataProvider.setResultSerializerFactoryProvider(resultSerializerFactoryProvider);
metadataProvider.setOutputFile(outputFile);
+ IStatementRewriter stmtRewriter = rewriterFactory.createStatementRewriter();
+ rewriteStatement(stmt, stmtRewriter, metadataProvider); // Rewrite the statement's AST.
- switch (stmt.getKind()) {
+ Statement.Kind kind = stmt.getKind();
+ statementProperties.setKind(kind);
+ switch (kind) {
case SET:
handleSetStatement(stmt, config);
break;
diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
index 190b7b0,17ba250..3895ec8
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java
@@@ -197,13 -134,28 +197,15 @@@ public class ResultExtractor
}
private static ExtractedResult extract(InputStream resultStream, EnumSet<ResultField> resultFields,
- Charset resultCharset, String fmt) throws Exception {
-
- if (fmt.equals("json")) {
- return extract(resultStream, resultFields, resultCharset, "[", ",", "]");
- }
-
- if (fmt.equals("jsonl")) {
- return extract(resultStream, resultFields, resultCharset, "", "", "");
- }
-
- throw new AsterixException("Unknown output format for result of test query");
- }
-
- private static ExtractedResult extract(InputStream resultStream, EnumSet<ResultField> resultFields,
- Charset resultCharset, String openMarker, String separator, String closeMarker) throws Exception {
+ Charset resultCharset, OutputFormat fmt, String[] plans) throws Exception {
ExtractedResult extractedResult = new ExtractedResult();
final String resultStr = IOUtils.toString(resultStream, resultCharset);
+
+ LOGGER.debug("+++++++\n" + resultStr + "\n+++++++\n");
+
- final ObjectNode result = OBJECT_MAPPER.readValue(resultStr, ObjectNode.class);
+ final ObjectNode result = OBJECT_READER.readValue(resultStr);
+ final boolean isJsonFormat = isJsonFormat(fmt);
- LOGGER.debug("+++++++\n" + result + "\n+++++++\n");
// if we have errors field in the results, we will always return it
checkForErrors(result);
final StringBuilder resultBuilder = new StringBuilder();