Update feature/array-map-inlining (atree inlining feature branch)

[fxamacker]

Merge main into feature/array-map-inlining

Conflict resolution

commit 691b753e2bf3cf558fbed962b3d9661d76bbb159
Merge: 0db5873 cd3b153
Author: Faye Amacker <[email protected]>
Date:   Thu Jul 25 10:03:57 2024 -0500

    Merge branch 'main' into fxamacker/update-array-map-inlining

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
remerge CONFLICT (content): Merge conflict in .github/workflows/ci.yml
index 2a58a74..081dca1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,13 +30,8 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< 0db5873 (Merge pull request #415 from onflow/fxamacker/update-copyright)
         os: [ubuntu-latest]
         go-version: ['1.20', 1.21]
-=======
-        os: [macos-latest, ubuntu-latest]
-        go-version: [1.19, '1.20']
->>>>>>> cd3b153 (Merge pull request #426 from onflow/dependabot/github_actions/github/codeql-action-3.25.13)
 
     steps:
     - name: Install Go
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
remerge CONFLICT (content): Merge conflict in .github/workflows/coverage.yml
index 22096fa..37d77fa 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -22,10 +22,6 @@ jobs:
 
       - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-<<<<<<< 0db5873 (Merge pull request #415 from onflow/fxamacker/update-copyright)
-          go-version: '1.20'
-=======
->>>>>>> cd3b153 (Merge pull request #426 from onflow/dependabot/github_actions/github/codeql-action-3.25.13)
           check-latest: true
 
       - name: Get dependencies
diff --git a/cmd/main/main.go b/cmd/main/main.go
deleted file mode 100644
remerge CONFLICT (modify/delete): cmd/main/main.go deleted in 0db5873 (Merge pull request #415 from onflow/fxamacker/update-copyright) and modified in cd3b153 (Merge pull request #426 from onflow/dependabot/github_actions/github/codeql-action-3.25.13).  Version cd3b153 (Merge pull request #426 from onflow/dependabot/github_actions/github/codeql-action-3.25.13) of cmd/main/main.go left in tree.
index 3f3aa1c..0000000
--- a/cmd/main/main.go
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Atree - Scalable Arrays and Ordered Maps
- *
- * Copyright Flow Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
-	"flag"
-	"fmt"
-
-	"github.com/onflow/atree"
-
-	"github.com/fxamacker/cbor/v2"
-)
-
-const cborTagUInt64Value = 164
-
-type Uint64Value uint64
-
-var _ atree.Value = Uint64Value(0)
-var _ atree.Storable = Uint64Value(0)
-
-func (v Uint64Value) ChildStorables() []atree.Storable {
-	return nil
-}
-
-func (v Uint64Value) StoredValue(_ atree.SlabStorage) (atree.Value, error) {
-	return v, nil
-}
-
-func (v Uint64Value) Storable(_ atree.SlabStorage, _ atree.Address, _ uint64) (atree.Storable, error) {
-	return v, nil
-}
-
-// Encode encodes UInt64Value as
-//
-//	cbor.Tag{
-//			Number:  cborTagUInt64Value,
-//			Content: uint64(v),
-//	}
-func (v Uint64Value) Encode(enc *atree.Encoder) error {
-	err := enc.CBOR.EncodeRawBytes([]byte{
-		// tag number
-		0xd8, cborTagUInt64Value,
-	})
-	if err != nil {
-		return err
-	}
-	return enc.CBOR.EncodeUint64(uint64(v))
-}
-
-// TODO: cache size
-func (v Uint64Value) ByteSize() uint32 {
-	// tag number (2 bytes) + encoded content
-	return 2 + atree.GetUintCBORSize(uint64(v))
-}
-
-func (v Uint64Value) String() string {
-	return fmt.Sprintf("%d", uint64(v))
-}
-
-type testTypeInfo struct{}
-
-var _ atree.TypeInfo = testTypeInfo{}
-
-func (testTypeInfo) Encode(e *cbor.StreamEncoder) error {
-	return e.EncodeUint8(42)
-}
-
-func (i testTypeInfo) Equal(other atree.TypeInfo) bool {
-	_, ok := other.(testTypeInfo)
-	return ok
-}
-
-func decodeStorable(dec *cbor.StreamDecoder, _ atree.SlabID) (atree.Storable, error) {
-	tagNumber, err := dec.DecodeTagNumber()
-	if err != nil {
-		return nil, err
-	}
-
-	switch tagNumber {
-	case atree.CBORTagSlabID:
-		return atree.DecodeSlabIDStorable(dec)
-
-	case cborTagUInt64Value:
-		n, err := dec.DecodeUint64()
-		if err != nil {
-			return nil, err
-		}
-		return Uint64Value(n), nil
-
-	default:
-		return nil, fmt.Errorf("invalid tag number %d", tagNumber)
-	}
-}
-
-// TODO: implement different slab size for metadata slab and data slab.
-func main() {
-	var slabSize uint64
-	var numElements uint64
-	var verbose bool
-
-	flag.Uint64Var(&slabSize, "size", 1024, "slab size in bytes")
-	flag.Uint64Var(&numElements, "count", 500, "number of elements in array")
-	flag.BoolVar(&verbose, "verbose", false, "verbose output")
-
-	flag.Parse()
-
-	minThreshold, maxThreshold, _, _ := atree.SetThreshold(slabSize)
-
-	fmt.Printf(
-		"Inserting %d elements (uint64) into array with slab size %d, min size %d, and max size %d ...\n",
-		numElements,
-		slabSize,
-		minThreshold,
-		maxThreshold,
-	)
-
-	encMode, err := cbor.EncOptions{}.EncMode()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	decMode, err := cbor.DecOptions{}.DecMode()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	storage := atree.NewBasicSlabStorage(encMode, decMode, decodeStorable, decodeTypeInfo)
-
-	typeInfo := testTypeInfo{}
-
-	address := atree.Address{1, 2, 3, 4, 5, 6, 7, 8}
-
-	array, err := atree.NewArray(storage, address, typeInfo)
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	for i := uint64(0); i < numElements; i++ {
-		err := array.Append(Uint64Value(i))
-		if err != nil {
-			fmt.Println(err)
-			return
-		}
-	}
-
-	stats, err := atree.GetArrayStats(array)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Printf("%+v\n", stats)
-
-	if verbose {
-		fmt.Printf("\n\n=========== array layout ===========\n")
-		atree.PrintArray(array)
-	}
-}
-
-func decodeTypeInfo(_ *cbor.StreamDecoder) (atree.TypeInfo, error) {
-	return testTypeInfo{}, nil
-}

______

• Targeted PR against main branch
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work
• Code follows the standards mentioned here
• Updated relevant documentation
• Re-reviewed Files changed in the Github PR explorer
• Added appropriate labels