Code

fix: Merge retry logic#2719

Code

Merged

nasdf merged 16 commits intosourcenetwork:developsourcenetwork/defradb:developfrom nasdf:nasdf/fix/merge-retry-logicnasdf/defradb:nasdf/fix/merge-retry-logicCopy head branch name to clipboardJun 17, 2024

+209-267

Commits

Commits on Jun 13, 2024

• fix merge retry logic

  nasdf

  committed
  c67b272

• remove retry count from dag message.

  nasdf

  committed
  10e35c3

Commits on Jun 14, 2024

• test walk sync process

  nasdf

  committed
  b46c5ec

• test fetch graph

  nasdf

  committed
  6c4eab1

• add dagFetchTimeout

  nasdf

  committed
  f28473b

• remove getDocIDFromBlock.

  nasdf

  committed
  b4b456b

• handle txn conflict on dag sync

  nasdf

  committed
  f89456b

• add issue comment to dagSync

  nasdf

  committed
  37c72ba

• ignore txn conflicts in blockstore

  nasdf

  committed
  5ee9616

• use ipld prime for dag sync

  nasdf

  committed
  3f0a9bf

• move dag sync logic

  nasdf

  committed
  e8bd194

• revert blockstore changes

  nasdf

  committed
  15a603c

Commits on Jun 17, 2024

• add traversal preloader. update merge docs

  nasdf

  committed
  d32736c

• use basicnode in preloader

  nasdf

  committed
  01f5157

• Merge branch 'develop' into nasdf/fix/merge-retry-logic

  nasdf

  authored
  d9bbd87

• make preloader actually async

  nasdf

  committed
  32634a1