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

Fix various misspellings

Browse Source 
This patch fixes various misspellings of committed, constraint and
insufficient in code, comments and documentation.
This commit is contained in:
Josh Soref 2022-03-14 11:11:06 -04:00 committed by Sven Klemm
parent b0695e788a
commit 68aec9593c
19 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -58,7 +58,7 @@ The release also includes several bug fixes. Telemetry reports now include new a
**Bugfixes** **Bugfixes**
* #3808 Properly handle `max_retries` option * #3808 Properly handle `max_retries` option
* #3863 Fix remote transaction heal logic * #3863 Fix remote transaction heal logic
* #3869 Fix ALTER SET/DROP NULL contstraint on distributed hypertable * #3869 Fix ALTER SET/DROP NULL constraint on distributed hypertable
* #3944 Fix segfault in add_compression_policy * #3944 Fix segfault in add_compression_policy
* #3961 Fix crash in EXPLAIN VERBOSE on distributed hypertable * #3961 Fix crash in EXPLAIN VERBOSE on distributed hypertable
* #4015 Eliminate float rounding instabilities in interpolate * #4015 Eliminate float rounding instabilities in interpolate

2
src/hypertable.c
View File

@ -1665,7 +1665,7 @@ ts_hypertable_check_partitioning(const Hypertable *ht, int32 id_of_updated_dimen
num_nodes > first_closed_dim->fd.num_slices) num_nodes > first_closed_dim->fd.num_slices)
ereport(WARNING, ereport(WARNING,
(errcode(ERRCODE_WARNING), (errcode(ERRCODE_WARNING),
errmsg("insuffient number of partitions for dimension \"%s\"", errmsg("insufficient number of partitions for dimension \"%s\"",
NameStr(dim->fd.column_name)), NameStr(dim->fd.column_name)),
errdetail("There are not enough partitions to make" errdetail("There are not enough partitions to make"
" use of all data nodes."), " use of all data nodes."),

2
src/process_utility.c
View File

@ -301,7 +301,7 @@ check_altertable_add_column_for_compressed(Hypertable *ht, ColumnDef *col)
{ {
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot add column with NOT NULL contraint without default " errmsg("cannot add column with NOT NULL constraint without default "
"to a hypertable that has compression enabled"))); "to a hypertable that has compression enabled")));
} }
} }

2
test/sql/updates/setup.repair.sql
View File

@ -53,7 +53,7 @@ INSERT INTO repair_test_date VALUES
-- --
-- This way if there are constraint violations remaining that wasn't -- This way if there are constraint violations remaining that wasn't
-- repaired properly, we will notice them when restoring the -- repaired properly, we will notice them when restoring the
-- contraint. -- constraint.
ALTER TABLE _timescaledb_catalog.chunk_constraint ALTER TABLE _timescaledb_catalog.chunk_constraint
DROP CONSTRAINT chunk_constraint_dimension_slice_id_fkey; DROP CONSTRAINT chunk_constraint_dimension_slice_id_fkey;

2
tsl/src/remote/txn.c
View File

@ -60,7 +60,7 @@ typedef struct RemoteTxn
* multiple remote commands to be executed (e.g. a join of two tables on one remote * multiple remote commands to be executed (e.g. a join of two tables on one remote
* node might not be pushed down and instead two different queries are sent * node might not be pushed down and instead two different queries are sent
* to the remote node, one for each table in the join). Since in READ * to the remote node, one for each table in the join). Since in READ
* COMMITED the snapshot is refreshed on each command, the semantics are off * COMMITTED the snapshot is refreshed on each command, the semantics are off
* when multiple commands are meant to be part of the same one. * when multiple commands are meant to be part of the same one.
* *
* This isn't great but we have no alternative unless we ensure that each access * This isn't great but we have no alternative unless we ensure that each access

2
tsl/test/expected/chunk_api.out
View File

