Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f6e97fc

Browse files
committed
fix formatting, make use of WrongPartType()
1 parent f3ee021 commit f6e97fc

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

init.sql

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,10 @@ BEGIN
380380
USING p_min, p_max
381381
INTO ctids;
382382

383-
EXECUTE format('
384-
WITH data AS (
385-
DELETE FROM ONLY %1$s WHERE ctid = ANY($1) RETURNING *)
386-
INSERT INTO %1$s SELECT * FROM data',
387-
relation)
383+
EXECUTE format('WITH data AS (
384+
DELETE FROM ONLY %1$s WHERE ctid = ANY($1) RETURNING *)
385+
INSERT INTO %1$s SELECT * FROM data',
386+
relation)
388387
USING ctids;
389388

390389
/* Get number of inserted rows */

range.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ BEGIN
150150
end_value,
151151
v_atttype::TEXT)
152152
USING
153-
expression;
153+
expression;
154154
END IF;
155155

156156
/* Insert new entry to pathman config */

src/include/relation_info.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,6 @@ PartTypeToCString(PartType parttype)
348348
}
349349

350350

351-
352-
353351
/* PartRelationInfo checker */
354352
void shout_if_prel_is_invalid(const Oid parent_oid,
355353
const PartRelationInfo *prel,

src/pathman_workers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ bgw_main_concurrent_part(Datum main_arg)
513513
{
514514
failures_count = PART_WORKER_MAX_ATTEMPTS;
515515

516-
elog(LOG, "relation %u is not partitioned (or does not exist)",
516+
elog(LOG, "relation \"%u\" is not partitioned (or does not exist)",
517517
part_slot->relid);
518518
}
519519
}

src/relation_info.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,9 +1293,7 @@ shout_if_prel_is_invalid(const Oid parent_oid,
12931293
break;
12941294

12951295
default:
1296-
elog(ERROR,
1297-
"expected_str selection not implemented for type %d",
1298-
expected_part_type);
1296+
WrongPartType(expected_part_type);
12991297
}
13001298

13011299
elog(ERROR, "relation \"%s\" is not partitioned by %s",

0 commit comments

Comments
 (0)