From c4efacdc926aa541dbc68f9aa5179c639998bd7a Mon Sep 17 00:00:00 2001 From: Matvey Arye Date: Tue, 15 Oct 2019 21:27:48 -0400 Subject: [PATCH] Fix tests and function naming after rebase 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). --- src/hypertable.c | 1 - tsl/test/expected/compression_bgw.out | 6 +++--- .../expected/compression_segment_meta.out | 20 +++++++++---------- tsl/test/sql/compression_segment_meta.sql | 20 +++++++++---------- tsl/test/src/test_compression.c | 14 ++++++------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/hypertable.c b/src/hypertable.c index 5f11544a4..418584194 100644 --- a/src/hypertable.c +++ b/src/hypertable.c @@ -2032,7 +2032,6 @@ ts_hypertable_set_integer_now_func(PG_FUNCTION_ARGS) PG_RETURN_NULL(); } - /*Assume permissions are already checked */ bool ts_hypertable_set_compressed_id(Hypertable *ht, int32 compressed_hypertable_id) diff --git a/tsl/test/expected/compression_bgw.out b/tsl/test/expected/compression_bgw.out index 586611618..1243a8caa 100644 --- a/tsl/test/expected/compression_bgw.out +++ b/tsl/test/expected/compression_bgw.out @@ -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'); WARNING: Timescale License expired - job_id | schedule_interval | max_runtime | max_retries | retry_period ---------+-------------------+-------------+-------------+-------------- - 1000 | @ 1 sec | @ 0 | -1 | @ 1 hour + job_id | schedule_interval | max_runtime | max_retries | retry_period | next_start +--------+-------------------+-------------+-------------+--------------+------------ + 1000 | @ 1 sec | @ 0 | -1 | @ 1 hour | -infinity (1 row) select * from _timescaledb_config.bgw_job where job_type like 'compress%'; diff --git a/tsl/test/expected/compression_segment_meta.out b/tsl/test/expected/compression_segment_meta.out index 7fea702bc..ae0a4f49d 100644 --- a/tsl/test/expected/compression_segment_meta.out +++ b/tsl/test/expected/compression_segment_meta.out @@ -2,28 +2,28 @@ -- Please see the included NOTICE for copyright information and -- LICENSE-TIMESCALE for a copy of the license. \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 - 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; -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 - 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; -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 - 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; CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) ( STYPE = internal, - SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, - FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_min, + SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append, + FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_min, FINALFUNC_EXTRA ); CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) ( STYPE = internal, - SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, - FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_max, + SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append, + FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_max, FINALFUNC_EXTRA ); \ir include/rand_generator.sql diff --git a/tsl/test/sql/compression_segment_meta.sql b/tsl/test/sql/compression_segment_meta.sql index f1018078a..69e6a2f4a 100644 --- a/tsl/test/sql/compression_segment_meta.sql +++ b/tsl/test/sql/compression_segment_meta.sql @@ -4,32 +4,32 @@ \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 - 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; -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 - 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; -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 - 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; CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_min(ANYELEMENT) ( STYPE = internal, - SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, - FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_min, + SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append, + FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_min, FINALFUNC_EXTRA ); CREATE AGGREGATE _timescaledb_internal.segment_meta_min_max_agg_max(ANYELEMENT) ( STYPE = internal, - SFUNC = _timescaledb_internal.tsl_segment_meta_min_max_append, - FINALFUNC = _timescaledb_internal.tsl_segment_meta_min_max_finish_max, + SFUNC = _timescaledb_internal.ts_segment_meta_min_max_append, + FINALFUNC = _timescaledb_internal.ts_segment_meta_min_max_finish_max, FINALFUNC_EXTRA ); diff --git a/tsl/test/src/test_compression.c b/tsl/test/src/test_compression.c index ab7ff98a4..852f2c6af 100644 --- a/tsl/test/src/test_compression.c +++ b/tsl/test/src/test_compression.c @@ -545,10 +545,10 @@ ts_decompress_table(PG_FUNCTION_ARGS) PG_RETURN_VOID(); } -TS_FUNCTION_INFO_V1(tsl_segment_meta_min_max_append); +TS_FUNCTION_INFO_V1(ts_segment_meta_min_max_append); Datum -tsl_segment_meta_min_max_append(PG_FUNCTION_ARGS) +ts_segment_meta_min_max_append(PG_FUNCTION_ARGS) { SegmentMetaMinMaxBuilder *builder = (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)) { /* 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); @@ -577,9 +577,9 @@ tsl_segment_meta_min_max_append(PG_FUNCTION_ARGS) 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 -tsl_segment_meta_min_max_finish_max(PG_FUNCTION_ARGS) +ts_segment_meta_min_max_finish_max(PG_FUNCTION_ARGS) { SegmentMetaMinMaxBuilder *builder = (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)); } -TS_FUNCTION_INFO_V1(tsl_segment_meta_min_max_finish_min); +TS_FUNCTION_INFO_V1(ts_segment_meta_min_max_finish_min); Datum -tsl_segment_meta_min_max_finish_min(PG_FUNCTION_ARGS) +ts_segment_meta_min_max_finish_min(PG_FUNCTION_ARGS) { SegmentMetaMinMaxBuilder *builder = (SegmentMetaMinMaxBuilder *) (PG_ARGISNULL(0) ? NULL : PG_GETARG_POINTER(0));