@ -803,7 +803,7 @@ FROM _timescaledb_internal.show_chunk(:'CHUNK_SCHEMA'||'.'||:'CHUNK_NAME') \gset
CREATE TABLE original_chunk_constraints AS CREATE TABLE original_chunk_constraints AS
SELECT "Constraint", "Type", "Columns", "Index"::text, "Expr", "Deferrable", "Deferred", "Validated" SELECT "Constraint", "Type", "Columns", "Index"::text, "Expr", "Deferrable", "Deferred", "Validated"
FROM test.show_constraints(format('%I.%I', :'CHUNK_SCHEMA', :'CHUNK_NAME')::regclass); FROM test.show_constraints(format('%I.%I', :'CHUNK_SCHEMA', :'CHUNK_NAME')::regclass);
-- Save contraints metadata -- Save constraints metadata
CREATE TABLE original_chunk_constraints_metadata AS CREATE TABLE original_chunk_constraints_metadata AS
SELECT SELECT
chunk_id, chunk_id,

2
tsl/test/expected/compression_errors.out
View File

@ -328,7 +328,7 @@ ERROR: cannot add column with constraints to a hypertable that has compression
ALTER TABLE table_constr ADD COLUMN newcol integer PRIMARY KEY; ALTER TABLE table_constr ADD COLUMN newcol integer PRIMARY KEY;
ERROR: cannot add column with constraints to a hypertable that has compression enabled ERROR: cannot add column with constraints to a hypertable that has compression enabled
ALTER TABLE table_constr ADD COLUMN newcol integer NOT NULL; ALTER TABLE table_constr ADD COLUMN newcol integer NOT NULL;
ERROR: cannot add column with NOT NULL contraint without default to a hypertable that has compression enabled ERROR: cannot add column with NOT NULL constraint without default to a hypertable that has compression enabled
ALTER TABLE table_constr ADD COLUMN newcol integer DEFAULT random() + random(); ALTER TABLE table_constr ADD COLUMN newcol integer DEFAULT random() + random();
ERROR: cannot add column with non-constant default expression to a hypertable that has compression enabled ERROR: cannot add column with non-constant default expression to a hypertable that has compression enabled
ALTER TABLE table_constr ADD COLUMN IF NOT EXISTS newcol integer REFERENCES fortable(col); ALTER TABLE table_constr ADD COLUMN IF NOT EXISTS newcol integer REFERENCES fortable(col);

8
tsl/test/expected/data_node.out
View File

@ -281,7 +281,7 @@ SET ROLE :ROLE_1;
-- warning -- warning
SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 2); SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 2);
NOTICE: adding not-null constraint to column "time" NOTICE: adding not-null constraint to column "time"
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
2 | public | disttable | t 2 | public | disttable | t
@ -387,7 +387,7 @@ ERROR: server "data_node_4" does not exist
-- number_partitions lower than number of servers to raise a warning -- number_partitions lower than number of servers to raise a warning
SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', number_partitions => 1, replication_factor => 2, data_nodes => '{ "data_node_2", "data_node_3" }'); SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', number_partitions => 1, replication_factor => 2, data_nodes => '{ "data_node_2", "data_node_3" }');
NOTICE: adding not-null constraint to column "time" NOTICE: adding not-null constraint to column "time"
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
3 | public | disttable | t 3 | public | disttable | t
@ -811,7 +811,7 @@ SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 2,
replication_factor => 2, replication_factor => 2,
data_nodes => '{"data_node_1", "data_node_2", "data_node_3"}'); data_nodes => '{"data_node_1", "data_node_2", "data_node_3"}');
NOTICE: adding not-null constraint to column "time" NOTICE: adding not-null constraint to column "time"
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
5 | public | disttable | t 5 | public | disttable | t
@ -861,7 +861,7 @@ SELECT * FROM _timescaledb_catalog.chunk_data_node;
CREATE TABLE disttable_2(time timestamptz, device int, temp float); CREATE TABLE disttable_2(time timestamptz, device int, temp float);
SELECT * FROM create_distributed_hypertable('disttable_2', 'time', 'device', 2, replication_factor => 2, data_nodes => '{"data_node_1", "data_node_2", "data_node_3"}'); SELECT * FROM create_distributed_hypertable('disttable_2', 'time', 'device', 2, replication_factor => 2, data_nodes => '{"data_node_1", "data_node_2", "data_node_3"}');
NOTICE: adding not-null constraint to column "time" NOTICE: adding not-null constraint to column "time"
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+-------------+--------- ---------------+-------------+-------------+---------
6 | public | disttable_2 | t 6 | public | disttable_2 | t

