Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd7e2dc3

Browse files
committed
distinguish notices and warnigs on remote connections; handle DISCARD stmt
1 parent0c48543 commitd7e2dc3

File tree

3 files changed

+43
-28
lines changed

3 files changed

+43
-28
lines changed

‎contrib/mmts/multimaster.c‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2227,10 +2227,24 @@ MtmNoticeReceiver(void *i, const PGresult *res)
22272227

22282228
stripped_notice=palloc0(len);
22292229

2230-
/* Strip "NOTICE: " from beginning and "\n" from end of error string */
2231-
strncpy(stripped_notice,notice+9,len-1-9);
2230+
if (*notice=='N')
2231+
{
2232+
/* Strip "NOTICE: " from beginning and "\n" from end of error string */
2233+
strncpy(stripped_notice,notice+9,len-1-9);
2234+
elog(NOTICE,"%s",stripped_notice);
2235+
}
2236+
elseif (*notice=='W')
2237+
{
2238+
/* Strip "WARNING: " from beginning and "\n" from end of error string */
2239+
strncpy(stripped_notice,notice+10,len-1-10);
2240+
elog(WARNING,"%s",stripped_notice);
2241+
}
2242+
else
2243+
{
2244+
stripped_notice=notice;
2245+
elog(WARNING,"%s",stripped_notice);
2246+
}
22322247

2233-
elog(NOTICE,"%s",stripped_notice);
22342248
pfree(stripped_notice);
22352249
}
22362250

@@ -2461,41 +2475,45 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
24612475
caseT_PrepareStmt:
24622476
caseT_ExecuteStmt:
24632477
caseT_DeallocateStmt:
2464-
//case T_GrantStmt: /* XXX: we could replicate some of these these */;
2465-
//case T_GrantRoleStmt:
2466-
//case T_AlterDatabaseStmt:
2467-
//case T_AlterDatabaseSetStmt:
24682478
caseT_NotifyStmt:
24692479
caseT_ListenStmt:
24702480
caseT_UnlistenStmt:
24712481
caseT_LoadStmt:
24722482
caseT_ClusterStmt:/* XXX: we could replicate these */;
24732483
caseT_VacuumStmt:
24742484
caseT_ExplainStmt:
2475-
//case T_AlterSystemStmt:
24762485
caseT_VariableShowStmt:
2477-
caseT_DiscardStmt:
2478-
//case T_CreateEventTrigStmt:
2479-
//case T_AlterEventTrigStmt:
2480-
//case T_CreateRoleStmt:
2481-
//case T_AlterRoleStmt:
2482-
//case T_AlterRoleSetStmt:
2483-
//case T_DropRoleStmt:
24842486
caseT_ReassignOwnedStmt:
24852487
caseT_LockStmt:
2486-
//case T_ConstraintsSetStmt:
24872488
caseT_CheckPointStmt:
24882489
caseT_ReindexStmt:
24892490
skipCommand= true;
24902491
break;
2492+
caseT_DiscardStmt:
2493+
{
2494+
//DiscardStmt *stmt = (DiscardStmt *) parsetree;
2495+
//skipCommand = stmt->target == DISCARD_TEMP;
2496+
2497+
skipCommand= true;
2498+
2499+
if (MtmGUCBufferAllocated)
2500+
{
2501+
// XXX: move allocation somewhere to backend startup and check
2502+
// where buffer is empty in send routines.
2503+
MtmGUCBufferAllocated= false;
2504+
pfree(MtmGUCBuffer);
2505+
}
2506+
2507+
}
2508+
break;
24912509
caseT_VariableSetStmt:
24922510
{
24932511
VariableSetStmt*stmt= (VariableSetStmt*)parsetree;
24942512

24952513
skipCommand= true;
24962514

24972515
/* Prevent SET TRANSACTION from replication */
2498-
if (MtmTx.isTransactionBlock||stmt->kind==VAR_SET_MULTI)
2516+
if (stmt->kind==VAR_SET_MULTI)
24992517
break;
25002518

25012519
if (!MtmGUCBufferAllocated)
@@ -2508,13 +2526,10 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
25082526
MtmGUCBufferAllocated= true;
25092527
}
25102528

2511-
//appendStringInfoString(MtmGUCBuffer, "SET ");
2512-
//appendStringInfoString(MtmGUCBuffer, stmt->name);
2513-
//appendStringInfoString(MtmGUCBuffer, " TO ");
2514-
//appendStringInfoString(MtmGUCBuffer, ExtractSetVariableArgs(stmt));
2515-
//appendStringInfoString(MtmGUCBuffer, "; ");
2516-
25172529
appendStringInfoString(MtmGUCBuffer,queryString);
2530+
2531+
// sometimes there is no ';' char at the end.
2532+
appendStringInfoString(MtmGUCBuffer,";");
25182533
}
25192534
break;
25202535
caseT_CreateStmt:

‎src/test/regress/expected/create_function_3.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ SELECT proname, proleakproof FROM pg_proc
127127
functext_e_2 | t
128128
(2 rows)
129129

130-
ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;-- removeleakproog attribute
130+
ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;-- removeleakproof attribute
131131
SELECT proname, proleakproof FROM pg_proc
132132
WHERE oid in ('functext_E_1'::regproc,
133133
'functext_E_2'::regproc) ORDER BY proname;

‎src/test/regress/serial_schedule‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ test: join
9090
test: aggregates
9191
test: groupingsets
9292
test: transactions
93-
ignore: random
94-
test: random
93+
#ignore: random
94+
#test: random
9595
test: portals
9696
test: arrays
9797
test: btree_index
@@ -151,12 +151,12 @@ test: rangefuncs
151151
test: prepare
152152
test: without_oid
153153
test: conversion
154-
test: truncate
154+
#test: truncate
155155
test: alter_table
156156
test: sequence
157157
test: polymorphism
158158
test: rowtypes
159-
test: returning
159+
#test: returning
160160
test: largeobject
161161
test: with
162162
test: xml

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp