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 03db8779fb41fecd91c12b9ad28b5468e91eff21
Merge: 0be8b38 1a01b52
Author: Michael Blow <[email protected]>
AuthorDate: Sun Mar 29 11:40:49 2020 -0400

    Merge branch 'mad-hatter'
    
    Change-Id: Ida334df2ce4eb59e6c7752b1708d1d4254068c3a

 .../am/AbstractIntroduceAccessMethodRule.java      |   4 +-
 .../optimizer/rules/am/BTreeAccessMethod.java      |  22 +++-
 .../asterix/optimizer/rules/am/IAccessMethod.java  |   6 +-
 .../rules/am/InvertedIndexAccessMethod.java        |   4 +-
 .../optimizer/rules/am/RTreeAccessMethod.java      |   4 +-
 .../btree-index-composite-key-04.sqlpp}            |  35 ++++---
 .../non-enforced-composite-key-equi-join/01.sqlpp  |   4 +-
 .../non-enforced-composite-key-equi-join/02.sqlpp  |   4 +-
 .../non-enforced-composite-key-equi-join/06.sqlpp  |   4 +-
 .../non-enforced-composite-key-equi-join/07.sqlpp  |   4 +-
 .../non-enforced-composite-key/01.sqlpp            |   4 +-
 .../non-enforced-composite-key/02.sqlpp            |   4 +-
 .../non-enforced-composite-key/03.sqlpp            |   4 +-
 .../non-enforced-composite-key/04.sqlpp            |   4 +-
 .../non-enforced-composite-key/05.sqlpp            |   4 +-
 .../non-enforced-composite-key/06.sqlpp            |   4 +-
 .../non-enforced-composite-key/07.sqlpp            |   4 +-
 .../non-enforced-composite-key/08.sqlpp            |   4 +-
 .../non-enforced-composite-key/09.sqlpp            |   4 +-
 .../non-enforced-composite-key/10.sqlpp            |   4 +-
 .../non-enforced-composite-key/11.sqlpp            |   4 +-
 .../non-enforced-composite-key/12.sqlpp            |   5 +-
 .../btree-composite-key-non-enforced-03.sqlpp      |   2 +
 .../btree-index-composite-key-04.plan              |  12 +++
 .../non-enforced-composite-key-equi-join/01.plan   |  33 +++---
 .../non-enforced-composite-key-equi-join/02.plan   |  33 +++---
 .../non-enforced-composite-key-equi-join/06.plan   |  45 ++++-----
 .../non-enforced-composite-key-equi-join/07.plan   |  45 ++++-----
 .../btree-index/non-enforced-composite-key/01.plan |  11 +-
 .../btree-index/non-enforced-composite-key/02.plan |  11 +-
 .../btree-index/non-enforced-composite-key/03.plan |  11 +-
 .../btree-index/non-enforced-composite-key/04.plan |  11 +-
 .../btree-index/non-enforced-composite-key/05.plan |  11 +-
 .../btree-index/non-enforced-composite-key/06.plan |  11 +-
 .../btree-index/non-enforced-composite-key/07.plan |  11 +-
 .../btree-index/non-enforced-composite-key/08.plan |  11 +-
 .../btree-index/non-enforced-composite-key/09.plan |  11 +-
 .../btree-index/non-enforced-composite-key/10.plan |  11 +-
 .../btree-index/non-enforced-composite-key/11.plan |  11 +-
 .../btree-index/non-enforced-composite-key/12.plan |  22 +---
 .../btree-composite-key-non-enforced-03.plan       |  11 +-
 .../btree-index-composite-key-04.1.ddl.sqlpp}      |  29 +++---
 .../btree-index-composite-key-04.2.update.sqlpp}   |  38 +++----
 .../btree-index-composite-key-04.3.query.sqlpp}    |  24 ++---
 .../btree-index-composite-key-04.3.adm             |   2 +
 .../non-enforced-02/non-enforced-02.4.adm          |   3 +-
 .../btree-index-02/btree-index-02.4.adm            |   3 +-
 .../test/resources/runtimets/testsuite_sqlpp.xml   |   5 +
 .../hyracks/http/server/HttpServerHandler.java     |   7 +-
 .../maven/license/SourcePointerResolver.java       | 111 ++++++++++++---------
 50 files changed, 336 insertions(+), 350 deletions(-)


Reply via email to