Changeset: e63096367379 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e63096367379 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 sql/backends/monet5/generator/90_generator.sql sql/backends/monet5/generator/90_generator_hge.sql sql/backends/monet5/generator/generator.mal sql/backends/monet5/generator/generator_hge.mal sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: Aug2018 Log Message:
Changed parameter name from "last" to "limit". This should alleviate bug 6606. diffs (truncated from 571 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -10024,19 +10024,19 @@ Ready. [ "generator", "join", "pattern generator.join(gen:bat[:int], low:bat[:int], hgh:bat[:int], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] [ "generator", "join", "pattern generator.join(gen:bat[:lng], low:bat[:lng], hgh:bat[:lng], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] [ "generator", "join", "pattern generator.join(gen:bat[:sht], low:bat[:sht], hgh:bat[:sht], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:bte, last:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:bte, last:bte, step:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:dbl, last:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:dbl, last:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:flt, last:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:flt, last:flt, step:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:int, last:int):bat[:int] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:int, last:int, step:int):bat[:int] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:lng, last:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:lng, last:lng, step:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:sht, last:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:sht, last:sht, step:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:timestamp, last:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] +[ "generator", "parameters", "pattern generator.parameters(first:bte, limit:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:bte, limit:bte, step:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:dbl, limit:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:dbl, limit:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:flt, limit:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:flt, limit:flt, step:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:int, limit:int):bat[:int] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:int, limit:int, step:int):bat[:int] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:lng, limit:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:lng, limit:lng, step:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:sht, limit:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:sht, limit:sht, step:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:timestamp, limit:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:bte]):bat[:bte] ", "VLTgenerator_projection;", "" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:dbl]):bat[:dbl] ", "VLTgenerator_projection;", "" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:flt]):bat[:flt] ", "VLTgenerator_projection;", "" ] @@ -10058,19 +10058,19 @@ Ready. [ "generator", "select", "pattern generator.select(b:bat[:sht], low:sht, high:sht, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "" ] [ "generator", "select", "pattern generator.select(b:bat[:timestamp], cand:bat[:oid], low:timestamp, high:timestamp, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "Overloaded selection routine" ] [ "generator", "select", "pattern generator.select(b:bat[:timestamp], low:timestamp, high:timestamp, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "Overloaded selection routine" ] -[ "generator", "series", "pattern generator.series(first:bte, last:bte):bat[:bte] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:bte, last:bte, step:bte):bat[:bte] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:dbl, last:dbl):bat[:dbl] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:dbl, last:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_table;", "Create and materialize a generator table" ] -[ "generator", "series", "pattern generator.series(first:flt, last:flt):bat[:flt] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:flt, last:flt, step:flt):bat[:flt] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:int, last:int):bat[:int] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:int, last:int, step:int):bat[:int] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:lng, last:lng):bat[:lng] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:lng, last:lng, step:lng):bat[:lng] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:sht, last:sht):bat[:sht] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:sht, last:sht, step:sht):bat[:sht] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:timestamp, last:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:bte, limit:bte):bat[:bte] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:bte, limit:bte, step:bte):bat[:bte] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:dbl, limit:dbl):bat[:dbl] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:dbl, limit:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_table;", "Create and materialize a generator table" ] +[ "generator", "series", "pattern generator.series(first:flt, limit:flt):bat[:flt] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:flt, limit:flt, step:flt):bat[:flt] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:int, limit:int):bat[:int] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:int, limit:int, step:int):bat[:int] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:lng, limit:lng):bat[:lng] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:lng, limit:lng, step:lng):bat[:lng] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:sht, limit:sht):bat[:sht] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:sht, limit:sht, step:sht):bat[:sht] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:timestamp, limit:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_table;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:bte], cnd:bat[:oid], low:bte, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:bte], low:bte, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:dbl], cnd:bat[:oid], low:dbl, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -14220,21 +14220,21 @@ Ready. [ "generator", "join", "pattern generator.join(gen:bat[:int], low:bat[:int], hgh:bat[:int], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] [ "generator", "join", "pattern generator.join(gen:bat[:lng], low:bat[:lng], hgh:bat[:lng], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] [ "generator", "join", "pattern generator.join(gen:bat[:sht], low:bat[:sht], hgh:bat[:sht], li:bit, ri:bit) (l:bat[:oid], r:bat[:oid]) ", "VLTgenerator_rangejoin;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:bte, last:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:bte, last:bte, step:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:dbl, last:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:dbl, last:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:flt, last:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:flt, last:flt, step:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:hge, last:hge):bat[:hge] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:hge, last:hge, step:hge):bat[:hge] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] -[ "generator", "parameters", "pattern generator.parameters(first:int, last:int):bat[:int] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:int, last:int, step:int):bat[:int] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:lng, last:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:lng, last:lng, step:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:sht, last:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:sht, last:sht, step:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] -[ "generator", "parameters", "pattern generator.parameters(first:timestamp, last:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] +[ "generator", "parameters", "pattern generator.parameters(first:bte, limit:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:bte, limit:bte, step:bte):bat[:bte] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:dbl, limit:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:dbl, limit:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:flt, limit:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:flt, limit:flt, step:flt):bat[:flt] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:hge, limit:hge):bat[:hge] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:hge, limit:hge, step:hge):bat[:hge] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] +[ "generator", "parameters", "pattern generator.parameters(first:int, limit:int):bat[:int] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:int, limit:int, step:int):bat[:int] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:lng, limit:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:lng, limit:lng, step:lng):bat[:lng] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:sht, limit:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:sht, limit:sht, step:sht):bat[:sht] ", "VLTgenerator_noop;", "" ] +[ "generator", "parameters", "pattern generator.parameters(first:timestamp, limit:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_noop;", "Retain the table definition, but don't materialize" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:bte]):bat[:bte] ", "VLTgenerator_projection;", "" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:dbl]):bat[:dbl] ", "VLTgenerator_projection;", "" ] [ "generator", "projection", "pattern generator.projection(b:bat[:oid], cand:bat[:flt]):bat[:flt] ", "VLTgenerator_projection;", "" ] @@ -14259,21 +14259,21 @@ Ready. [ "generator", "select", "pattern generator.select(b:bat[:sht], low:sht, high:sht, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "" ] [ "generator", "select", "pattern generator.select(b:bat[:timestamp], cand:bat[:oid], low:timestamp, high:timestamp, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "Overloaded selection routine" ] [ "generator", "select", "pattern generator.select(b:bat[:timestamp], low:timestamp, high:timestamp, li:bit, hi:bit, anti:bit):bat[:oid] ", "VLTgenerator_subselect;", "Overloaded selection routine" ] -[ "generator", "series", "pattern generator.series(first:bte, last:bte):bat[:bte] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:bte, last:bte, step:bte):bat[:bte] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:dbl, last:dbl):bat[:dbl] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:dbl, last:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_table;", "Create and materialize a generator table" ] -[ "generator", "series", "pattern generator.series(first:flt, last:flt):bat[:flt] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:flt, last:flt, step:flt):bat[:flt] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:hge, last:hge):bat[:hge] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:hge, last:hge, step:hge):bat[:hge] ", "VLTgenerator_table;", "Create and materialize a generator table" ] -[ "generator", "series", "pattern generator.series(first:int, last:int):bat[:int] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:int, last:int, step:int):bat[:int] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:lng, last:lng):bat[:lng] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:lng, last:lng, step:lng):bat[:lng] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:sht, last:sht):bat[:sht] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:sht, last:sht, step:sht):bat[:sht] ", "VLTgenerator_table;", "" ] -[ "generator", "series", "pattern generator.series(first:timestamp, last:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:bte, limit:bte):bat[:bte] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:bte, limit:bte, step:bte):bat[:bte] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:dbl, limit:dbl):bat[:dbl] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:dbl, limit:dbl, step:dbl):bat[:dbl] ", "VLTgenerator_table;", "Create and materialize a generator table" ] +[ "generator", "series", "pattern generator.series(first:flt, limit:flt):bat[:flt] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:flt, limit:flt, step:flt):bat[:flt] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:hge, limit:hge):bat[:hge] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:hge, limit:hge, step:hge):bat[:hge] ", "VLTgenerator_table;", "Create and materialize a generator table" ] +[ "generator", "series", "pattern generator.series(first:int, limit:int):bat[:int] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:int, limit:int, step:int):bat[:int] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:lng, limit:lng):bat[:lng] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:lng, limit:lng, step:lng):bat[:lng] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:sht, limit:sht):bat[:sht] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:sht, limit:sht, step:sht):bat[:sht] ", "VLTgenerator_table;", "" ] +[ "generator", "series", "pattern generator.series(first:timestamp, limit:timestamp, step:lng):bat[:timestamp] ", "VLTgenerator_table;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:bte], cnd:bat[:oid], low:bte, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:bte], low:bte, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] [ "generator", "thetaselect", "pattern generator.thetaselect(b:bat[:dbl], cnd:bat[:oid], low:dbl, oper:str):bat[:oid] ", "VLTgenerator_thetasubselect;", "" ] 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 @@ -6,50 +6,50 @@ -- (c) Author M.Kersten -create function sys.generate_series(first tinyint, last tinyint) +create function sys.generate_series(first tinyint, "limit" tinyint) returns table (value tinyint) external name generator.series; -create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint) +create function sys.generate_series(first tinyint, "limit" tinyint, stepsize tinyint) returns table (value tinyint) external name generator.series; -create function sys.generate_series(first smallint, last smallint) +create function sys.generate_series(first smallint, "limit" smallint) returns table (value smallint) external name generator.series; -create function sys.generate_series(first smallint, last smallint, stepsize smallint) +create function sys.generate_series(first smallint, "limit" smallint, stepsize smallint) returns table (value smallint) external name generator.series; -create function sys.generate_series(first int, last int) +create function sys.generate_series(first int, "limit" int) returns table (value int) external name generator.series; -create function sys.generate_series(first int, last int, stepsize int) +create function sys.generate_series(first int, "limit" int, stepsize int) returns table (value int) external name generator.series; -create function sys.generate_series(first bigint, last bigint) +create function sys.generate_series(first bigint, "limit" bigint) returns table (value bigint) external name generator.series; -create function sys.generate_series(first bigint, last bigint, stepsize bigint) +create function sys.generate_series(first bigint, "limit" bigint, stepsize bigint) returns table (value bigint) external name generator.series; -create function sys.generate_series(first real, last real, stepsize real) +create function sys.generate_series(first real, "limit" real, stepsize real) returns table (value real) external name generator.series; -create function sys.generate_series(first double, last double, stepsize double) +create function sys.generate_series(first double, "limit" double, stepsize double) returns table (value double) external name generator.series; -create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2)) +create function sys.generate_series(first decimal(10,2), "limit" decimal(10,2), stepsize decimal(10,2)) returns table (value decimal(10,2)) external name generator.series; -create function sys.generate_series(first timestamp, last timestamp, stepsize interval second) +create function sys.generate_series(first timestamp, "limit" timestamp, stepsize interval second) returns table (value timestamp) external name generator.series; diff --git a/sql/backends/monet5/generator/90_generator_hge.sql b/sql/backends/monet5/generator/90_generator_hge.sql --- a/sql/backends/monet5/generator/90_generator_hge.sql +++ b/sql/backends/monet5/generator/90_generator_hge.sql @@ -6,10 +6,10 @@ -- (c) Author M.Kersten -create function sys.generate_series(first hugeint, last hugeint) +create function sys.generate_series(first hugeint, "limit" hugeint) returns table (value hugeint) external name generator.series; -create function sys.generate_series(first hugeint, last hugeint, stepsize hugeint) +create function sys.generate_series(first hugeint, "limit" hugeint, stepsize hugeint) returns table (value hugeint) 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 @@ -6,84 +6,84 @@ module generator; -pattern series(first:bte,last:bte):bat[:bte] +pattern series(first:bte,limit:bte):bat[:bte] address VLTgenerator_table; -pattern series(first:sht,last:sht):bat[:sht] +pattern series(first:sht,limit:sht):bat[:sht] address VLTgenerator_table; -pattern series(first:int,last:int):bat[:int] +pattern series(first:int,limit:int):bat[:int] address VLTgenerator_table; -pattern series(first:lng,last:lng):bat[:lng] +pattern series(first:lng,limit:lng):bat[:lng] address VLTgenerator_table; -pattern series(first:flt,last:flt):bat[:flt] +pattern series(first:flt,limit:flt):bat[:flt] address VLTgenerator_table; -pattern series(first:dbl,last:dbl):bat[:dbl] +pattern series(first:dbl,limit:dbl):bat[:dbl] address VLTgenerator_table; -pattern series(first:bte,last:bte,step:bte):bat[:bte] +pattern series(first:bte,limit:bte,step:bte):bat[:bte] address VLTgenerator_table; -pattern series(first:sht,last:sht,step:sht):bat[:sht] +pattern series(first:sht,limit:sht,step:sht):bat[:sht] address VLTgenerator_table; -pattern series(first:int,last:int,step:int):bat[:int] +pattern series(first:int,limit:int,step:int):bat[:int] address VLTgenerator_table; -pattern series(first:lng,last:lng,step:lng):bat[:lng] +pattern series(first:lng,limit:lng,step:lng):bat[:lng] address VLTgenerator_table; -pattern series(first:flt,last:flt,step:flt):bat[:flt] +pattern series(first:flt,limit:flt,step:flt):bat[:flt] address VLTgenerator_table; -pattern series(first:dbl,last:dbl,step:dbl):bat[:dbl] +pattern series(first:dbl,limit:dbl,step:dbl):bat[:dbl] address VLTgenerator_table comment "Create and materialize a generator table"; -pattern series(first:timestamp,last:timestamp,step:lng):bat[:timestamp] +pattern series(first:timestamp,limit:timestamp,step:lng):bat[:timestamp] address VLTgenerator_table; -pattern parameters(first:bte,last:bte,step:bte):bat[:bte] +pattern parameters(first:bte,limit:bte,step:bte):bat[:bte] address VLTgenerator_noop; -pattern parameters(first:sht,last:sht,step:sht):bat[:sht] +pattern parameters(first:sht,limit:sht,step:sht):bat[:sht] address VLTgenerator_noop; -pattern parameters(first:int,last:int,step:int):bat[:int] +pattern parameters(first:int,limit:int,step:int):bat[:int] address VLTgenerator_noop; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list