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 9d5485a9e7f07a6193034292d82ae77c2ccabd4c Merge: 2b6cf22 0e33c16 Author: Michael Blow <[email protected]> AuthorDate: Fri Aug 13 08:24:36 2021 -0400 Merge branch 'gerrit/cheshire-cat' Change-Id: Ie6a4c591cf0581775f57979c62f69801c21edb9b .../subplan/InlineAllNtsInSubplanVisitor.java | 2 +- .../query-ASTERIXDB-2947.1.ddl.sqlpp | 29 ++ .../query-ASTERIXDB-2947.2.update.sqlpp | 35 +++ .../query-ASTERIXDB-2947.3.query.sqlpp | 30 ++ .../query-ASTERIXDB-2947.3.adm | 2 + .../test/resources/runtimets/testsuite_sqlpp.xml | 5 + .../asterix-doc/src/main/markdown/sqlpp/3_query.md | 323 ++++++++++++++++++++- asterixdb/asterix-server/pom.xml | 1 + .../appended-resources/supplemental-models.xml | 7 +- .../hyracks/hyracks-storage-common/pom.xml | 1 - hyracks-fullstack/pom.xml | 6 + 11 files changed, 435 insertions(+), 6 deletions(-) diff --cc asterixdb/asterix-server/pom.xml index 98e3e59,0176ef8..afaad49 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -343,12 -254,8 +343,13 @@@ <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0</aliasUrl> <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.txt</aliasUrl> <aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> + <aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl> <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/jorabin/KeePassJava2/KeePassJava2-2.1.4/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/reactor/reactor-netty/v1.0.7/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.6/LICENSE</aliasUrl> + <aliasUrl>https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt</aliasUrl> + <aliasUrl>https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/raw/5d13925b57ace092ea5e1131c338f464d85545f4/LICENSE.txt</aliasUrl> </aliasUrls> <metric>1</metric> </license>
