Skip to content

Conversation

@PastaPastaPasta
Copy link
Member

No description provided.

@codablock codablock added this to the 16 milestone Apr 14, 2020
@PastaPastaPasta
Copy link
Member Author

Dropped those two functions, so I think it'd be safe to see we won't see the large speed-ups that upstream did?

@PastaPastaPasta PastaPastaPasta changed the title Backport 13151 Merge bitcoin#13151: net: Serve blocks directly from disk when possible Apr 15, 2020
@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 April 15, 2020 17:35
@PastaPastaPasta
Copy link
Member Author

rebased on develop

@PastaPastaPasta PastaPastaPasta requested a review from UdjinM6 April 16, 2020 15:32
UdjinM6
UdjinM6 previously approved these changes Apr 16, 2020
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6
Copy link

UdjinM6 commented Apr 18, 2020

Needs rebase

@PastaPastaPasta
Copy link
Member Author

rebased on develop

laanwj and others added 3 commits April 18, 2020 16:39
0bf4318 net: Serve blocks directly from disk when possible (Wladimir J. van der Laan)

Pull request description:

  In `ProcessGetBlockData`, send the block data directly from disk if type MSG_WITNESS_BLOCK is requested. This is a valid shortcut as the on-disk format matches the network format.

  This is expected to increase performance because a deserialization and subsequent serialization roundtrip is avoided.

Tree-SHA512: 9a9500b4c1354eaae1a6f1c6ef2416c1c1985029852589266f3a70e808f6c7482c135e9ab251a527566935378ab7c32dba4ed43ba5451e802d8e72b77d1ba472
Signed-off-by: Pasta <[email protected]>

# Conflicts:
#	src/net_processing.cpp
#	src/validation.cpp
Signed-off-by: Pasta <[email protected]>
@PastaPastaPasta
Copy link
Member Author

rebased again to hopefully resolve tests

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 merged commit 3d175aa into dashpay:develop Apr 19, 2020
@PastaPastaPasta PastaPastaPasta deleted the backport-13151 branch April 19, 2020 15:52
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Feb 10, 2022
…le (dashpay#3408)

* Merge bitcoin#13151: net: Serve blocks directly from disk when possible

0bf4318 net: Serve blocks directly from disk when possible (Wladimir J. van der Laan)

Pull request description:

  In `ProcessGetBlockData`, send the block data directly from disk if type MSG_WITNESS_BLOCK is requested. This is a valid shortcut as the on-disk format matches the network format.

  This is expected to increase performance because a deserialization and subsequent serialization roundtrip is avoided.

Tree-SHA512: 9a9500b4c1354eaae1a6f1c6ef2416c1c1985029852589266f3a70e808f6c7482c135e9ab251a527566935378ab7c32dba4ed43ba5451e802d8e72b77d1ba472
Signed-off-by: Pasta <[email protected]>

# Conflicts:
#	src/net_processing.cpp
#	src/validation.cpp

* fix extra bracket

Signed-off-by: Pasta <[email protected]>

* remove read raw block from disk functions

Signed-off-by: Pasta <[email protected]>

* correct `if (pblock)` scope

Signed-off-by: Pasta <[email protected]>

Co-authored-by: Wladimir J. van der Laan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants