Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize meerdag #232

Merged
merged 2 commits into from
Oct 9, 2022
Merged

Optimize meerdag #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024a28f
Optimize meerdag
lochjin Oct 8, 2022
516bc11
Delete useless code
lochjin Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions meerdag/blockblue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ func (bd *MeerDAG) getBlueInfo(ib IBlock) *BlueInfo {
return NewBlueInfo(1, 0, 0, int64(ib.GetHeight()))
}
blues := 1
if pb.blueDiffAnticone != nil && !pb.blueDiffAnticone.IsEmpty() {
blues += pb.blueDiffAnticone.Size()
}
blues += pb.GetBlueDiffAnticoneSize()
return NewBlueInfo(pb.blueNum+1, mt/int64(blues), int64(mainIB.GetWeight()), int64(ib.GetHeight()))
}
77 changes: 72 additions & 5 deletions meerdag/pantomblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (pb *PhantomBlock) Encode(w io.Writer) error {

// blueDiffAnticone
blueDiffAnticone := []uint{}
if pb.blueDiffAnticone != nil && pb.blueDiffAnticone.Size() > 0 {
if pb.GetBlueDiffAnticoneSize() > 0 {
blueDiffAnticone = pb.blueDiffAnticone.List()
}
blueDiffAnticoneSize := len(blueDiffAnticone)
Expand Down Expand Up @@ -104,7 +104,6 @@ func (pb *PhantomBlock) Decode(r io.Reader) error {
if err != nil {
return err
}
pb.blueDiffAnticone = NewIdSet()
if blueDiffAnticoneSize > 0 {
for i := uint32(0); i < blueDiffAnticoneSize; i++ {
var bda uint32
Expand All @@ -119,7 +118,7 @@ func (pb *PhantomBlock) Decode(r io.Reader) error {
return err
}

pb.blueDiffAnticone.AddPair(uint(bda), uint(order))
pb.AddPairBlueDiffAnticone(uint(bda), uint(order))
}
}

Expand All @@ -129,7 +128,6 @@ func (pb *PhantomBlock) Decode(r io.Reader) error {
if err != nil {
return err
}
pb.redDiffAnticone = NewIdSet()
if redDiffAnticoneSize > 0 {
for i := uint32(0); i < redDiffAnticoneSize; i++ {
var bda uint32
Expand All @@ -143,7 +141,7 @@ func (pb *PhantomBlock) Decode(r io.Reader) error {
return err
}

pb.redDiffAnticone.AddPair(uint(bda), uint(order))
pb.AddPairRedDiffAnticone(uint(bda), uint(order))
}
}

Expand All @@ -162,3 +160,72 @@ func (pb *PhantomBlock) GetBlueDiffAnticone() *IdSet {
func (pb *PhantomBlock) GetRedDiffAnticone() *IdSet {
return pb.redDiffAnticone
}

func (pb *PhantomBlock) GetBlueDiffAnticoneSize() int {
if pb.blueDiffAnticone == nil {
return 0
}
return pb.blueDiffAnticone.Size()
}

func (pb *PhantomBlock) GetRedDiffAnticoneSize() int {
if pb.redDiffAnticone == nil {
return 0
}
return pb.redDiffAnticone.Size()
}

func (pb *PhantomBlock) GetDiffAnticoneSize() int {
return pb.GetBlueDiffAnticoneSize() + pb.GetRedDiffAnticoneSize()
}

func (pb *PhantomBlock) AddBlueDiffAnticone(id uint) {
if pb.blueDiffAnticone == nil {
pb.blueDiffAnticone = NewIdSet()
}
pb.blueDiffAnticone.Add(id)
}

func (pb *PhantomBlock) AddRedDiffAnticone(id uint) {
if pb.redDiffAnticone == nil {
pb.redDiffAnticone = NewIdSet()
}
pb.redDiffAnticone.Add(id)
}

func (pb *PhantomBlock) AddPairBlueDiffAnticone(id uint, order uint) {
if pb.blueDiffAnticone == nil {
pb.blueDiffAnticone = NewIdSet()
}
pb.blueDiffAnticone.AddPair(id, order)
}

func (pb *PhantomBlock) AddPairRedDiffAnticone(id uint, order uint) {
if pb.redDiffAnticone == nil {
pb.redDiffAnticone = NewIdSet()
}
pb.redDiffAnticone.AddPair(id, order)
}

func (pb *PhantomBlock) HasBlueDiffAnticone(id uint) bool {
if pb.blueDiffAnticone == nil {
return false
}
return pb.blueDiffAnticone.Has(id)
}

func (pb *PhantomBlock) HasRedDiffAnticone(id uint) bool {
if pb.redDiffAnticone == nil {
return false
}
return pb.redDiffAnticone.Has(id)
}

func (pb *PhantomBlock) CleanDiffAnticone() {
if pb.blueDiffAnticone != nil {
pb.blueDiffAnticone.Clean()
}
if pb.redDiffAnticone != nil {
pb.redDiffAnticone.Clean()
}
}
123 changes: 67 additions & 56 deletions meerdag/phantom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (ph *Phantom) AddBlock(ib IBlock) (*list.List, *list.List) {

// Build self block
func (ph *Phantom) CreateBlock(b *Block) IBlock {
return &PhantomBlock{b, 0, NewIdSet(), NewIdSet()}
return &PhantomBlock{b, 0, nil, nil}
}

func (ph *Phantom) updateBlockColor(pb *PhantomBlock) {
Expand Down Expand Up @@ -123,12 +123,12 @@ func (ph *Phantom) calculateBlueSet(pb *PhantomBlock, diffAnticone *IdSet) {
if !ok {
panic("phantom block type is error.")
}
ph.colorBlock(kc, cur, pb.blueDiffAnticone, pb.redDiffAnticone)
ph.colorBlock(kc, cur, pb)
}
if diffAnticone.Size() != pb.blueDiffAnticone.Size()+pb.redDiffAnticone.Size() {
if diffAnticone.Size() != pb.GetDiffAnticoneSize() {
log.Error(fmt.Sprintf("error blue set"))
}
pb.blueNum += uint(pb.blueDiffAnticone.Size())
pb.blueNum += uint(pb.GetBlueDiffAnticoneSize())
}

func (ph *Phantom) getKChain(pb *PhantomBlock) *KChain {
Expand All @@ -141,7 +141,7 @@ func (ph *Phantom) getKChain(pb *PhantomBlock) *KChain {
blueCount++
deep++
result.miniLayer = curPb.GetLayer()
blueCount += curPb.blueDiffAnticone.Size()
blueCount += curPb.GetBlueDiffAnticoneSize()
if (blueCount > ph.anticoneSize && deep > MaxTipLayerGap*2) || curPb.mainParent == MaxId {
break
}
Expand All @@ -150,11 +150,11 @@ func (ph *Phantom) getKChain(pb *PhantomBlock) *KChain {
return result
}

func (ph *Phantom) colorBlock(kc *KChain, pb *PhantomBlock, blueOrder *IdSet, redOrder *IdSet) {
func (ph *Phantom) colorBlock(kc *KChain, pb *PhantomBlock, blueRedOrder *PhantomBlock) {
if ph.coloringRule(kc, pb) {
blueOrder.Add(pb.GetID())
blueRedOrder.AddBlueDiffAnticone(pb.GetID())
} else {
redOrder.Add(pb.GetID())
blueRedOrder.AddRedDiffAnticone(pb.GetID())
}
}

Expand All @@ -181,15 +181,15 @@ func (ph *Phantom) updateBlockOrder(pb *PhantomBlock) {
}
order := ph.getDiffAnticoneOrder(pb)
l := len(order)
if l != pb.blueDiffAnticone.Size()+pb.redDiffAnticone.Size() {
if l != pb.GetDiffAnticoneSize() {
log.Error(fmt.Sprintf("error block order"))
}
for i := 0; i < l; i++ {
index := i + 1
if pb.blueDiffAnticone.Has(order[i]) {
pb.blueDiffAnticone.AddPair(order[i], uint(index))
} else if pb.redDiffAnticone.Has(order[i]) {
pb.redDiffAnticone.AddPair(order[i], uint(index))
if pb.HasBlueDiffAnticone(order[i]) {
pb.AddPairBlueDiffAnticone(order[i], uint(index))
} else if pb.HasRedDiffAnticone(order[i]) {
pb.AddPairRedDiffAnticone(order[i], uint(index))
} else {
log.Error(fmt.Sprintf("error block order index"))
}
Expand Down Expand Up @@ -257,10 +257,12 @@ func (ph *Phantom) sortBlocks(lastBlock uint, blueDiffAnticone *IdSet, toSort *I

func (ph *Phantom) buildSortDiffAnticone(diffAn *IdSet) *IdSet {
result := NewIdSet()
for k := range diffAn.GetMap() {
ib := ph.getBlock(k)
if ib != nil {
result.AddPair(k, ib)
if diffAn != nil {
for k := range diffAn.GetMap() {
ib := ph.getBlock(k)
if ib != nil {
result.AddPair(k, ib)
}
}
}
return result
Expand Down Expand Up @@ -372,25 +374,31 @@ func (ph *Phantom) updateMainOrder(path []uint, intersection uint) {
for i := l - 1; i >= 0; i-- {
curBlock := ph.getBlock(path[i])
ph.bd.lastSnapshot.AddOrder(curBlock)
curBlock.SetOrder(startOrder + uint(curBlock.blueDiffAnticone.Size()+curBlock.redDiffAnticone.Size()+1))
curBlock.SetOrder(startOrder + uint(curBlock.GetDiffAnticoneSize()+1))
ph.bd.commitOrder[curBlock.GetOrder()] = curBlock.GetID()
ph.bd.commitBlock.AddPair(curBlock.GetID(), curBlock)

ph.mainChain.commitBlocks.AddPair(curBlock.GetID(), true)
for k, v := range curBlock.blueDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
if curBlock.GetBlueDiffAnticoneSize() > 0 {
for k, v := range curBlock.blueDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
}
}
for k, v := range curBlock.redDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)

if curBlock.GetRedDiffAnticoneSize() > 0 {
for k, v := range curBlock.redDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
}
}

startOrder = curBlock.GetOrder()
}
//
Expand Down Expand Up @@ -419,27 +427,31 @@ func (ph *Phantom) UpdateVirtualBlockOrder() *PhantomBlock {
ph.virtualBlock.height = tp.height + 1
//ph.virtualBlock.weight = tp.GetWeight()

ph.virtualBlock.blueDiffAnticone.Clean()
ph.virtualBlock.redDiffAnticone.Clean()
ph.virtualBlock.CleanDiffAnticone()

ph.calculateBlueSet(ph.virtualBlock, ph.diffAnticone)
ph.updateBlockOrder(ph.virtualBlock)

startOrder := ph.getBlock(ph.mainChain.tip).GetOrder()
for k, v := range ph.virtualBlock.blueDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
if ph.virtualBlock.GetBlueDiffAnticoneSize() > 0 {
for k, v := range ph.virtualBlock.blueDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
}
}
for k, v := range ph.virtualBlock.redDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
if ph.virtualBlock.GetRedDiffAnticoneSize() > 0 {
for k, v := range ph.virtualBlock.redDiffAnticone.GetMap() {
dab := ph.getBlock(k)
ph.bd.lastSnapshot.AddOrder(dab)
dab.SetOrder(startOrder + v.(uint))
ph.bd.commitOrder[dab.GetOrder()] = dab.GetID()
ph.bd.commitBlock.AddPair(dab.GetID(), dab)
}
}

ph.bd.lastSnapshot.AddOrder(ph.virtualBlock)
ph.virtualBlock.SetOrder(ph.bd.blockTotal + 1)

Expand Down Expand Up @@ -591,7 +603,6 @@ func (ph *Phantom) Load(dbTx database.Tx) error {

ph.mainChain.genesis = 0
ph.mainChain.tip = tips[0]

for i := uint(0); i < ph.bd.blockTotal; i++ {
block := Block{id: i}
ib := ph.CreateBlock(&block)
Expand All @@ -607,17 +618,15 @@ func (ph *Phantom) Load(dbTx database.Tx) error {
}
// Make up for missing
if ib.HasParents() {
parentsSet := NewIdSet()
for k := range ib.GetParents().GetMap() {
parents := ib.GetParents()
for k := range parents.GetMap() {
parent := ph.bd.getBlockById(k)
parentsSet.AddPair(k, parent)
parents.AddPair(k, parent)
parent.AddChild(ib)
}
ib.GetParents().Clean()
ib.GetParents().AddSet(parentsSet)
}
ph.bd.blocks[ib.GetID()] = ib
//

if !ib.IsOrdered() {
ph.diffAnticone.AddPair(ib.GetID(), ib)
} else {
Expand Down Expand Up @@ -704,7 +713,7 @@ func (ph *Phantom) doIsBlue(ib IBlock, fork IBlock) bool {

for ; cur != nil; cur = ph.getBlock(cur.mainParent) {
if cur.GetHash().IsEqual(b.GetHash()) ||
cur.blueDiffAnticone.Has(b.GetID()) {
cur.HasBlueDiffAnticone(b.GetID()) {
return true
}
if cur.GetLayer() < b.GetLayer() {
Expand Down Expand Up @@ -770,7 +779,7 @@ func (ph *Phantom) GetMainParentConcurrency(b IBlock) int {
return 0
}
pblock := b.(*PhantomBlock)
result := pblock.redDiffAnticone.Size() + pblock.blueDiffAnticone.Size() + 1
result := pblock.GetDiffAnticoneSize() + 1
return result
}

Expand All @@ -789,9 +798,11 @@ func (ph *Phantom) UpdateWeight(ib IBlock) {
pb.weight = tp.GetWeight()

pb.weight += uint64(ph.bd.calcWeight(pb, ph.bd.getBlueInfo(pb)))
for k := range pb.blueDiffAnticone.GetMap() {
bdpb := ph.getBlock(k)
pb.weight += uint64(ph.bd.calcWeight(bdpb, ph.bd.getBlueInfo(bdpb)))
if pb.GetBlueDiffAnticoneSize() > 0 {
for k := range pb.blueDiffAnticone.GetMap() {
bdpb := ph.getBlock(k)
pb.weight += uint64(ph.bd.calcWeight(bdpb, ph.bd.getBlueInfo(bdpb)))
}
}
ph.bd.commitBlock.AddPair(ib.GetID(), ib)
}
Expand Down