2
tsl/test/expected/dist_grant-12.out
View File

@ -681,7 +681,7 @@ CREATE TABLE conditions(
PRIMARY KEY (time,device) PRIMARY KEY (time,device)
); );
SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3); SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
4 | public | conditions | t 4 | public | conditions | t

2
tsl/test/expected/dist_grant-13.out
View File

@ -681,7 +681,7 @@ CREATE TABLE conditions(
PRIMARY KEY (time,device) PRIMARY KEY (time,device)
); );
SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3); SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
4 | public | conditions | t 4 | public | conditions | t

2
tsl/test/expected/dist_grant-14.out
View File

@ -681,7 +681,7 @@ CREATE TABLE conditions(
PRIMARY KEY (time,device) PRIMARY KEY (time,device)
); );
SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3); SELECT * FROM create_distributed_hypertable('conditions', 'time', 'device', 3);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
4 | public | conditions | t 4 | public | conditions | t

10
tsl/test/expected/dist_hypertable-12.out
View File

@ -48,7 +48,7 @@ ERROR: operation not supported
-- constraint to test how those work -- constraint to test how those work
CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device)); CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device));
SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1); SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
1 | public | disttable | t 1 | public | disttable | t
@ -56,7 +56,7 @@ WARNING: insuffient number of partitions for dimension "device"
-- Increase the number of partitions. Expect warning since still too low -- Increase the number of partitions. Expect warning since still too low
SELECT * FROM set_number_partitions('disttable', 2); SELECT * FROM set_number_partitions('disttable', 2);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
set_number_partitions set_number_partitions
----------------------- -----------------------
@ -2056,7 +2056,7 @@ ORDER BY 1, 2;
-- Attach another data node but do not auto-repartition, i.e., -- Attach another data node but do not auto-repartition, i.e.,
-- increase the number of slices. -- increase the number of slices.
SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false); SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false);
WARNING: insuffient number of partitions for dimension "__region" WARNING: insufficient number of partitions for dimension "__region"
hypertable_id | node_hypertable_id | node_name hypertable_id | node_hypertable_id | node_name
---------------+--------------------+---------------------- ---------------+--------------------+----------------------
4 | 3 | db_dist_hypertable_2 4 | 3 | db_dist_hypertable_2
@ -3377,7 +3377,7 @@ id|hypertable_id|column_name|column_type|aligned|num_slices|partitioning_func_sc
-- well. We're setting num_partitions lower than the number of servers -- well. We're setting num_partitions lower than the number of servers
-- and expect a warning. -- and expect a warning.
SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash'); SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash');
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
dimension_id | schema_name | table_name | column_name | created dimension_id | schema_name | table_name | column_name | created
--------------+-------------+------------+-------------+--------- --------------+-------------+------------+-------------+---------
22 | public | disttable | device | t 22 | public | disttable | device | t
@ -5925,7 +5925,7 @@ SELECT compress_chunk(show_chunks) FROM show_chunks('test');
(1 row) (1 row)
DROP TABLE test; DROP TABLE test;
-- Fix ALTER SET/DROP NULL contstraint on distributed hypertable -- Fix ALTER SET/DROP NULL constraint on distributed hypertable
-- --
-- #3860 -- #3860
-- --

10
tsl/test/expected/dist_hypertable-13.out
View File

