Merge commit 'b6a70e19' from stabilization-f69489 Change-Id: I9f09ed73f27090c5be7b1a665f4591b29a8cca12
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/f184a1e7 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/f184a1e7 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/f184a1e7 Branch: refs/heads/master Commit: f184a1e7b84f6c922b885094281271b4c41a10d6 Parents: 43e0b15 9a61bd2 Author: Murtadha Hubail <[email protected]> Authored: Sun Dec 9 03:57:02 2018 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Sat Dec 8 18:12:33 2018 -0700 ---------------------------------------------------------------------- .../asterix/app/translator/QueryTranslator.java | 9 +- .../01.sqlpp | 40 +++++ .../02.sqlpp | 40 +++++ .../03.sqlpp | 46 +++++ .../04.sqlpp | 46 +++++ .../05.sqlpp | 46 +++++ .../06.sqlpp | 46 +++++ .../07.sqlpp | 46 +++++ .../non-enforced-composite-key/01.sqlpp | 38 ++++ .../non-enforced-composite-key/02.sqlpp | 38 ++++ .../non-enforced-composite-key/03.sqlpp | 40 +++++ .../non-enforced-composite-key/04.sqlpp | 39 ++++ .../non-enforced-composite-key/05.sqlpp | 39 ++++ .../non-enforced-composite-key/06.sqlpp | 39 ++++ .../non-enforced-composite-key/07.sqlpp | 39 ++++ .../non-enforced-composite-key/08.sqlpp | 39 ++++ .../non-enforced-composite-key/09.sqlpp | 39 ++++ .../non-enforced-composite-key/10.sqlpp | 39 ++++ .../non-enforced-composite-key/11.sqlpp | 39 ++++ .../non-enforced-composite-key/12.sqlpp | 42 +++++ .../01.plan | 22 +++ .../02.plan | 22 +++ .../03.plan | 30 ++++ .../04.plan | 30 ++++ .../05.plan | 30 ++++ .../06.plan | 31 ++++ .../07.plan | 31 ++++ .../non-enforced-composite-key/01.plan | 17 ++ .../non-enforced-composite-key/02.plan | 15 ++ .../non-enforced-composite-key/03.plan | 23 +++ .../non-enforced-composite-key/04.plan | 24 +++ .../non-enforced-composite-key/05.plan | 24 +++ .../non-enforced-composite-key/06.plan | 24 +++ .../non-enforced-composite-key/07.plan | 24 +++ .../non-enforced-composite-key/08.plan | 24 +++ .../non-enforced-composite-key/09.plan | 24 +++ .../non-enforced-composite-key/10.plan | 24 +++ .../non-enforced-composite-key/11.plan | 25 +++ .../non-enforced-composite-key/12.plan | 35 ++++ ...condary-non-enforced-equi-join-2.1.ddl.sqlpp | 33 ++++ ...dary-non-enforced-equi-join-2.10.query.sqlpp | 29 +++ ...ondary-non-enforced-equi-join-2.11.ddl.sqlpp | 20 +++ ...dary-non-enforced-equi-join-2.2.update.sqlpp | 103 +++++++++++ ...dary-non-enforced-equi-join-2.3.update.sqlpp | 103 +++++++++++ ...condary-non-enforced-equi-join-2.4.ddl.sqlpp | 38 ++++ ...ndary-non-enforced-equi-join-2.5.query.sqlpp | 28 +++ ...ndary-non-enforced-equi-join-2.6.query.sqlpp | 28 +++ ...ndary-non-enforced-equi-join-2.7.query.sqlpp | 28 +++ ...ndary-non-enforced-equi-join-2.8.query.sqlpp | 28 +++ ...ndary-non-enforced-equi-join-2.9.query.sqlpp | 28 +++ ...secondary-non-enforced-equi-join.1.ddl.sqlpp | 63 +++++++ ...ondary-non-enforced-equi-join.2.update.sqlpp | Bin 0 -> 1458 bytes ...secondary-non-enforced-equi-join.3.ddl.sqlpp | 22 +++ ...condary-non-enforced-equi-join.4.query.sqlpp | 25 +++ ...secondary-non-enforced-equi-join.5.ddl.sqlpp | 20 +++ .../non-enforced-01/non-enforced-01.1.ddl.sqlpp | 31 ++++ .../non-enforced-01.10.query.sqlpp | 25 +++ .../non-enforced-01.11.query.sqlpp | 25 +++ .../non-enforced-01.12.ddl.sqlpp | 19 ++ .../non-enforced-01.2.update.sqlpp | 103 +++++++++++ .../non-enforced-01/non-enforced-01.3.ddl.sqlpp | 28 +++ .../non-enforced-01.4.query.sqlpp | 25 +++ .../non-enforced-01.5.query.sqlpp | 25 +++ .../non-enforced-01.6.query.sqlpp | 25 +++ .../non-enforced-01.7.query.sqlpp | 25 +++ .../non-enforced-01.8.query.sqlpp | 25 +++ .../non-enforced-01.9.query.sqlpp | 25 +++ .../non-enforced-02/non-enforced-02.1.ddl.sqlpp | 31 ++++ .../non-enforced-02.2.update.sqlpp | 95 ++++++++++ .../non-enforced-02/non-enforced-02.3.ddl.sqlpp | 28 +++ .../non-enforced-02.4.query.sqlpp | 25 +++ .../non-enforced-02.5.query.sqlpp | 25 +++ .../non-enforced-02/non-enforced-02.6.ddl.sqlpp | 20 +++ .../non-enforced-03/non-enforced-03.1.ddl.sqlpp | 33 ++++ .../non-enforced-03.2.update.sqlpp | 27 +++ .../non-enforced-03.3.query.sqlpp | 24 +++ .../non-enforced-03/non-enforced-03.4.ddl.sqlpp | 20 +++ .../non-enforced-04/non-enforced-04.1.ddl.sqlpp | 31 ++++ .../non-enforced-04.2.update.sqlpp | 102 +++++++++++ .../non-enforced-04/non-enforced-04.3.ddl.sqlpp | 22 +++ .../non-enforced-04.4.query.sqlpp | 25 +++ .../non-enforced-04/non-enforced-04.5.ddl.sqlpp | 20 +++ ...ee-secondary-non-enforced-equi-join-2.10.adm | 6 + ...ree-secondary-non-enforced-equi-join-2.5.adm | 10 ++ ...ree-secondary-non-enforced-equi-join-2.6.adm | 10 ++ ...ree-secondary-non-enforced-equi-join-2.7.adm | 8 + ...ree-secondary-non-enforced-equi-join-2.8.adm | 8 + ...ree-secondary-non-enforced-equi-join-2.9.adm | 9 + ...btree-secondary-non-enforced-equi-join.4.adm | 2 + .../non-enforced-01/non-enforced-01.10.adm | 3 + .../non-enforced-01/non-enforced-01.11.adm | 2 + .../non-enforced-01/non-enforced-01.4.adm | 2 + .../non-enforced-01/non-enforced-01.5.adm | 2 + .../non-enforced-01/non-enforced-01.6.adm | 2 + .../non-enforced-01/non-enforced-01.7.adm | 2 + .../non-enforced-01/non-enforced-01.8.adm | 5 + .../non-enforced-01/non-enforced-01.9.adm | 4 + .../non-enforced-02/non-enforced-02.4.adm | 1 + .../non-enforced-02/non-enforced-02.5.adm | 2 + .../non-enforced-03/non-enforced-03.3.adm | 1 + .../non-enforced-04/non-enforced-04.4.adm | 2 + .../resources/runtimets/testsuite_sqlpp.xml | 30 ++++ .../apache/asterix/metadata/utils/TypeUtil.java | 105 ++++++++--- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 6 + .../muxdemux/FullFrameChannelReadInterface.java | 4 +- .../FullFrameChannelReadInterfaceTest.java | 180 +++++++++++++++++++ 106 files changed, 3150 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f184a1e7/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f184a1e7/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/f184a1e7/hyracks-fullstack/hyracks/hyracks-net/pom.xml ---------------------------------------------------------------------- diff --cc hyracks-fullstack/hyracks/hyracks-net/pom.xml index 525543f,4ca20ca..2cddf45 --- a/hyracks-fullstack/hyracks/hyracks-net/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-net/pom.xml @@@ -61,8 -61,10 +61,14 @@@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> ++ <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>2.0.2-beta</version> + <scope>test</scope> + </dependency> </dependencies> </project>
