Moved vGen[] field from LayerFinalRef to LayerDeltaRef

why: Then a separate `FilterRef` type is not needed, anymore
status-im · mjfh · Jun 3, 2024 · May 31, 2024 · Jun 3, 2024 · Jun 3, 2024
commit 0e1c09206dae6ce028c5b8d4edf1c2679a41083d
diff --git a/nimbus/db/aristo/aristo_debug.nim b/nimbus/db/aristo/aristo_debug.nim
@@ -501,9 +501,9 @@ proc ppLayer(
  result &= "<layer>".doPrefix(false)
  if vGenOk:
  let
- tLen = layer.final.vGen.len
+ tLen = layer.delta.vGen.len
  info = "vGen(" & $tLen & ")"
- result &= info.doPrefix(0 < tLen) & layer.final.vGen.ppVidList
+ result &= info.doPrefix(0 < tLen) & layer.delta.vGen.ppVidList
  if sTabOk:
  let
  tLen = layer.delta.sTab.len

diff --git a/nimbus/db/aristo/aristo_delta.nim b/nimbus/db/aristo/aristo_delta.nim
@@ -56,7 +56,7 @@ proc deltaFwd*(
  src: srcRoot,
  sTab: layer.delta.sTab,
  kMap: layer.delta.kMap,
- vGen: layer.final.vGen.vidReorg) # Compact recycled IDs
+ vGen: layer.delta.vGen.vidReorg) # Compact recycled IDs
 
 # ------------------------------------------------------------------------------
 # Public functions, apply/install filters

diff --git a/nimbus/db/aristo/aristo_desc.nim b/nimbus/db/aristo/aristo_desc.nim
@@ -203,11 +203,11 @@ proc fork*(
  if not noTopLayer:
  clone.top = LayerRef.init()
  if not db.roFilter.isNil:
- clone.top.final.vGen = db.roFilter.vGen
+ clone.top.delta.vGen = db.roFilter.vGen
  else:
  let rc = clone.backend.getIdgFn()
  if rc.isOk:
- clone.top.final.vGen = rc.value
+ clone.top.delta.vGen = rc.value
  elif rc.error != GetIdgNotFound:
  return err(rc.error)
 

diff --git a/nimbus/db/aristo/aristo_desc/desc_structural.nim b/nimbus/db/aristo/aristo_desc/desc_structural.nim
@@ -110,6 +110,7 @@ type
  ##
  sTab*: Table[VertexID,VertexRef] ## Structural vertex table
  kMap*: Table[VertexID,HashKey] ## Merkle hash key mapping
+ vGen*: seq[VertexID] ## Recycling state for vertex IDs
 
  LayerFinalRef* = ref object
  ## Final tables fully supersede tables on lower layers when stacked as a
@@ -121,7 +122,6 @@ type
  ##
  pPrf*: HashSet[VertexID] ## Locked vertices (proof nodes)
  fRpp*: Table[HashKey,VertexID] ## Key lookup for `pPrf[]` (proof nodes)
- vGen*: seq[VertexID] ## Recycling state for vertex IDs
  dirty*: HashSet[VertexID] ## Start nodes to re-hashiy from
 
  LayerRef* = ref LayerObj
@@ -280,7 +280,6 @@ func dup*(final: LayerFinalRef): LayerFinalRef =
  LayerFinalRef(
  pPrf: final.pPrf,
  fRpp: final.fRpp,
- vGen: final.vGen,
  dirty: final.dirty)
 
 func dup*(wp: VidVtxPair): VidVtxPair =

diff --git a/nimbus/db/aristo/aristo_init/persistent.nim b/nimbus/db/aristo/aristo_init/persistent.nim
@@ -46,8 +46,8 @@ proc newAristoRdbDbRef(
  rc.value
  ok AristoDbRef(
  top: LayerRef(
- delta: LayerDeltaRef(),
- final: LayerFinalRef(vGen: vGen)),
+ delta: LayerDeltaRef(vGen: vGen),
+ final: LayerFinalRef()),
  backend: be)
 
 # ------------------------------------------------------------------------------

diff --git a/nimbus/db/aristo/aristo_layers.nim b/nimbus/db/aristo/aristo_layers.nim
@@ -36,7 +36,7 @@ func pPrf*(db: AristoDbRef): lent HashSet[VertexID] =
  db.top.final.pPrf
 
 func vGen*(db: AristoDbRef): lent seq[VertexID] =
- db.top.final.vGen
+ db.top.delta.vGen
 
 # ------------------------------------------------------------------------------
 # Public getters/helpers
@@ -190,6 +190,7 @@ func layersMergeOnto*(src: LayerRef; trg: var LayerObj) =
  trg.delta.sTab[vid] = vtx
  for (vid,key) in src.delta.kMap.pairs:
  trg.delta.kMap[vid] = key
+ trg.delta.vGen = src.delta.vGen
 
 
 func layersCc*(db: AristoDbRef; level = high(int)): LayerRef =
@@ -205,7 +206,8 @@ func layersCc*(db: AristoDbRef; level = high(int)): LayerRef =
  final: layers[^1].final.dup, # Pre-merged/final values
  delta: LayerDeltaRef(
  sTab: layers[0].delta.sTab.dup, # explicit dup for ref values
- kMap: layers[0].delta.kMap))
+ kMap: layers[0].delta.kMap,
+ vGen: layers[^1].delta.vGen))
 
  # Consecutively merge other layers on top
  for n in 1 ..< layers.len:

diff --git a/nimbus/db/aristo/aristo_tx/tx_fork.nim b/nimbus/db/aristo/aristo_tx/tx_fork.nim
@@ -69,8 +69,8 @@ proc txFork*(
  let rc = db.getIdgBE()
  if rc.isOk:
  LayerRef(
- delta: LayerDeltaRef(),
- final: LayerFinalRef(vGen: rc.value))
+ delta: LayerDeltaRef(vGen: rc.value),
+ final: LayerFinalRef())
  elif rc.error == GetIdgNotFound:
  LayerRef.init()
  else:

diff --git a/nimbus/db/aristo/aristo_tx/tx_frame.nim b/nimbus/db/aristo/aristo_tx/tx_frame.nim
@@ -81,9 +81,10 @@ proc txFrameBegin*(db: AristoDbRef): Result[AristoTxRef,AristoError] =
  if db.txFrameLevel != db.stack.len:
  return err(TxStackGarbled)
 
+ let vGen = db.top.delta.vGen
  db.stack.add db.top
  db.top = LayerRef(
- delta: LayerDeltaRef(),
+ delta: LayerDeltaRef(vGen: vGen),
  final: db.top.final.dup,
  txUid: db.getTxUid)
 

diff --git a/nimbus/db/aristo/aristo_tx/tx_stow.nim b/nimbus/db/aristo/aristo_tx/tx_stow.nim
@@ -59,11 +59,11 @@ proc txStow*(
  delta: LayerDeltaRef(),
  final: final)
  if db.roFilter.isValid:
- db.top.final.vGen = db.roFilter.vGen
+ db.top.delta.vGen = db.roFilter.vGen
  else:
  let rc = db.getIdgUbe()
  if rc.isOk:
- db.top.final.vGen = rc.value
+ db.top.delta.vGen = rc.value
  else:
  # It is OK if there was no `Idg`. Otherwise something serious happened
  # and there is no way to recover easily.
@@ -79,12 +79,12 @@ proc txStow*(
 
  # Special treatment for `snap` proofs (aka `chunkedMpt`)
  let final =
- if chunkedMpt: LayerFinalRef(vGen: db.vGen, fRpp: db.top.final.fRpp)
- else: LayerFinalRef(vGen: db.vGen)
+ if chunkedMpt: LayerFinalRef(fRpp: db.top.final.fRpp)
+ else: LayerFinalRef()
 
  # New empty top layer (probably with `snap` proofs carry over)
  db.top = LayerRef(
- delta: LayerDeltaRef(),
+ delta: LayerDeltaRef(vGen: db.vGen),
  final: final,
  txUid: db.top.txUid)
  ok()

diff --git a/nimbus/db/aristo/aristo_vid.nim b/nimbus/db/aristo/aristo_vid.nim
@@ -33,15 +33,15 @@ proc vidFetch*(db: AristoDbRef; pristine = false): VertexID =
  ##
  if db.vGen.len == 0:
  # Note that `VertexID(1)` is the root of the main trie
- db.top.final.vGen = @[VertexID(LEAST_FREE_VID+1)]
+ db.top.delta.vGen = @[VertexID(LEAST_FREE_VID+1)]
  result = VertexID(LEAST_FREE_VID)
  elif db.vGen.len == 1 or pristine:
  result = db.vGen[^1]
- db.top.final.vGen[^1] = result + 1
+ db.top.delta.vGen[^1] = result + 1
  else:
  result = db.vGen[^2]
- db.top.final.vGen[^2] = db.top.final.vGen[^1]
- db.top.final.vGen.setLen(db.vGen.len-1)
+ db.top.delta.vGen[^2] = db.top.delta.vGen[^1]
+ db.top.delta.vGen.setLen(db.vGen.len-1)
  doAssert LEAST_FREE_VID <= result.distinctBase
 
 
@@ -64,14 +64,14 @@ proc vidDispose*(db: AristoDbRef; vid: VertexID) =
  ##
  if LEAST_FREE_VID <= vid.distinctBase:
  if db.vGen.len == 0:
- db.top.final.vGen = @[vid]
+ db.top.delta.vGen = @[vid]
  else:
  let topID = db.vGen[^1]
  # Only store smaller numbers: all numberts larger than `topID`
  # are free numbers
  if vid < topID:
- db.top.final.vGen[^1] = vid
- db.top.final.vGen.add topID
+ db.top.delta.vGen[^1] = vid
+ db.top.delta.vGen.add topID
 
 
 proc vidReorg*(vGen: seq[VertexID]): seq[VertexID] =

diff --git a/tests/test_aristo.nim b/tests/test_aristo.nim
@@ -176,7 +176,7 @@ when isMainModule:
  noisy.accountsRunner(sam, resetDb=true)
 
  when true: # and false:
- let persistent = false or true
+ let persistent = false # or true
  noisy.showElapsed("@snap_test_list"):
  for n,sam in snapTestList:
  noisy.accountsRunner(sam, persistent=persistent)

diff --git a/tests/test_aristo/test_misc.nim b/tests/test_aristo/test_misc.nim
@@ -109,7 +109,7 @@ proc testVidRecycleLists*(noisy = true; seed = 42): bool =
  db1 = AristoDbRef.init()
  rc = dbBlob.deblobify seq[VertexID]
  xCheckRc rc.error == 0
- db1.top.final.vGen = rc.value
+ db1.top.delta.vGen = rc.value
 
  xCheck db.vGen == db1.vGen
 
@@ -127,7 +127,7 @@ proc testVidRecycleLists*(noisy = true; seed = 42): bool =
  xCheck db.vGen.len == 1
 
  # Repeat last test after clearing the cache
- db.top.final.vGen.setLen(0)
+ db.top.delta.vGen.setLen(0)
  for n in 0 .. 5:
  let w = db.vidFetch()
  xCheck w == VertexID(LEAST_FREE_VID) + n # VertexID(1) is default root ID