postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-18 19:59:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests and function naming after rebase

Browse Source 
Small fixup after rebase on the master branch. Fixes test
output and function naming (even test functions should
have the ts_ not the tsl_ prefix for exported C functions).
This commit is contained in:
Matvey Arye 2019-10-15 21:27:48 -04:00 committed by Matvey Arye
parent 28653640af
commit c4efacdc92
5 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hypertable.c
View File

@ -2032,7 +2032,6 @@ ts_hypertable_set_integer_now_func(PG_FUNCTION_ARGS)
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
/*Assume permissions are already checked */ /*Assume permissions are already checked */
bool bool
ts_hypertable_set_compressed_id(Hypertable *ht, int32 compressed_hypertable_id) ts_hypertable_set_compressed_id(Hypertable *ht, int32 compressed_hypertable_id)

6
tsl/test/expected/compression_bgw.out
View File

@ -65,9 +65,9 @@ select * from _timescaledb_config.bgw_job where job_type like 'compress%';
select * from alter_job_schedule(:compressjob_id, schedule_interval=>'1s'); select * from alter_job_schedule(:compressjob_id, schedule_interval=>'1s');
WARNING: Timescale License expired WARNING: Timescale License expired
job_id | schedule_interval | max_runtime | max_retries | retry_period job_id | schedule_interval | max_runtime | max_retries | retry_period | next_start
--------+-------------------+-------------+-------------+-------------- --------+-------------------+-------------+-------------+--------------+------------
1000 | @ 1 sec | @ 0 | -1 | @ 1 hour 1000 | @ 1 sec | @ 0 | -1 | @ 1 hour | -infinity
(1 row) (1 row)
select * from _timescaledb_config.bgw_job where job_type like 'compress%'; select * from _timescaledb_config.bgw_job where job_type like 'compress%';

20
tsl/test/expected/compression_segment_meta.out
View File

@ -2,28 +2,28 @@
-- Please see the included NOTICE for copyright information and -- Please see the included NOTICE for copyright information and
-- LICENSE-TIMESCALE for a copy of the license. -- LICENSE-TIMESCALE for a copy of the license.
\c :TEST_DBNAME :ROLE_SUPERUSER \c :TEST_DBNAME :ROLE_SUPERUSER
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_append(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_append(internal, ANYELEMENT)
RETURNS internal RETURNS internal
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_append' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_append'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_finish_max(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_finish_max(internal, ANYELEMENT)
RETURNS anyelement RETURNS anyelement
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_finish_max' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_finish_max'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_finish_min(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_finish_min(internal, ANYELEMENT)
RETURNS anyelement RETURNS anyelement
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_finish_min' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_finish_min'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) ( CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) (
STYPE = internal, STYPE = internal,
SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append,
FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_min, FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_min,
FINALFUNC_EXTRA FINALFUNC_EXTRA
); );
CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) ( CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) (
STYPE = internal, STYPE = internal,
SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append,
FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_max, FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_max,
FINALFUNC_EXTRA FINALFUNC_EXTRA
); );
\ir include/rand_generator.sql \ir include/rand_generator.sql

20
tsl/test/sql/compression_segment_meta.sql
View File

@ -4,32 +4,32 @@
\c :TEST_DBNAME :ROLE_SUPERUSER \c :TEST_DBNAME :ROLE_SUPERUSER
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_append(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_append(internal, ANYELEMENT)
RETURNS internal RETURNS internal
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_append' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_append'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_finish_max(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_finish_max(internal, ANYELEMENT)
RETURNS anyelement RETURNS anyelement
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_finish_max' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_finish_max'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE OR REPLACE FUNCTION _timescaledb_internal.tsl_segment_meta_min_max_finish_min(internal, ANYELEMENT) CREATE OR REPLACE FUNCTION _timescaledb_internal.ts_segment_meta_min_max_finish_min(internal, ANYELEMENT)
RETURNS anyelement RETURNS anyelement
AS :TSL_MODULE_PATHNAME, 'tsl_segment_meta_min_max_finish_min' AS :TSL_MODULE_PATHNAME, 'ts_segment_meta_min_max_finish_min'
LANGUAGE C IMMUTABLE PARALLEL SAFE; LANGUAGE C IMMUTABLE PARALLEL SAFE;
CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) ( CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) (
STYPE = internal, STYPE = internal,
SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append,
FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_min, FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_min,
FINALFUNC_EXTRA FINALFUNC_EXTRA
); );
CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) ( CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) (
STYPE = internal, STYPE = internal,
SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append,
FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_max, FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_max,
FINALFUNC_EXTRA FINALFUNC_EXTRA
); );

14
tsl/test/src/test_compression.c
View File

@ -545,10 +545,10 @@ ts_decompress_table(PG_FUNCTION_ARGS)
PG_RETURN_VOID(); PG_RETURN_VOID();
} }
TS_FUNCTION_INFO_V1(tsl_segment_meta_min_max_append); TS_FUNCTION_INFO_V1(ts_segment_meta_min_max_append);
Datum Datum
tsl_segment_meta_min_max_append(PG_FUNCTION_ARGS) ts_segment_meta_min_max_append(PG_FUNCTION_ARGS)
{ {
SegmentMetaMinMaxBuilder *builder = SegmentMetaMinMaxBuilder *builder =
(SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0)); (SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0));
@ -558,7 +558,7 @@ tsl_segment_meta_min_max_append(PG_FUNCTION_ARGS)
if (!AggCheckCallContext(fcinfo, &agg_context)) if (!AggCheckCallContext(fcinfo, &agg_context))
{ {
/* cannot be called directly because of internal-type argument */ /* cannot be called directly because of internal-type argument */
elog(ERROR, "tsl_segment_meta_min_max_append called in non-aggregate context"); elog(ERROR, "ts_segment_meta_min_max_append called in non-aggregate context");
} }
old_context = MemoryContextSwitchTo(agg_context); old_context = MemoryContextSwitchTo(agg_context);
@ -577,9 +577,9 @@ tsl_segment_meta_min_max_append(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(builder); PG_RETURN_POINTER(builder);
} }
TS_FUNCTION_INFO_V1(tsl_segment_meta_min_max_finish_max); TS_FUNCTION_INFO_V1(ts_segment_meta_min_max_finish_max);
Datum Datum
tsl_segment_meta_min_max_finish_max(PG_FUNCTION_ARGS) ts_segment_meta_min_max_finish_max(PG_FUNCTION_ARGS)
{ {
SegmentMetaMinMaxBuilder *builder = SegmentMetaMinMaxBuilder *builder =
(SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0)); (SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0));
@ -590,9 +590,9 @@ tsl_segment_meta_min_max_finish_max(PG_FUNCTION_ARGS)
PG_RETURN_DATUM(segment_meta_min_max_builder_max(builder)); PG_RETURN_DATUM(segment_meta_min_max_builder_max(builder));
} }
TS_FUNCTION_INFO_V1(tsl_segment_meta_min_max_finish_min); TS_FUNCTION_INFO_V1(ts_segment_meta_min_max_finish_min);
Datum Datum
tsl_segment_meta_min_max_finish_min(PG_FUNCTION_ARGS) ts_segment_meta_min_max_finish_min(PG_FUNCTION_ARGS)
{ {
SegmentMetaMinMaxBuilder *builder = SegmentMetaMinMaxBuilder *builder =
(SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0)); (SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0));