@@ -19,7 +19,6 @@ import (
1919 "fmt"
2020 "strings"
2121
22- "github.com/cockroachdb/errors"
2322 doltserial "github.com/dolthub/dolt/go/gen/fb/serial"
2423 "github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
2524 "github.com/dolthub/dolt/go/store/hash"
@@ -34,53 +33,30 @@ import (
3433
3534// emptyRootValue is Doltgres' implementation of doltdb.EmptyRootValue.
3635func emptyRootValue (ctx context.Context , vrw types.ValueReadWriter , ns tree.NodeStore ) (doltdb.RootValue , error ) {
37- if vrw .Format ().UsesFlatbuffers () {
38- builder := flatbuffers .NewBuilder (80 )
36+ builder := flatbuffers .NewBuilder (80 )
3937
40- emptyam , err := prolly .NewEmptyAddressMap (ns )
41- if err != nil {
42- return nil , err
43- }
44- ambytes := []byte (tree .ValueFromNode (emptyam .Node ()).(types.SerialMessage ))
45- tablesoff := builder .CreateByteVector (ambytes )
46-
47- var empty hash.Hash
48- fkoff := builder .CreateByteVector (empty [:])
49- serial .RootValueStart (builder )
50- serial .RootValueAddFeatureVersion (builder , int64 (DoltgresFeatureVersion ))
51- serial .RootValueAddCollation (builder , serial .Collationutf8mb4_0900_bin )
52- serial .RootValueAddTables (builder , tablesoff )
53- serial .RootValueAddForeignKeyAddr (builder , fkoff )
54- bs := doltserial .FinishMessage (builder , serial .RootValueEnd (builder ), []byte (doltserial .DoltgresRootValueFileID ))
55- return newRootValue (ctx , vrw , ns , types .SerialMessage (bs ))
56- }
57-
58- empty , err := types .NewMap (ctx , vrw )
59- if err != nil {
60- return nil , err
61- }
62-
63- sd := types.StructData {
64- tablesKey : empty ,
65- foreignKeyKey : empty ,
66- featureVersKey : types .Int (DoltgresFeatureVersion ),
67- }
68-
69- st , err := types .NewStruct (vrw .Format (), ddbRootStructName , sd )
38+ emptyam , err := prolly .NewEmptyAddressMap (ns )
7039 if err != nil {
7140 return nil , err
7241 }
73-
74- return newRootValue (ctx , vrw , ns , st )
42+ ambytes := []byte (tree .ValueFromNode (emptyam .Node ()).(types.SerialMessage ))
43+ tablesoff := builder .CreateByteVector (ambytes )
44+
45+ var empty hash.Hash
46+ fkoff := builder .CreateByteVector (empty [:])
47+ serial .RootValueStart (builder )
48+ serial .RootValueAddFeatureVersion (builder , int64 (DoltgresFeatureVersion ))
49+ serial .RootValueAddCollation (builder , serial .Collationutf8mb4_0900_bin )
50+ serial .RootValueAddTables (builder , tablesoff )
51+ serial .RootValueAddForeignKeyAddr (builder , fkoff )
52+ bs := doltserial .FinishMessage (builder , serial .RootValueEnd (builder ), []byte (doltserial .DoltgresRootValueFileID ))
53+ return newRootValue (ctx , vrw , ns , types .SerialMessage (bs ))
7554}
7655
7756// newRootValue is Doltgres' implementation of doltdb.NewRootValue.
7857func newRootValue (ctx context.Context , vrw types.ValueReadWriter , ns tree.NodeStore , v types.Value ) (doltdb.RootValue , error ) {
7958 var st storage.RootStorage
8059
81- if ! vrw .Format ().UsesFlatbuffers () {
82- return nil , errors .Errorf ("unsupported vrw" )
83- }
8460 srv , err := serial .TryGetRootAsRootValue ([]byte (v .(types.SerialMessage )), doltserial .MessagePrefixSz )
8561 if err != nil {
8662 return nil , err
0 commit comments