|
78 | 78 | * Portions Copyright (c) 1994, Regents of the University of California |
79 | 79 | * |
80 | 80 | * IDENTIFICATION |
81 | | - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.53 2005/10/18 22:59:37 tgl Exp $ |
| 81 | + * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.54 2005/10/25 13:47:08 momjian Exp $ |
82 | 82 | * |
83 | 83 | *------------------------------------------------------------------------- |
84 | 84 | */ |
@@ -468,7 +468,7 @@ tuplesort_begin_heap(TupleDesc tupDesc, |
468 | 468 |
|
469 | 469 | #ifdefTRACE_SORT |
470 | 470 | if (trace_sort) |
471 | | -elog(NOTICE, |
| 471 | +elog(LOG, |
472 | 472 | "begin tuple sort: nkeys = %d, workMem = %d, randomAccess = %c", |
473 | 473 | nkeys,workMem,randomAccess ?'t' :'f'); |
474 | 474 | #endif |
@@ -518,7 +518,7 @@ tuplesort_begin_index(Relation indexRel, |
518 | 518 |
|
519 | 519 | #ifdefTRACE_SORT |
520 | 520 | if (trace_sort) |
521 | | -elog(NOTICE, |
| 521 | +elog(LOG, |
522 | 522 | "begin index sort: unique = %c, workMem = %d, randomAccess = %c", |
523 | 523 | enforceUnique ?'t' :'f', |
524 | 524 | workMem,randomAccess ?'t' :'f'); |
@@ -549,7 +549,7 @@ tuplesort_begin_datum(Oid datumType, |
549 | 549 |
|
550 | 550 | #ifdefTRACE_SORT |
551 | 551 | if (trace_sort) |
552 | | -elog(NOTICE, |
| 552 | +elog(LOG, |
553 | 553 | "begin datum sort: workMem = %d, randomAccess = %c", |
554 | 554 | workMem,randomAccess ?'t' :'f'); |
555 | 555 | #endif |
@@ -623,10 +623,10 @@ tuplesort_end(Tuplesortstate *state) |
623 | 623 | if (trace_sort) |
624 | 624 | { |
625 | 625 | if (state->tapeset) |
626 | | -elog(NOTICE,"external sort ended, %ld disk blocks used: %s", |
| 626 | +elog(LOG,"external sort ended, %ld disk blocks used: %s", |
627 | 627 | spaceUsed,pg_rusage_show(&state->ru_start)); |
628 | 628 | else |
629 | | -elog(NOTICE,"internal sort ended, %ld KB used: %s", |
| 629 | +elog(LOG,"internal sort ended, %ld KB used: %s", |
630 | 630 | spaceUsed,pg_rusage_show(&state->ru_start)); |
631 | 631 | } |
632 | 632 | #endif |
@@ -771,7 +771,7 @@ tuplesort_performsort(Tuplesortstate *state) |
771 | 771 | { |
772 | 772 | #ifdefTRACE_SORT |
773 | 773 | if (trace_sort) |
774 | | -elog(NOTICE,"performsort starting: %s", |
| 774 | +elog(LOG,"performsort starting: %s", |
775 | 775 | pg_rusage_show(&state->ru_start)); |
776 | 776 | #endif |
777 | 777 |
|
@@ -817,7 +817,7 @@ tuplesort_performsort(Tuplesortstate *state) |
817 | 817 |
|
818 | 818 | #ifdefTRACE_SORT |
819 | 819 | if (trace_sort) |
820 | | -elog(NOTICE,"performsort done%s: %s", |
| 820 | +elog(LOG,"performsort done%s: %s", |
821 | 821 | (state->status==TSS_FINALMERGE) ?" (except final merge)" :"", |
822 | 822 | pg_rusage_show(&state->ru_start)); |
823 | 823 | #endif |
@@ -1054,7 +1054,7 @@ inittapes(Tuplesortstate *state) |
1054 | 1054 |
|
1055 | 1055 | #ifdefTRACE_SORT |
1056 | 1056 | if (trace_sort) |
1057 | | -elog(NOTICE,"switching to external sort: %s", |
| 1057 | +elog(LOG,"switching to external sort: %s", |
1058 | 1058 | pg_rusage_show(&state->ru_start)); |
1059 | 1059 | #endif |
1060 | 1060 |
|
@@ -1316,7 +1316,7 @@ mergeonerun(Tuplesortstate *state) |
1316 | 1316 |
|
1317 | 1317 | #ifdefTRACE_SORT |
1318 | 1318 | if (trace_sort) |
1319 | | -elog(NOTICE,"finished merge step: %s", |
| 1319 | +elog(LOG,"finished merge step: %s", |
1320 | 1320 | pg_rusage_show(&state->ru_start)); |
1321 | 1321 | #endif |
1322 | 1322 | } |
@@ -1533,7 +1533,7 @@ dumptuples(Tuplesortstate *state, bool alltuples) |
1533 | 1533 |
|
1534 | 1534 | #ifdefTRACE_SORT |
1535 | 1535 | if (trace_sort) |
1536 | | -elog(NOTICE,"finished writing%s run %d: %s", |
| 1536 | +elog(LOG,"finished writing%s run %d: %s", |
1537 | 1537 | (state->memtupcount==0) ?" final" :"", |
1538 | 1538 | state->currentRun, |
1539 | 1539 | pg_rusage_show(&state->ru_start)); |
|