Changeset: 8485fd20f264 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8485fd20f264 Added Files: sql/backends/monet5/Tests/crash.Bug-3609.sql sql/backends/monet5/Tests/crash.Bug-3609.stable.err sql/backends/monet5/Tests/crash.Bug-3609.stable.out sql/backends/monet5/Tests/generator00.sql sql/backends/monet5/Tests/generator00.stable.err sql/backends/monet5/Tests/generator00.stable.out sql/backends/monet5/Tests/generator01.sql sql/backends/monet5/Tests/generator01.stable.err sql/backends/monet5/Tests/generator01.stable.out sql/backends/monet5/Tests/generator02.sql sql/backends/monet5/Tests/generator02.stable.err sql/backends/monet5/Tests/generator02.stable.out sql/backends/monet5/Tests/generator03.sql sql/backends/monet5/Tests/generator03.stable.err sql/backends/monet5/Tests/generator03.stable.out sql/backends/monet5/Tests/generator04.sql sql/backends/monet5/Tests/generator04.stable.err sql/backends/monet5/Tests/generator04.stable.out sql/backends/monet5/Tests/joins00.sql sql/backends/monet5/Tests/joins00.stable.err sql/backends/monet5/Tests/joins00.stable.out sql/backends/monet5/Tests/joins01.sql sql/backends/monet5/Tests/joins01.stable.err sql/backends/monet5/Tests/joins01.stable.out sql/backends/monet5/Tests/joins02.sql sql/backends/monet5/Tests/joins02.stable.err sql/backends/monet5/Tests/joins02.stable.out sql/backends/monet5/Tests/rangejoin.sql sql/backends/monet5/Tests/rangejoin.stable.err sql/backends/monet5/Tests/rangejoin.stable.out sql/backends/monet5/Tests/thetaselect00.sql sql/backends/monet5/Tests/thetaselect00.stable.err sql/backends/monet5/Tests/thetaselect00.stable.out sql/backends/monet5/generator.c sql/backends/monet5/generator.h sql/backends/monet5/sql_generator.mal sql/backends/monet5/sql_generator.mal.h sql/backends/monet5/sql_generator_hge.mal sql/backends/monet5/sql_generator_hge.mal.h sql/scripts/90_generator.sql sql/scripts/90_generator.sql.h sql/scripts/90_generator_hge.sql sql/scripts/90_generator_hge.sql.h Removed Files: sql/backends/monet5/40_sql.mal sql/backends/monet5/40_sql.mal.h sql/backends/monet5/41_sql_hge.mal sql/backends/monet5/41_sql_hge.mal.h sql/backends/monet5/generator/90_generator.mal sql/backends/monet5/generator/90_generator.mal.h sql/backends/monet5/generator/90_generator.sql sql/backends/monet5/generator/90_generator.sql.h sql/backends/monet5/generator/90_generator_hge.mal sql/backends/monet5/generator/90_generator_hge.mal.h sql/backends/monet5/generator/90_generator_hge.sql sql/backends/monet5/generator/90_generator_hge.sql.h sql/backends/monet5/generator/Makefile.ag sql/backends/monet5/generator/Tests/All sql/backends/monet5/generator/Tests/crash.Bug-3609.sql sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.out sql/backends/monet5/generator/Tests/generator00.sql sql/backends/monet5/generator/Tests/generator00.stable.err sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/generator/Tests/generator01.sql sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator01.stable.out sql/backends/monet5/generator/Tests/generator02.sql sql/backends/monet5/generator/Tests/generator02.stable.err sql/backends/monet5/generator/Tests/generator02.stable.out sql/backends/monet5/generator/Tests/generator03.sql sql/backends/monet5/generator/Tests/generator03.stable.err sql/backends/monet5/generator/Tests/generator03.stable.out sql/backends/monet5/generator/Tests/generator04.sql sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/generator/Tests/generator04.stable.out sql/backends/monet5/generator/Tests/joins00.sql sql/backends/monet5/generator/Tests/joins00.stable.err sql/backends/monet5/generator/Tests/joins00.stable.out sql/backends/monet5/generator/Tests/joins01.sql sql/backends/monet5/generator/Tests/joins01.stable.err sql/backends/monet5/generator/Tests/joins01.stable.out sql/backends/monet5/generator/Tests/joins02.sql sql/backends/monet5/generator/Tests/joins02.stable.err sql/backends/monet5/generator/Tests/joins02.stable.out sql/backends/monet5/generator/Tests/rangejoin.sql sql/backends/monet5/generator/Tests/rangejoin.stable.err sql/backends/monet5/generator/Tests/rangejoin.stable.out sql/backends/monet5/generator/Tests/thetaselect00.sql sql/backends/monet5/generator/Tests/thetaselect00.stable.err sql/backends/monet5/generator/Tests/thetaselect00.stable.out sql/backends/monet5/generator/generator.c sql/backends/monet5/generator/generator.h sql/backends/monet5/generator/generator.mal sql/backends/monet5/generator/generator.mal.h sql/backends/monet5/generator/generator_hge.mal sql/backends/monet5/generator/generator_hge.mal.h Modified Files: sql/backends/monet5/Makefile.ag sql/backends/monet5/Tests/All sql/backends/monet5/sql_embedded.c sql/scripts/Makefile.ag sql/scripts/sql_scripts.c Branch: translate-scripts Log Message:
Moved generator module code into sql/backends/monet5 directory, as it is always installed. diffs (truncated from 665 to 300 lines): diff --git a/sql/backends/monet5/40_sql.mal b/sql/backends/monet5/40_sql.mal deleted file mode 100644 --- a/sql/backends/monet5/40_sql.mal +++ /dev/null @@ -1,11 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. - -# This loads the MonetDB/SQL module -include sql; -include sqlcatalog; -include sql_transaction; -include wlr; diff --git a/sql/backends/monet5/40_sql.mal.h b/sql/backends/monet5/40_sql.mal.h deleted file mode 100644 --- a/sql/backends/monet5/40_sql.mal.h +++ /dev/null @@ -1,10 +0,0 @@ -/* -* This Source Code Form is subject to the terms of the Mozilla Public -* License, v. 2.0. If a copy of the MPL was not distributed with this -* file, You can obtain one at http://mozilla.org/MPL/2.0/. -* -* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. -*/ - -// This file was generated automatically with mal2h.py. Do not edit this file directly. -{ "40_sql", "\ninclude sql;\ninclude sqlcatalog;\ninclude sql_transaction;\ninclude wlr;" }, diff --git a/sql/backends/monet5/41_sql_hge.mal b/sql/backends/monet5/41_sql_hge.mal deleted file mode 100644 --- a/sql/backends/monet5/41_sql_hge.mal +++ /dev/null @@ -1,8 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. - -# This loads the 128-bit support for the MonetDB/SQL module -include sql_hge; diff --git a/sql/backends/monet5/41_sql_hge.mal.h b/sql/backends/monet5/41_sql_hge.mal.h deleted file mode 100644 --- a/sql/backends/monet5/41_sql_hge.mal.h +++ /dev/null @@ -1,10 +0,0 @@ -/* -* This Source Code Form is subject to the terms of the Mozilla Public -* License, v. 2.0. If a copy of the MPL was not distributed with this -* file, You can obtain one at http://mozilla.org/MPL/2.0/. -* -* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. -*/ - -// This file was generated automatically with mal2h.py. Do not edit this file directly. -{ "41_sql_hge", "\ninclude sql_hge;" }, diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag --- a/sql/backends/monet5/Makefile.ag +++ b/sql/backends/monet5/Makefile.ag @@ -4,7 +4,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V. -SUBDIRS = NOT_WIN32?vaults UDF generator +SUBDIRS = NOT_WIN32?vaults UDF INCLUDES = ../../include ../../common ../../storage ../../server ../../scripts \ ../../../monetdb5/modules/atoms \ @@ -47,6 +47,7 @@ lib_sqlcatalog = { sql_orderidx.c sql_orderidx.h \ wlr.c wlr.h \ sql_rank.c sql_rank.h \ + generator.c generator.h \ sql_embedded.c sql_embedded.h } diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All --- a/sql/backends/monet5/Tests/All +++ b/sql/backends/monet5/Tests/All @@ -76,3 +76,20 @@ limithack shutdown HAVE_HGE?int_notation_1e5 + +# generator tests +generator00 +generator01 +generator02 +generator03 +generator04 + +rangejoin + +joins00 +joins01 +joins02 + +thetaselect00 + +crash.Bug-3609 diff --git a/sql/backends/monet5/generator/Tests/crash.Bug-3609.sql b/sql/backends/monet5/Tests/crash.Bug-3609.sql rename from sql/backends/monet5/generator/Tests/crash.Bug-3609.sql rename to sql/backends/monet5/Tests/crash.Bug-3609.sql diff --git a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err b/sql/backends/monet5/Tests/crash.Bug-3609.stable.err rename from sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err rename to sql/backends/monet5/Tests/crash.Bug-3609.stable.err --- a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err +++ b/sql/backends/monet5/Tests/crash.Bug-3609.stable.err @@ -1,4 +1,4 @@ -stderr of test 'crash.Bug-3609` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'crash.Bug-3609` in directory 'sql/backends/monet5` itself: # 22:37:45 > diff --git a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.out b/sql/backends/monet5/Tests/crash.Bug-3609.stable.out rename from sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.out rename to sql/backends/monet5/Tests/crash.Bug-3609.stable.out --- a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.out +++ b/sql/backends/monet5/Tests/crash.Bug-3609.stable.out @@ -1,4 +1,4 @@ -stdout of test 'crash.Bug-3609` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'crash.Bug-3609` in directory 'sql/backends/monet5` itself: # 22:37:45 > diff --git a/sql/backends/monet5/generator/Tests/generator00.sql b/sql/backends/monet5/Tests/generator00.sql rename from sql/backends/monet5/generator/Tests/generator00.sql rename to sql/backends/monet5/Tests/generator00.sql diff --git a/sql/backends/monet5/generator/Tests/generator00.stable.err b/sql/backends/monet5/Tests/generator00.stable.err rename from sql/backends/monet5/generator/Tests/generator00.stable.err rename to sql/backends/monet5/Tests/generator00.stable.err --- a/sql/backends/monet5/generator/Tests/generator00.stable.err +++ b/sql/backends/monet5/Tests/generator00.stable.err @@ -1,4 +1,4 @@ -stderr of test 'generator00` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'generator00` in directory 'sql/backends/monet5` itself: # 18:09:06 > diff --git a/sql/backends/monet5/generator/Tests/generator00.stable.out b/sql/backends/monet5/Tests/generator00.stable.out rename from sql/backends/monet5/generator/Tests/generator00.stable.out rename to sql/backends/monet5/Tests/generator00.stable.out --- a/sql/backends/monet5/generator/Tests/generator00.stable.out +++ b/sql/backends/monet5/Tests/generator00.stable.out @@ -1,4 +1,4 @@ -stdout of test 'generator00` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'generator00` in directory 'sql/backends/monet5` itself: # 18:09:06 > diff --git a/sql/backends/monet5/generator/Tests/generator01.sql b/sql/backends/monet5/Tests/generator01.sql rename from sql/backends/monet5/generator/Tests/generator01.sql rename to sql/backends/monet5/Tests/generator01.sql diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err b/sql/backends/monet5/Tests/generator01.stable.err rename from sql/backends/monet5/generator/Tests/generator01.stable.err rename to sql/backends/monet5/Tests/generator01.stable.err --- a/sql/backends/monet5/generator/Tests/generator01.stable.err +++ b/sql/backends/monet5/Tests/generator01.stable.err @@ -1,4 +1,4 @@ -stderr of test 'generator01` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'generator01` in directory 'sql/backends/monet5` itself: # 12:42:21 > diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.out b/sql/backends/monet5/Tests/generator01.stable.out rename from sql/backends/monet5/generator/Tests/generator01.stable.out rename to sql/backends/monet5/Tests/generator01.stable.out --- a/sql/backends/monet5/generator/Tests/generator01.stable.out +++ b/sql/backends/monet5/Tests/generator01.stable.out @@ -1,4 +1,4 @@ -stdout of test 'generator01` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'generator01` in directory 'sql/backends/monet5` itself: # 12:42:21 > diff --git a/sql/backends/monet5/generator/Tests/generator02.sql b/sql/backends/monet5/Tests/generator02.sql rename from sql/backends/monet5/generator/Tests/generator02.sql rename to sql/backends/monet5/Tests/generator02.sql diff --git a/sql/backends/monet5/generator/Tests/generator02.stable.err b/sql/backends/monet5/Tests/generator02.stable.err rename from sql/backends/monet5/generator/Tests/generator02.stable.err rename to sql/backends/monet5/Tests/generator02.stable.err --- a/sql/backends/monet5/generator/Tests/generator02.stable.err +++ b/sql/backends/monet5/Tests/generator02.stable.err @@ -1,4 +1,4 @@ -stderr of test 'generator02` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'generator02` in directory 'sql/backends/monet5` itself: # 21:17:52 > diff --git a/sql/backends/monet5/generator/Tests/generator02.stable.out b/sql/backends/monet5/Tests/generator02.stable.out rename from sql/backends/monet5/generator/Tests/generator02.stable.out rename to sql/backends/monet5/Tests/generator02.stable.out --- a/sql/backends/monet5/generator/Tests/generator02.stable.out +++ b/sql/backends/monet5/Tests/generator02.stable.out @@ -1,4 +1,4 @@ -stdout of test 'generator02` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'generator02` in directory 'sql/backends/monet5` itself: # 21:17:52 > diff --git a/sql/backends/monet5/generator/Tests/generator03.sql b/sql/backends/monet5/Tests/generator03.sql rename from sql/backends/monet5/generator/Tests/generator03.sql rename to sql/backends/monet5/Tests/generator03.sql diff --git a/sql/backends/monet5/generator/Tests/generator03.stable.err b/sql/backends/monet5/Tests/generator03.stable.err rename from sql/backends/monet5/generator/Tests/generator03.stable.err rename to sql/backends/monet5/Tests/generator03.stable.err --- a/sql/backends/monet5/generator/Tests/generator03.stable.err +++ b/sql/backends/monet5/Tests/generator03.stable.err @@ -1,4 +1,4 @@ -stderr of test 'generator03` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'generator03` in directory 'sql/backends/monet5` itself: # 09:47:33 > diff --git a/sql/backends/monet5/generator/Tests/generator03.stable.out b/sql/backends/monet5/Tests/generator03.stable.out rename from sql/backends/monet5/generator/Tests/generator03.stable.out rename to sql/backends/monet5/Tests/generator03.stable.out --- a/sql/backends/monet5/generator/Tests/generator03.stable.out +++ b/sql/backends/monet5/Tests/generator03.stable.out @@ -1,4 +1,4 @@ -stdout of test 'generator03` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'generator03` in directory 'sql/backends/monet5` itself: # 09:47:33 > diff --git a/sql/backends/monet5/generator/Tests/generator04.sql b/sql/backends/monet5/Tests/generator04.sql rename from sql/backends/monet5/generator/Tests/generator04.sql rename to sql/backends/monet5/Tests/generator04.sql diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.err b/sql/backends/monet5/Tests/generator04.stable.err rename from sql/backends/monet5/generator/Tests/generator04.stable.err rename to sql/backends/monet5/Tests/generator04.stable.err --- a/sql/backends/monet5/generator/Tests/generator04.stable.err +++ b/sql/backends/monet5/Tests/generator04.stable.err @@ -1,4 +1,4 @@ -stderr of test 'generator04` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'generator04` in directory 'sql/backends/monet5` itself: # 21:38:52 > diff --git a/sql/backends/monet5/generator/Tests/generator04.stable.out b/sql/backends/monet5/Tests/generator04.stable.out rename from sql/backends/monet5/generator/Tests/generator04.stable.out rename to sql/backends/monet5/Tests/generator04.stable.out --- a/sql/backends/monet5/generator/Tests/generator04.stable.out +++ b/sql/backends/monet5/Tests/generator04.stable.out @@ -1,4 +1,4 @@ -stdout of test 'generator04` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'generator04` in directory 'sql/backends/monet5` itself: # 21:18:55 > diff --git a/sql/backends/monet5/generator/Tests/joins00.sql b/sql/backends/monet5/Tests/joins00.sql rename from sql/backends/monet5/generator/Tests/joins00.sql rename to sql/backends/monet5/Tests/joins00.sql diff --git a/sql/backends/monet5/generator/Tests/joins00.stable.err b/sql/backends/monet5/Tests/joins00.stable.err rename from sql/backends/monet5/generator/Tests/joins00.stable.err rename to sql/backends/monet5/Tests/joins00.stable.err --- a/sql/backends/monet5/generator/Tests/joins00.stable.err +++ b/sql/backends/monet5/Tests/joins00.stable.err @@ -1,4 +1,4 @@ -stderr of test 'joins00` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'joins00` in directory 'sql/backends/monet5` itself: # 14:48:53 > diff --git a/sql/backends/monet5/generator/Tests/joins00.stable.out b/sql/backends/monet5/Tests/joins00.stable.out rename from sql/backends/monet5/generator/Tests/joins00.stable.out rename to sql/backends/monet5/Tests/joins00.stable.out --- a/sql/backends/monet5/generator/Tests/joins00.stable.out +++ b/sql/backends/monet5/Tests/joins00.stable.out @@ -1,4 +1,4 @@ -stdout of test 'joins00` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'joins00` in directory 'sql/backends/monet5` itself: # 14:48:53 > diff --git a/sql/backends/monet5/generator/Tests/joins01.sql b/sql/backends/monet5/Tests/joins01.sql rename from sql/backends/monet5/generator/Tests/joins01.sql rename to sql/backends/monet5/Tests/joins01.sql diff --git a/sql/backends/monet5/generator/Tests/joins01.stable.err b/sql/backends/monet5/Tests/joins01.stable.err rename from sql/backends/monet5/generator/Tests/joins01.stable.err rename to sql/backends/monet5/Tests/joins01.stable.err --- a/sql/backends/monet5/generator/Tests/joins01.stable.err +++ b/sql/backends/monet5/Tests/joins01.stable.err @@ -1,4 +1,4 @@ -stderr of test 'joins01` in directory 'sql/backends/monet5/generator` itself: +stderr of test 'joins01` in directory 'sql/backends/monet5` itself: # 11:37:00 > diff --git a/sql/backends/monet5/generator/Tests/joins01.stable.out b/sql/backends/monet5/Tests/joins01.stable.out rename from sql/backends/monet5/generator/Tests/joins01.stable.out rename to sql/backends/monet5/Tests/joins01.stable.out --- a/sql/backends/monet5/generator/Tests/joins01.stable.out +++ b/sql/backends/monet5/Tests/joins01.stable.out @@ -1,4 +1,4 @@ -stdout of test 'joins01` in directory 'sql/backends/monet5/generator` itself: +stdout of test 'joins01` in directory 'sql/backends/monet5` itself: _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
