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 f15af5ce4513bd51e5eef6de357696c4e9d09f17 Merge: 0df8f49 4bb9791 Author: Michael Blow <[email protected]> AuthorDate: Sun Mar 8 14:04:16 2020 -0400 Merge branch 'gerrit/march-hare' Change-Id: I7889131305f3a408819c0b9100316f78801d2941 .../optimizerts/queries/query-ASTERIXDB-2700.sqlpp | 40 ++++++++++ .../optimizerts/results/query-ASTERIXDB-2700.plan | 35 +++++++++ .../big_object_join.1.ddl.sqlpp | 82 ++++++++++++++++++++ .../big_object_join.2.update.sqlpp | 29 ++------ .../big_object_join.3.query.sqlpp | 35 ++++----- .../query-ASTERIXDB-2700.1.ddl.sqlpp | 30 +++----- .../query-ASTERIXDB-2700.2.update.sqlpp | 39 ++++++++++ .../query-ASTERIXSB-2700.3.query.sqlpp | 29 +++----- .../query-ASTERIXDB-2700.3.adm | 8 ++ .../test/resources/runtimets/testsuite_sqlpp.xml | 12 +++ .../rules/EnforceStructuralPropertiesRule.java | 26 ++++--- .../rules/RemoveUnusedAssignAndAggregateRule.java | 40 ++++++++-- .../apache/hyracks/api/exceptions/ErrorCode.java | 1 + .../src/main/resources/errormsg/en.properties | 1 + .../dataflow/std/join/OptimizedHybridHashJoin.java | 4 +- .../org/apache/hyracks/http/server/HttpServer.java | 64 +++------------- .../hyracks/http/server/HttpServerHandler.java | 13 +++- .../hyracks/http/server/ServletRegistry.java | 87 ++++++++++++++++++++++ .../apache/hyracks/http/server/utils/HttpUtil.java | 52 +++++++------ .../apache/hyracks/http/server/PathMatchTest.java | 18 ++--- 20 files changed, 454 insertions(+), 191 deletions(-) diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml index aa5fc5d,16c411d..484a7da --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@@ -6458,50 -6190,11 +6458,55 @@@ <output-dir compare="Text">insert_nulls_with_secondary_idx</output-dir> </compilation-unit> </test-case> + <test-case FilePath="misc"> + <compilation-unit name="query-ASTERIXDB-2700"> + <output-dir compare="Text">query-ASTERIXDB-2700</output-dir> + </compilation-unit> + </test-case> + <!-- + <test-case FilePath="misc"> + <compilation-unit name="query-ASTERIXDB-1203"> + <output-dir compare="Text">query-ASTERIXDB-1203</output-dir> + </compilation-unit> + </test-case> + --> + <test-case FilePath="misc"> + <compilation-unit name="query-ASTERIXDB-819-2"> + <output-dir compare="Text">query-ASTERIXDB-819-2</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="misc"> + <compilation-unit name="query-ASTERIXDB-819"> + <output-dir compare="Text">query-ASTERIXDB-819</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="misc"> + <compilation-unit name="query-ASTERIXDB-865"> + <output-dir compare="Text">query-ASTERIXDB-865</output-dir> + </compilation-unit> + </test-case> + </test-group> + <test-group name="multipart-dataverse"> + <test-case FilePath="multipart-dataverse"> + <compilation-unit name="index_1"> + <output-dir compare="Text">index_1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="multipart-dataverse"> + <compilation-unit name="resolution_1"> + <output-dir compare="Text">resolution_1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="multipart-dataverse"> + <compilation-unit name="special_chars_1"> + <output-dir compare="Text">special_chars_1</output-dir> + </compilation-unit> + </test-case> + <test-case FilePath="multipart-dataverse"> + <compilation-unit name="udf_1"> + <output-dir compare="Text">udf_1</output-dir> + </compilation-unit> + </test-case> </test-group> <test-group name="index"> <test-group name="index/validations"> diff --cc hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java index 8403dce,8451898..46d429a --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java @@@ -201,6 -179,33 +179,34 @@@ public class HttpUtil return preferredCharset.orElse(defaultCharset); } + public static String trimQuery(String uri) { + int i = uri.indexOf('?'); + return i < 0 ? uri : uri.substring(0, i); + } + + public static class Encoding { + public static final String UTF8 = "utf-8"; + + private Encoding() { + } + } + + public static class ContentType { ++ public static final String ADM = "adm"; ++ public static final String JSON = "json"; ++ public static final String CSV = "csv"; + public static final String APPLICATION_ADM = "application/x-adm"; + public static final String APPLICATION_JSON = "application/json"; - public static final String JSON = "json"; + public static final String APPLICATION_X_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded"; - public static final String CSV = "csv"; + public static final String TEXT_CSV = "text/csv"; + public static final String IMG_PNG = "image/png"; + public static final String TEXT_HTML = "text/html"; + public static final String TEXT_PLAIN = "text/plain"; + + private ContentType() { + } + } + private static class WeightedHeaderValue implements Comparable<WeightedHeaderValue> { final String value;
