Merge pull request #342 from onflow/fxamacker/inline-array-and-map

Inline child array and map data slab into parent slab
onflow · Oct 4, 2023 · 0fc8f74 · 0fc8f74
2 parents 1e6ec55 + 5f1de0a
commit 0fc8f74
Show file tree

Hide file tree

Showing 20 changed files with 19,051 additions and 5,499 deletions.
diff --git a/array.go b/array.go
diff --git a/array_bench_test.go b/array_bench_test.go
@@ -355,7 +355,7 @@ func benchmarkNewArrayFromAppend(b *testing.B, initialArraySize int) {
 	for i := 0; i < b.N; i++ {
 		copied, _ := NewArray(storage, array.Address(), array.Type())
 
-		_ = array.Iterate(func(value Value) (bool, error) {
+		_ = array.IterateReadOnly(func(value Value) (bool, error) {
 			_ = copied.Append(value)
 			return true, nil
 		})
@@ -379,7 +379,7 @@ func benchmarkNewArrayFromBatchData(b *testing.B, initialArraySize int) {
 	b.StartTimer()
 
 	for i := 0; i < b.N; i++ {
-		iter, err := array.Iterator()
+		iter, err := array.ReadOnlyIterator()
 		require.NoError(b, err)
 
 		copied, _ := NewArrayFromBatchData(storage, array.Address(), array.Type(), func() (Value, error) {