@ -48,7 +48,7 @@ ERROR: operation not supported
-- constraint to test how those work -- constraint to test how those work
CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device)); CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device));
SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1); SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
1 | public | disttable | t 1 | public | disttable | t
@ -56,7 +56,7 @@ WARNING: insuffient number of partitions for dimension "device"
-- Increase the number of partitions. Expect warning since still too low -- Increase the number of partitions. Expect warning since still too low
SELECT * FROM set_number_partitions('disttable', 2); SELECT * FROM set_number_partitions('disttable', 2);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
set_number_partitions set_number_partitions
----------------------- -----------------------
@ -2055,7 +2055,7 @@ ORDER BY 1, 2;
-- Attach another data node but do not auto-repartition, i.e., -- Attach another data node but do not auto-repartition, i.e.,
-- increase the number of slices. -- increase the number of slices.
SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false); SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false);
WARNING: insuffient number of partitions for dimension "__region" WARNING: insufficient number of partitions for dimension "__region"
hypertable_id | node_hypertable_id | node_name hypertable_id | node_hypertable_id | node_name
---------------+--------------------+---------------------- ---------------+--------------------+----------------------
4 | 3 | db_dist_hypertable_2 4 | 3 | db_dist_hypertable_2
@ -3376,7 +3376,7 @@ id|hypertable_id|column_name|column_type|aligned|num_slices|partitioning_func_sc
-- well. We're setting num_partitions lower than the number of servers -- well. We're setting num_partitions lower than the number of servers
-- and expect a warning. -- and expect a warning.
SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash'); SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash');
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
dimension_id | schema_name | table_name | column_name | created dimension_id | schema_name | table_name | column_name | created
--------------+-------------+------------+-------------+--------- --------------+-------------+------------+-------------+---------
22 | public | disttable | device | t 22 | public | disttable | device | t
@ -5924,7 +5924,7 @@ SELECT compress_chunk(show_chunks) FROM show_chunks('test');
(1 row) (1 row)
DROP TABLE test; DROP TABLE test;
-- Fix ALTER SET/DROP NULL contstraint on distributed hypertable -- Fix ALTER SET/DROP NULL constraint on distributed hypertable
-- --
-- #3860 -- #3860
-- --

10
tsl/test/expected/dist_hypertable-14.out
View File

@ -48,7 +48,7 @@ ERROR: operation not supported
-- constraint to test how those work -- constraint to test how those work
CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device)); CREATE TABLE disttable(time timestamptz, device int CHECK (device > 0), color int, temp float, PRIMARY KEY (time,device));
SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1); SELECT * FROM create_distributed_hypertable('disttable', 'time', 'device', 1);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
hypertable_id | schema_name | table_name | created hypertable_id | schema_name | table_name | created
---------------+-------------+------------+--------- ---------------+-------------+------------+---------
1 | public | disttable | t 1 | public | disttable | t
@ -56,7 +56,7 @@ WARNING: insuffient number of partitions for dimension "device"
-- Increase the number of partitions. Expect warning since still too low -- Increase the number of partitions. Expect warning since still too low
SELECT * FROM set_number_partitions('disttable', 2); SELECT * FROM set_number_partitions('disttable', 2);
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
set_number_partitions set_number_partitions
----------------------- -----------------------
@ -2059,7 +2059,7 @@ ORDER BY 1, 2;
-- Attach another data node but do not auto-repartition, i.e., -- Attach another data node but do not auto-repartition, i.e.,
-- increase the number of slices. -- increase the number of slices.
SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false); SELECT * FROM attach_data_node(:'DATA_NODE_2', '"Table\\Schema"."Param_Table"', repartition => false);
WARNING: insuffient number of partitions for dimension "__region" WARNING: insufficient number of partitions for dimension "__region"
hypertable_id | node_hypertable_id | node_name hypertable_id | node_hypertable_id | node_name
---------------+--------------------+---------------------- ---------------+--------------------+----------------------
4 | 3 | db_dist_hypertable_2 4 | 3 | db_dist_hypertable_2
@ -3383,7 +3383,7 @@ id|hypertable_id|column_name|column_type|aligned|num_slices|partitioning_func_sc
-- well. We're setting num_partitions lower than the number of servers -- well. We're setting num_partitions lower than the number of servers
-- and expect a warning. -- and expect a warning.
SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash'); SELECT * FROM add_dimension('disttable', 'device', 1, partitioning_func => '_timescaledb_internal.get_partition_hash');
WARNING: insuffient number of partitions for dimension "device" WARNING: insufficient number of partitions for dimension "device"
dimension_id | schema_name | table_name | column_name | created dimension_id | schema_name | table_name | column_name | created
--------------+-------------+------------+-------------+--------- --------------+-------------+------------+-------------+---------
22 | public | disttable | device | t 22 | public | disttable | device | t
@ -5931,7 +5931,7 @@ SELECT compress_chunk(show_chunks) FROM show_chunks('test');
(1 row) (1 row)
DROP TABLE test; DROP TABLE test;
-- Fix ALTER SET/DROP NULL contstraint on distributed hypertable -- Fix ALTER SET/DROP NULL constraint on distributed hypertable
-- --
-- #3860 -- #3860
-- --

