NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit1d4be6b

committed

Fix LZ4 tests for remaining buffer space.

We should flush the buffer when the remaining space is less thanthe maximum amount that we might need, not when it is less than orequal to the maximum amount we might need.Jeevan Ladhe, per an observation from me.Discussion:http://postgr.es/m/CANm22CgVMa85O1akgs+DOPE8NSrT1zbz5_vYfS83_r+6nCivLQ@mail.gmail.com

1 parent7cf085f commit1d4be6bCopy full SHA for 1d4be6b

File tree

2 files changed

-5

lines changed

src
- backend/replication
  - basebackup_lz4.c
- bin/pg_basebackup
  - bbstreamer_lz4.c

2 files changed

-5

lines changed

`‎src/backend/replication/basebackup_lz4.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ bbsink_lz4_archive_contents(bbsink *sink, size_t avail_in)`
`193`	`193`	`* LZ4F_compressBound(), ask the next sink to process the data so that we`
`194`	`194`	`* can empty the buffer.`
`195`	`195`	`*/`
`196`		`-if ((mysink->base.bbs_next->bbs_buffer_length-mysink->bytes_written) <=`
	`196`	`+if ((mysink->base.bbs_next->bbs_buffer_length-mysink->bytes_written)<`
`197`	`197`	`avail_in_bound)`
`198`	`198`	`{`
`199`	`199`	`bbsink_archive_contents(sink->bbs_next,mysink->bytes_written);`
`@@ -238,7 +238,7 @@ bbsink_lz4_end_archive(bbsink *sink)`
`238`	`238`
`239`	`239`	`Assert(mysink->base.bbs_next->bbs_buffer_length >=lz4_footer_bound);`
`240`	`240`
`241`		`-if ((mysink->base.bbs_next->bbs_buffer_length-mysink->bytes_written) <=`
	`241`	`+if ((mysink->base.bbs_next->bbs_buffer_length-mysink->bytes_written)<`
`242`	`242`	`lz4_footer_bound)`
`243`	`243`	`{`
`244`	`244`	`bbsink_archive_contents(sink->bbs_next,mysink->bytes_written);`

`‎src/bin/pg_basebackup/bbstreamer_lz4.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ bbstreamer_lz4_compressor_new(bbstreamer *next, int compresslevel)`
`99`	`99`	`compressed_bound=LZ4F_compressBound(streamer->base.bbs_buffer.maxlen,prefs);`
`100`	`100`
`101`	`101`	`/* Enlarge buffer if it falls short of compression bound. */`
`102`		`-if (streamer->base.bbs_buffer.maxlen <=compressed_bound)`
	`102`	`+if (streamer->base.bbs_buffer.maxlen<compressed_bound)`
`103`	`103`	`enlargeStringInfo(&streamer->base.bbs_buffer,compressed_bound);`
`104`	`104`
`105`	`105`	`ctxError=LZ4F_createCompressionContext(&streamer->cctx,LZ4F_VERSION);`
`@@ -170,7 +170,7 @@ bbstreamer_lz4_compressor_content(bbstreamer *streamer,`
`170`	`170`	`*/`
`171`	`171`	`out_bound=LZ4F_compressBound(len,&mystreamer->prefs);`
`172`	`172`	`Assert(mystreamer->base.bbs_buffer.maxlen >=out_bound);`
`173`		`-if (avail_out <=out_bound)`
	`173`	`+if (avail_out<out_bound)`
`174`	`174`	`{`
`175`	`175`	`bbstreamer_content(mystreamer->base.bbs_next,member,`
`176`	`176`	`mystreamer->base.bbs_buffer.data,`
`@@ -218,7 +218,7 @@ bbstreamer_lz4_compressor_finalize(bbstreamer *streamer)`
`218`	`218`	`/* Find out the footer bound and update the output buffer. */`
`219`	`219`	`footer_bound=LZ4F_compressBound(0,&mystreamer->prefs);`
`220`	`220`	`Assert(mystreamer->base.bbs_buffer.maxlen >=footer_bound);`
`221`		`-if ((mystreamer->base.bbs_buffer.maxlen-mystreamer->bytes_written) <=`
	`221`	`+if ((mystreamer->base.bbs_buffer.maxlen-mystreamer->bytes_written)<`
`222`	`222`	`footer_bound)`
`223`	`223`	`{`
`224`	`224`	`bbstreamer_content(mystreamer->base.bbs_next,NULL,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1d4be6b

File tree

2 files changed

2 files changed

`‎src/backend/replication/basebackup_lz4.c`

`‎src/bin/pg_basebackup/bbstreamer_lz4.c`

0 commit comments