Skip to content

zsync: use larger rolling hash size to avoid conflicts - #6390

Merged
ckamm merged 2 commits into
delta-syncfrom
delta-zsync-rolling-hash
Mar 27, 2018
Merged

zsync: use larger rolling hash size to avoid conflicts#6390
ckamm merged 2 commits into
delta-syncfrom
delta-zsync-rolling-hash

Conversation

@ckamm

@ckamm ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor

This PR is based on top of #6389 and has only one commit 15aff7b. It also depends on ahmedammar/zsync#2

@ahmedammar

@ckamm ckamm added this to the 2.5.0 milestone Mar 16, 2018
@ckamm ckamm self-assigned this Mar 16, 2018
@ckamm
ckamm requested a review from ogoffart March 16, 2018 09:21
@ckamm ckamm changed the title Delta zsync rolling hash zsync: use larger rolling hash size to avoid conflicts Mar 16, 2018
@ckamm
ckamm force-pushed the delta-zsync-rolling-hash branch from 15aff7b to 50b8d1c Compare March 16, 2018 09:54
@ckamm

ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor Author

The zsync PR has to merge before this PR can be updated and merged.

@ogoffart ogoffart left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if i understand correctly, that means there is an incompatible change in zsync?

@ckamm

ckamm commented Mar 16, 2018

Copy link
Copy Markdown
Contributor Author

This PR only works in conjunction with my zsync patch. So the steps are

  • merge zsync PR
  • update this PR to have the git submodule point the final sha1 in the zsync repo
  • merge this PR

@ahmedammar

Copy link
Copy Markdown
Contributor

zsync PR merged. Thanks @ckamm for putting all this work in, great to know this is all in capable hands!

@ckamm
ckamm force-pushed the delta-zsync-rolling-hash branch from 50b8d1c to 97d31bb Compare March 16, 2018 12:28
@ckamm

ckamm commented Mar 22, 2018

Copy link
Copy Markdown
Contributor Author

This PR needs to be rebased onto delta-sync and the zsync submodule sha1 needs to be updated once ahmedammar/zsync#3 is merged

@ckamm
ckamm force-pushed the delta-zsync-rolling-hash branch from 97d31bb to 307b79d Compare March 23, 2018 07:00
* Only in cpp files
* Include early (on windows, winsock2.h should go before windows.h)
@ckamm
ckamm force-pushed the delta-zsync-rolling-hash branch from 5f1d2e4 to 2f17f37 Compare March 26, 2018 09:35
@ckamm

ckamm commented Mar 26, 2018

Copy link
Copy Markdown
Contributor Author

@ogoffart @ahmedammar All is now in order and jenkins passes - does this look good to you?

@ahmedammar

Copy link
Copy Markdown
Contributor

Looks great! I've been following your commits, thanks!

@ckamm
ckamm merged commit e759f89 into delta-sync Mar 27, 2018
@ckamm
ckamm deleted the delta-zsync-rolling-hash branch March 27, 2018 05:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants