Changeset: ab29ccc411a7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab29ccc411a7 Modified Files: sql/backends/monet5/generator/90_generator.sql sql/backends/monet5/generator/generator.mal Branch: generator Log Message:
Simplify naming schemes diffs (130 lines): diff --git a/sql/backends/monet5/generator/90_generator.sql b/sql/backends/monet5/generator/90_generator.sql --- a/sql/backends/monet5/generator/90_generator.sql +++ b/sql/backends/monet5/generator/90_generator.sql @@ -15,47 +15,44 @@ -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. --- Author M.Kersten --- The vault is the container for all foreign file support functionalities - --- example of a (void) foreign file interface +-- (c) Author M.Kersten create function sys.generate_series(first tinyint, last tinyint) returns table (value tinyint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint) returns table (value tinyint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first int, last int) returns table (value int) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first int, last int, stepsize int) returns table (value int) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first bigint, last bigint) returns table (value bigint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first bigint, last bigint, stepsize bigint) returns table (value bigint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first real, last real, stepsize real) returns table (value real) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first double, last double, stepsize double) returns table (value double) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2)) returns table (value decimal(10,2)) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first timestamp, last timestamp, stepsize interval second) returns table (value timestamp) -external name vault.generate_series; +external name generator.series; diff --git a/sql/backends/monet5/generator/generator.mal b/sql/backends/monet5/generator/generator.mal --- a/sql/backends/monet5/generator/generator.mal +++ b/sql/backends/monet5/generator/generator.mal @@ -15,50 +15,48 @@ # Copyright August 2008-2014 MonetDB B.V. # All Rights Reserved. -module vault; +module generator; -pattern generate_series(first:bte,last:bte):bat[:oid,:bte] +pattern series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; -pattern generate_series(first:sht,last:sht):bat[:oid,:sht] +pattern series(first:sht,last:sht):bat[:oid,:sht] address VLTgenerator_table; -pattern generate_series(first:int,last:int):bat[:oid,:int] +pattern series(first:int,last:int):bat[:oid,:int] address VLTgenerator_table; -pattern generate_series(first:lng,last:lng):bat[:oid,:lng] +pattern series(first:lng,last:lng):bat[:oid,:lng] address VLTgenerator_table; -pattern generate_series(first:flt,last:flt):bat[:oid,:flt] +pattern series(first:flt,last:flt):bat[:oid,:flt] address VLTgenerator_table; -pattern generate_series(first:dbl,last:dbl):bat[:oid,:dbl] +pattern series(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_table; -pattern generate_series(first:bte,last:bte,step:bte):bat[:oid,:bte] +pattern series(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_table; -pattern generate_series(first:sht,last:sht,step:sht):bat[:oid,:sht] +pattern series(first:sht,last:sht,step:sht):bat[:oid,:sht] address VLTgenerator_table; -pattern generate_series(first:int,last:int,step:int):bat[:oid,:int] +pattern series(first:int,last:int,step:int):bat[:oid,:int] address VLTgenerator_table; -pattern generate_series(first:lng,last:lng,step:lng):bat[:oid,:lng] +pattern series(first:lng,last:lng,step:lng):bat[:oid,:lng] address VLTgenerator_table; -pattern generate_series(first:flt,last:flt,step:flt):bat[:oid,:flt] +pattern series(first:flt,last:flt,step:flt):bat[:oid,:flt] address VLTgenerator_table; -pattern generate_series(first:dbl,last:dbl,step:dbl):bat[:oid,:dbl] +pattern series(first:dbl,last:dbl,step:dbl):bat[:oid,:dbl] address VLTgenerator_table comment "Create and materialize a generator table"; -pattern generate_series(first:timestamp,last:timestamp,step:lng):bat[:oid,:timestamp] +pattern series(first:timestamp,last:timestamp,step:lng):bat[:oid,:timestamp] address VLTgenerator_table; -module generator; - pattern parameters(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_noop; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