2
tsl/test/expected/dist_query.out
View File

@ -95,7 +95,7 @@ SELECT * FROM reference
WHERE time < '2019-01-02 05:10'::timestamptz WHERE time < '2019-01-02 05:10'::timestamptz
ORDER BY time; ORDER BY time;
SELECT * FROM set_number_partitions('hyper', 2); SELECT * FROM set_number_partitions('hyper', 2);
psql:include/dist_query_load.sql:44: WARNING: insuffient number of partitions for dimension "device" psql:include/dist_query_load.sql:44: WARNING: insufficient number of partitions for dimension "device"
set_number_partitions set_number_partitions
----------------------- -----------------------

48
tsl/test/expected/remote_txn_resolve.out
View File

@ -96,9 +96,9 @@ SELECT _timescaledb_internal.remote_txn_heal_data_node((SELECT OID FROM pg_forei
SELECT * FROM table_modified_by_txns; SELECT * FROM table_modified_by_txns;
describes describes
----------------------- ------------------------
committed committed
prepared not comitted prepared not committed
(2 rows) (2 rows)
SELECT count(*) FROM pg_prepared_xacts; SELECT count(*) FROM pg_prepared_xacts;
@ -125,7 +125,7 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
(3 rows) (3 rows)
@ -171,10 +171,10 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
committed committed
prepared not comitted prepared not committed
(5 rows) (5 rows)
SELECT count(*) FROM pg_prepared_xacts; SELECT count(*) FROM pg_prepared_xacts;
@ -210,11 +210,11 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
committed committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
(6 rows) (6 rows)
SELECT count(*) FROM pg_prepared_xacts; SELECT count(*) FROM pg_prepared_xacts;
@ -249,12 +249,12 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
committed committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
(7 rows) (7 rows)
SELECT count(*) FROM pg_prepared_xacts; SELECT count(*) FROM pg_prepared_xacts;
@ -300,14 +300,14 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
committed committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
(9 rows) (9 rows)
SELECT count(*) FROM pg_prepared_xacts; SELECT count(*) FROM pg_prepared_xacts;
@ -352,14 +352,14 @@ SELECT * FROM table_modified_by_txns;
describes describes
-------------------------------- --------------------------------
committed committed
prepared not comitted prepared not committed
committed with concurrent heal committed with concurrent heal
committed committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
prepared not comitted prepared not committed
non-ts-txn non-ts-txn
(10 rows) (10 rows)

2
tsl/test/sql/chunk_api.sql
View File

@ -408,7 +408,7 @@ CREATE TABLE original_chunk_constraints AS
SELECT "Constraint", "Type", "Columns", "Index"::text, "Expr", "Deferrable", "Deferred", "Validated" SELECT "Constraint", "Type", "Columns", "Index"::text, "Expr", "Deferrable", "Deferred", "Validated"
FROM test.show_constraints(format('%I.%I', :'CHUNK_SCHEMA', :'CHUNK_NAME')::regclass); FROM test.show_constraints(format('%I.%I', :'CHUNK_SCHEMA', :'CHUNK_NAME')::regclass);
-- Save contraints metadata -- Save constraints metadata
CREATE TABLE original_chunk_constraints_metadata AS CREATE TABLE original_chunk_constraints_metadata AS
SELECT SELECT
chunk_id, chunk_id,

2
tsl/test/sql/dist_hypertable.sql.in
View File

@ -1948,7 +1948,7 @@ INSERT INTO test VALUES (now(), 0);
SELECT compress_chunk(show_chunks) FROM show_chunks('test'); SELECT compress_chunk(show_chunks) FROM show_chunks('test');
DROP TABLE test; DROP TABLE test;
-- Fix ALTER SET/DROP NULL contstraint on distributed hypertable -- Fix ALTER SET/DROP NULL constraint on distributed hypertable
-- --
-- #3860 -- #3860
-- --

11
tsl/test/src/remote/txn_resolve.c
View File

@ -30,7 +30,7 @@ prepared_txn(TSConnectionId *id, const char *sql)
} }
static void static void
create_commited_txn(TSConnectionId *id) create_committed_txn(TSConnectionId *id)
{ {
RemoteTxn *tx = RemoteTxn *tx =
prepared_txn(id, "INSERT INTO public.table_modified_by_txns VALUES ('committed');"); prepared_txn(id, "INSERT INTO public.table_modified_by_txns VALUES ('committed');");
@ -40,7 +40,8 @@ create_commited_txn(TSConnectionId *id)
static void static void
create_prepared_txn(TSConnectionId *id) create_prepared_txn(TSConnectionId *id)
{ {
prepared_txn(id, "INSERT INTO public.table_modified_by_txns VALUES ('prepared not comitted');"); prepared_txn(id,
"INSERT INTO public.table_modified_by_txns VALUES ('prepared not committed');");
} }
static void static void
@ -58,7 +59,7 @@ ts_test_remote_txn_resolve_create_records(PG_FUNCTION_ARGS)
id.server_id = GetForeignServerByName("loopback", false)->serverid; id.server_id = GetForeignServerByName("loopback", false)->serverid;
id.user_id = GetUserId(); id.user_id = GetUserId();
create_commited_txn(&id); create_committed_txn(&id);
id.server_id = GetForeignServerByName("loopback2", false)->serverid; id.server_id = GetForeignServerByName("loopback2", false)->serverid;
create_prepared_txn(&id); create_prepared_txn(&id);
@ -91,7 +92,7 @@ send_heal()
} }
static void static void
create_commited_txn_with_concurrent_heal(TSConnectionId *id) create_committed_txn_with_concurrent_heal(TSConnectionId *id)
{ {
RemoteTxn *tx = palloc0(remote_txn_size()); RemoteTxn *tx = palloc0(remote_txn_size());
memcpy(tx, id, sizeof(*id)); memcpy(tx, id, sizeof(*id));
@ -115,7 +116,7 @@ ts_test_remote_txn_resolve_create_records_with_concurrent_heal(PG_FUNCTION_ARGS)
TSConnectionId id = { .server_id = GetForeignServerByName("loopback2", false)->serverid, TSConnectionId id = { .server_id = GetForeignServerByName("loopback2", false)->serverid,
.user_id = GetUserId() }; .user_id = GetUserId() };
create_commited_txn_with_concurrent_heal(&id); create_committed_txn_with_concurrent_heal(&id);
PG_RETURN_VOID(); PG_RETURN_VOID();
} }