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 2019/10/07 16:29:25 UTC

[asterixdb] 04/04: Merge branch 'mad-hatter' into 'master'

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 36b67ed6fd4b05d11607f61e8123521863e06f0c
Merge: 75f1987 505f7a9
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Oct 7 10:48:37 2019 -0400

    Merge branch 'mad-hatter' into 'master'
    
    Change-Id: I24f42dc32931a214a27c2c88fde163f665cc83db

 .../asterix/api/http/server/ClusterApiServlet.java |   3 +-
 .../app/function/TPCDSDataGeneratorReader.java     | 148 +++++++++++++--------
 .../string_fun_001/string_fun_001.01.ddl.sqlpp}    |   0
 .../string_fun_001/string_fun_001.02.update.sqlpp} |   0
 .../string_fun_001/string_fun_001.03.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.04.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.05.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.06.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.07.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.08.query.sqlpp}  |   0
 .../string_fun_001/string_fun_001.09.ddl.sqlpp}    |   0
 .../string_fun_002/string_fun_002.01.query.sqlpp}  |   0
 .../string_fun_003/string_fun_003.01.ddl.sqlpp}    |   0
 .../string_fun_003/string_fun_003.02.update.sqlpp} |   8 +-
 .../string_fun_003/string_fun_003.03.query.sqlpp}  |  27 ++--
 .../string_fun_003/string_fun_003.04.query.sqlpp}  |  27 ++--
 .../string_fun_003/string_fun_003.05.query.sqlpp}  |  27 +---
 .../string_fun_003/string_fun_003.06.ddl.sqlpp}    |   0
 .../string/repeat_error/repeat_error.1.query.sqlpp |  20 ---
 .../datagen_sf_1_all_tables_2.1.query.sqlpp        |   6 +-
 .../string_fun_001/string_fun_001.03.adm}          |   0
 .../string_fun_001/string_fun_001.04.adm}          |   0
 .../string_fun_001/string_fun_001.05.adm}          |   0
 .../string_fun_001/string_fun_001.06.adm}          |   0
 .../string_fun_001/string_fun_001.07.adm}          |   0
 .../string_fun_001/string_fun_001.08.adm}          |   0
 .../string_fun_002/string_fun_002.01.adm}          |   0
 .../string_fun_003/string_fun_003.01.adm           |   2 +
 .../string_fun_003/string_fun_003.02.adm           |   2 +
 .../string_fun_003/string_fun_003.03.adm           |   1 +
 .../datagen_sf_1_all_tables_2.1.adm                |  48 +++----
 .../test/resources/runtimets/testsuite_sqlpp.xml   |  45 +++++--
 .../asterix/common/exceptions/ErrorCode.java       |   1 +
 .../src/main/resources/asx_errormsg/en.properties  |   3 +-
 .../asterix/om/exceptions/ExceptionUtil.java       |  44 ++++--
 .../asterix/om/functions/BuiltinFunctions.java     |  15 +--
 .../om/typecomputer/impl/AStringTypeComputer.java  |  12 +-
 .../impl/AbstractStringTypeComputer.java           |  14 +-
 .../impl/StringIntToStringTypeComputer.java        | 116 ----------------
 ...peComputer.java => StringJoinTypeComputer.java} |  23 +++-
 .../impl/UnaryStringInt64TypeComputer.java         |   2 +-
 .../hierachy/DoubleToInt32TypeConvertComputer.java |   2 +-
 .../std/AbstractMinMaxAggregateFunction.java       |   2 +-
 .../runtime/evaluators/common/ArgumentUtils.java   |  76 +++++++++++
 .../functions/AbstractQuadStringStringEval.java    |  20 +--
 .../AbstractStringStringStringIntEval.java         |  57 ++++----
 .../evaluators/functions/StringJoinDescriptor.java |  54 +++-----
 .../StringRegExpReplaceWithFlagDescriptor.java     |  44 ++++--
 .../functions/StringRepeatDescriptor.java          |  36 ++---
 .../StringReplaceWithLimitDescriptor.java          |  12 +-
 .../evaluators/functions/Substring2Descriptor.java |  47 ++++---
 .../apache/hyracks/http/api/IServletRequest.java   |   6 +
 .../apache/hyracks/http/server/BaseRequest.java    |  15 ++-
 .../hyracks/http/server/FormUrlEncodedRequest.java |   9 +-
 .../org/apache/hyracks/http/server/HttpServer.java |   5 +
 .../hyracks/http/server/HttpServerHandler.java     |   8 +-
 .../apache/hyracks/http/server/utils/HttpUtil.java |   9 +-
 57 files changed, 520 insertions(+), 476 deletions(-)