Tue Jul 21 14:18:45 PDT 2009
- Previous message: [Slony1-commit] slony1-engine/tests run_test.sh
- Next message: [Slony1-commit] slony1-engine/src/slonik slonik.c slonik.h
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/src/slon In directory main.slony.info:/tmp/cvs-serv8788/src/slon Modified Files: cleanup_thread.c dbutils.c misc.c remote_worker.c scheduler.c Log Message: Autovacuum changes recently made to 2.0 branch test tool changes recently made to 2.0 branch Index: dbutils.c =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/src/slon/dbutils.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** dbutils.c 20 Jul 2009 22:30:31 -0000 1.31 --- dbutils.c 21 Jul 2009 21:18:43 -0000 1.32 *************** *** 127,131 **** "version for \"%s\" is %d\n", conninfo, conn->pg_version); ! if (conn->pg_version >= 80100) { slon_mkquery(&query, "set escape_string_warning to 'off'"); --- 127,131 ---- "version for \"%s\" is %d\n", conninfo, conn->pg_version); ! if (conn->pg_version >= 80300) { slon_mkquery(&query, "set escape_string_warning to 'off'"); *************** *** 136,142 **** } PQclear(res); ! } ! if (conn->pg_version >= 80200) ! { slon_mkquery(&query, "set standard_conforming_strings to 'off'"); res = PQexec(dbconn, dstring_data(&query)); --- 136,140 ---- } PQclear(res); ! slon_mkquery(&query, "set standard_conforming_strings to 'off'"); res = PQexec(dbconn, dstring_data(&query)); Index: remote_worker.c =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v retrieving revision 1.178 retrieving revision 1.179 diff -C2 -d -r1.178 -r1.179 *** remote_worker.c 20 Jul 2009 22:30:31 -0000 1.178 --- remote_worker.c 21 Jul 2009 21:18:43 -0000 1.179 *************** *** 1181,1184 **** --- 1181,1185 ---- int sub_receiver = (int) strtol(event->ev_data3, NULL, 10); char *sub_forward = event->ev_data4; + char *omit_copy = event->ev_data5; if (sub_receiver == rtcfg_nodeid) *************** *** 1186,1192 **** slon_appendquery(&query1, ! "select %s.subscribeSet_int(%d, %d, %d, '%q'); ", rtcfg_namespace, ! sub_set, sub_provider, sub_receiver, sub_forward); need_reloadListen = true; } --- 1187,1193 ---- slon_appendquery(&query1, ! "select %s.subscribeSet_int(%d, %d, %d, '%q', '%q'); ", rtcfg_namespace, ! sub_set, sub_provider, sub_receiver, sub_forward, omit_copy); need_reloadListen = true; } *************** *** 2430,2440 **** char seqbuf[64]; char *copydata = NULL; struct timeval tv_start; struct timeval tv_start2; struct timeval tv_now; - slon_log(SLON_INFO, "copy_set %d\n", set_id); gettimeofday(&tv_start, NULL); /* * Lookup the provider nodes conninfo --- 2431,2459 ---- char seqbuf[64]; char *copydata = NULL; + bool omit_copy = false; + char *v_omit_copy = event->ev_data5; struct timeval tv_start; struct timeval tv_start2; struct timeval tv_now; gettimeofday(&tv_start, NULL); + if (strcmp(v_omit_copy, "f") == 0) { + omit_copy = false; + } else { + if (strcmp(v_omit_copy, "t") == 0) { + omit_copy = true; + } else { + slon_log(SLON_ERROR, "copy_set %d - omit_copy not in (t,f)- [%s]\n", set_id, v_omit_copy); + } + } + slon_log(SLON_INFO, "copy_set %d - omit=%s - bool=%d\n", set_id, v_omit_copy, omit_copy); + + if (omit_copy) { + slon_log(SLON_INFO, "omit is TRUE\n"); + } else { + slon_log(SLON_INFO, "omit is FALSE\n"); + } + /* * Lookup the provider nodes conninfo *************** *** 2859,2862 **** --- 2878,2886 ---- * Begin a COPY from stdin for the table on the local DB */ + if (omit_copy) { + slon_log(SLON_CONFIG, "remoteWorkerThread_%d: " + "COPY of table %s suppressed due to OMIT COPY option\n", + node->no_id, tab_fqname); + } else { slon_log(SLON_CONFIG, "remoteWorkerThread_%d: " "Begin COPY of table %s\n", *************** *** 3148,3152 **** } } ! gettimeofday(&tv_now, NULL); slon_log(SLON_CONFIG, "remoteWorkerThread_%d: " --- 3172,3176 ---- } } ! } gettimeofday(&tv_now, NULL); slon_log(SLON_CONFIG, "remoteWorkerThread_%d: "
- Previous message: [Slony1-commit] slony1-engine/tests run_test.sh
- Next message: [Slony1-commit] slony1-engine/src/slonik slonik.c slonik.h
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list