Hi.

I got errors of patching on CentOS 7:

bash-4.2$ grep Hunk *.log | grep FAILED
0005-hj-leader-gate-v11.patch.log:Hunk #1 FAILED at 14.
0010-hj-parallel-v11.patch.log:Hunk #2 FAILED at 2850.
0010-hj-parallel-v11.patch.log:Hunk #1 FAILED at 21.
0010-hj-parallel-v11.patch.log:Hunk #3 FAILED at 622.
0010-hj-parallel-v11.patch.log:Hunk #6 FAILED at 687.
0010-hj-parallel-v11.patch.log:Hunk #1 FAILED at 21.
0010-hj-parallel-v11.patch.log:Hunk #3 FAILED at 153. What is wrong? The 
sources were clean:

bash-4.2$ git status
# On branch master
nothing to commit, working directory clean

I was patching by the command:
patch -b -i 
../.patches/parallel-shared-hash-v11/0001-hj-refactor-memory-accounting-v11.patch
 -p1 --verbose > 
../.patches/parallel-shared-hash-v11/0001-hj-refactor-memory-accounting-v11.patch.log
patch -b -i 
../.patches/parallel-shared-hash-v11/0002-hj-refactor-batch-increases-v11.patch 
-p1 --verbose > 
../.patches/parallel-shared-hash-v11/0002-hj-refactor-batch-increases-v11.patch.log
patch -b -i 
../.patches/parallel-shared-hash-v11/0003-hj-refactor-unmatched-v11.patch -p1 
--verbose > 
../.patches/parallel-shared-hash-v11/0003-hj-refactor-unmatched-v11.patch.log
patch -b -i ../.patches/parallel-shared-hash-v11/0004-hj-barrier-v11.patch -p1 
--verbose > ../.patches/parallel-shared-hash-v11/0004-hj-barrier-v11.patch.log
patch -b -i ../.patches/parallel-shared-hash-v11/0005-hj-leader-gate-v11.patch 
-p1 --verbose > 
../.patches/parallel-shared-hash-v11/0005-hj-leader-gate-v11.patch.log
patch -b -i 
../.patches/parallel-shared-hash-v11/0006-hj-let-node-have-seg-in-worker-v11.patch
 -p1 --verbose > 
../.patches/parallel-shared-hash-v11/0006-hj-let-node-have-seg-in-worker-v11.patch.log
patch -b -i 
../.patches/parallel-shared-hash-v11/0007-hj-remove-buf-file-is-temp-v11.patch 
-p1 --verbose > 
../.patches/parallel-shared-hash-v11/0007-hj-remove-buf-file-is-temp-v11.patch.log
patch -b -i ../.patches/parallel-shared-hash-v11/0008-hj-buf-file-set-v11.patch 
-p1 --verbose > 
../.patches/parallel-shared-hash-v11/0008-hj-buf-file-set-v11.patch.log
patch -b -i 
../.patches/parallel-shared-hash-v11/0009-hj-shared-tuplestore-v11.patch -p1 
--verbose > 
../.patches/parallel-shared-hash-v11/0009-hj-shared-tuplestore-v11.patch.log
patch -b -i ../.patches/parallel-shared-hash-v11/0010-hj-parallel-v11.patch -p1 
--verbose > ../.patches/parallel-shared-hash-v11/0010-hj-parallel-v11.patch.log 
Best Regards,

Oleg Golovanov
Moscow, Russia

>Вторник,  4 апреля 2017, 0:28 +03:00 от Thomas Munro 
><thomas.mu...@enterprisedb.com>:
>
>On Tue, Apr 4, 2017 at 9:11 AM, Andres Freund < and...@anarazel.de > wrote:
>> Hi,
>>
>> On 2017-03-31 17:53:12 +1300, Thomas Munro wrote:
>>> Thanks very much to Rafia for testing, and to Andres for his copious
>>> review feedback.  Here's a new version.  Changes:
>>
>> I unfortunately think it's too late to get this into v10.  There's still
>> heavy development going on, several pieces changed quite noticeably
>> since the start of the CF and there's still features missing.  Hence I
>> think this unfortunately has to be pushed - as much as I'd have liked to
>> have this in 10.
>>
>> Do you agree?
>
>Agreed.
>
>Thank you very much Andres, Ashutosh, Peter, Rafia and Robert for all
>the review, testing and discussion so far.
>
>-- 
>Thomas Munro
>http://www.enterprisedb.com
>

Reply via email to