On 03/03/2018 06:19 AM, Erik Rijkers wrote:
> On 2018-03-03 01:55, Tomas Vondra wrote:
>> Hi there,
>>
>> attached is an updated patch fixing all the reported issues (a bit more
>> about those below).
> 
> Hi,
> 
> 0007-Track-statistics-for-streaming-spilling.patch  won't apply.  All
> the other patches apply ok.
> 
> patch complaints with:
> 
> patching file doc/src/sgml/monitoring.sgml
> patching file src/backend/catalog/system_views.sql
> Hunk #1 succeeded at 734 (offset 2 lines).
> patching file src/backend/replication/logical/reorderbuffer.c
> patching file src/backend/replication/walsender.c
> patching file src/include/catalog/pg_proc.h
> Hunk #1 FAILED at 2903.
> 1 out of 1 hunk FAILED -- saving rejects to file
> src/include/catalog/pg_proc.h.rej
> patching file src/include/replication/reorderbuffer.h
> patching file src/include/replication/walsender_private.h
> patching file src/test/regress/expected/rules.out
> Hunk #1 succeeded at 1861 (offset 2 lines).
> 
> Attached the produced reject file.
> 

Yeah, that's due to fd1a421fe66 which changed columns in pg_proc.h.
Attached is a rebased patch, fixing this.

regards

-- 
Tomas Vondra                  http://www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

Attachment: 0001-Introduce-logical_work_mem-to-limit-ReorderBuffer.patch.gz
Description: application/gzip

Attachment: 0002-Immediatel-WAL-log-assignments.patch.gz
Description: application/gzip

Attachment: 0003-Issue-individual-invalidations-with-wal_level-logica.patch.gz
Description: application/gzip

Attachment: 0004-Extend-the-output-plugin-API-with-stream-methods.patch.gz
Description: application/gzip

Attachment: 0005-Implement-streaming-mode-in-ReorderBuffer.patch.gz
Description: application/gzip

Attachment: 0006-Add-support-for-streaming-to-built-in-replication.patch.gz
Description: application/gzip

Attachment: 0007-Track-statistics-for-streaming-spilling.patch.gz
Description: application/gzip

Attachment: 0008-BUGFIX-make-sure-subxact-is-marked-as-is_known_as_su.patch.gz
Description: application/gzip

Attachment: 0009-BUGFIX-set-final_lsn-for-subxacts-before-cleanup.patch.gz
Description: application/gzip

Reply via email to