Remove obsolete __DOLT_DEV__ NomsBinFormat.

.github/workflows/ci-go-race-enginetests.yaml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04 ]
-        dolt_fmt: [ "__DOLT__", "__LD_1__", "__DOLT_DEV__" ]
+        dolt_fmt: [ "__DOLT__", "__LD_1__" ]
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3

.github/workflows/ci-go-tests.yaml

@@ -25,9 +25,6 @@ jobs:
         dolt_fmt: [ "__DOLT__", "__LD_1__" ]
         journal_store: [ "" ]
         include:
-          - os: "ubuntu-22.04"
-            dolt_fmt: "__DOLT_DEV__"
-            journal_store: ""
           - os: "ubuntu-22.04"
             dolt_fmt: "__DOLT__"
             journal_store: "true"
@@ -81,9 +78,6 @@ jobs:
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest]
         dolt_fmt: [ "__DOLT__", "__LD_1__" ]
-        include:
-          - os: "ubuntu-22.04"
-            dolt_fmt: "__DOLT_DEV__"
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3

go/libraries/doltcore/doltdb/durable/artifact_index.go

@@ -42,7 +42,7 @@ type ArtifactIndex interface {
 // RefFromArtifactIndex persists |idx| and returns the types.Ref targeting it.
 func RefFromArtifactIndex(ctx context.Context, vrw types.ValueReadWriter, idx ArtifactIndex) (types.Ref, error) {
 	switch idx.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		panic("TODO")
 
 	case types.Format_DOLT:
@@ -57,7 +57,7 @@ func RefFromArtifactIndex(ctx context.Context, vrw types.ValueReadWriter, idx Ar
 // NewEmptyArtifactIndex returns an ArtifactIndex with no artifacts.
 func NewEmptyArtifactIndex(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeStore, tableSch schema.Schema) (ArtifactIndex, error) {
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		panic("TODO")
 
 	case types.Format_DOLT:
@@ -94,7 +94,7 @@ func artifactIndexFromAddr(ctx context.Context, vrw types.ValueReadWriter, ns tr
 	}
 
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		panic("TODO")
 
 	case types.Format_DOLT:

go/libraries/doltcore/doltdb/durable/conflict_index.go

@@ -33,7 +33,7 @@ type ConflictIndex interface {
 // RefFromConflictIndex persists |idx| and returns the types.Ref targeting it.
 func RefFromConflictIndex(ctx context.Context, vrw types.ValueReadWriter, idx ConflictIndex) (types.Ref, error) {
 	switch idx.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		return refFromNomsValue(ctx, vrw, idx.(nomsConflictIndex).index)
 
 	case types.Format_DOLT:
@@ -47,7 +47,7 @@ func RefFromConflictIndex(ctx context.Context, vrw types.ValueReadWriter, idx Co
 // NewEmptyConflictIndex returns an ConflictIndex with no rows.
 func NewEmptyConflictIndex(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeStore, oursSch, theirsSch, baseSch schema.Schema) (ConflictIndex, error) {
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		m, err := types.NewMap(ctx, vrw)
 		if err != nil {
 			return nil, err
@@ -84,7 +84,7 @@ func conflictIndexFromAddr(ctx context.Context, vrw types.ValueReadWriter, ns tr
 	}
 
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		return ConflictIndexFromNomsMap(v.(types.Map), vrw), nil
 
 	case types.Format_DOLT:

go/libraries/doltcore/doltdb/durable/index.go

@@ -77,7 +77,7 @@ type IndexSet interface {
 // RefFromIndex persists the Index and returns a types.Ref to it.
 func RefFromIndex(ctx context.Context, vrw types.ValueReadWriter, idx Index) (types.Ref, error) {
 	switch idx.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		return refFromNomsValue(ctx, vrw, idx.(nomsIndex).index)
 
 	case types.Format_DOLT:
@@ -101,7 +101,7 @@ func indexFromAddr(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeS
 	}
 
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		return IndexFromNomsMap(v.(types.Map), vrw, ns), nil
 
 	case types.Format_DOLT:
@@ -119,7 +119,7 @@ func indexFromAddr(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeS
 // NewEmptyIndex returns an index with no rows.
 func NewEmptyIndex(ctx context.Context, vrw types.ValueReadWriter, ns tree.NodeStore, sch schema.Schema) (Index, error) {
 	switch vrw.Format() {
-	case types.Format_LD_1, types.Format_7_18, types.Format_DOLT_DEV:
+	case types.Format_LD_1, types.Format_7_18:
 		m, err := types.NewMap(ctx, vrw)
 		if err != nil {
 			return nil, err

go/libraries/doltcore/doltdb/durable/table.go

@@ -26,7 +26,6 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/conflict"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding"
-	"github.com/dolthub/dolt/go/store/chunks"
 	"github.com/dolthub/dolt/go/store/hash"
 	"github.com/dolthub/dolt/go/store/pool"
 	"github.com/dolthub/dolt/go/store/prolly"
@@ -722,19 +721,12 @@ func (t doltDevTable) DebugString(ctx context.Context) string {
 		panic(err)
 	}
 
-	if t.vrw.Format() == types.Format_DOLT_DEV {
-		m := NomsMapFromIndex(rows)
-		var b bytes.Buffer
-		_ = types.WriteEncodedValue(ctx, &b, m)
-		return b.String()
-	} else {
-		m := ProllyMapFromIndex(rows)
-		var b bytes.Buffer
-		m.WalkNodes(ctx, func(ctx context.Context, nd tree.Node) error {
-			return tree.OutputProllyNode(&b, nd)
-		})
-		return b.String()
-	}
+	m := ProllyMapFromIndex(rows)
+	var b bytes.Buffer
+	m.WalkNodes(ctx, func(ctx context.Context, nd tree.Node) error {
+		return tree.OutputProllyNode(&b, nd)
+	})
+	return b.String()
 }
 
 var _ Table = doltDevTable{}
@@ -877,24 +869,15 @@ func (t doltDevTable) SetSchema(ctx context.Context, sch schema.Schema) (Table,
 
 func (t doltDevTable) GetTableRows(ctx context.Context) (Index, error) {
 	rowbytes := t.msg.PrimaryIndexBytes()
-	if t.vrw.Format() == types.Format_DOLT_DEV {
-		rowchunk := chunks.NewChunk(rowbytes)
-		tv, err := types.DecodeValue(rowchunk, t.vrw)
-		if err != nil {
-			return nil, err
-		}
-		return IndexFromNomsMap(tv.(types.Map), t.vrw, t.ns), nil
-	} else {
-		sch, err := t.GetSchema(ctx)
-		if err != nil {
-			return nil, err
-		}
-		m, err := shim.MapFromValue(types.SerialMessage(rowbytes), sch, t.ns)
-		if err != nil {
-			return nil, err
-		}
-		return IndexFromProllyMap(m), nil
+	sch, err := t.GetSchema(ctx)
+	if err != nil {
+		return nil, err
 	}
+	m, err := shim.MapFromValue(types.SerialMessage(rowbytes), sch, t.ns)
+	if err != nil {
+		return nil, err
+	}
+	return IndexFromProllyMap(m), nil
 }
 
 func (t doltDevTable) SetTableRows(ctx context.Context, rows Index) (Table, error) {

go/libraries/doltcore/sqle/binlogreplication/binlog_replication_alltypes_test.go

@@ -519,8 +519,8 @@ func assertValues(t *testing.T, assertionIndex int, row map[string]interface{})
 			actualValue = row[typeDesc.ColumnName()].(string)
 		}
 		if typeDesc.TypeDefinition == "json" {
-			// LD_1, DOLT_DEV, and DOLT storage formats return JSON strings slightly differently; DOLT removes spaces
-			// while LD_1 and DOLT_DEV add whitespace, so for json comparison, we sanitize by removing whitespace.
+			// LD_1 and DOLT storage formats return JSON strings slightly differently; DOLT removes spaces
+			// while LD_1 add whitespace, so for json comparison, we sanitize by removing whitespace.
 			actualValue = strings.ReplaceAll(actualValue, " ", "")
 		}
 

go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go

@@ -442,7 +442,7 @@ func TestDoltUserPrivileges(t *testing.T) {
 }
 
 func TestJoinOps(t *testing.T) {
-	if types.IsFormat_DOLT_DEV(types.Format_Default) || types.IsFormat_LD(types.Format_Default) {
+	if types.IsFormat_LD(types.Format_Default) {
 		t.Skip("DOLT_LD keyless indexes are not sorted")
 	}
 
@@ -450,7 +450,7 @@ func TestJoinOps(t *testing.T) {
 }
 
 func TestJoinPlanningPrepared(t *testing.T) {
-	if types.IsFormat_DOLT_DEV(types.Format_Default) || types.IsFormat_LD(types.Format_Default) {
+	if types.IsFormat_LD(types.Format_Default) {
 		t.Skip("DOLT_LD keyless indexes are not sorted")
 	}
 
@@ -458,7 +458,7 @@ func TestJoinPlanningPrepared(t *testing.T) {
 }
 
 func TestJoinPlanning(t *testing.T) {
-	if types.IsFormat_DOLT_DEV(types.Format_Default) || types.IsFormat_LD(types.Format_Default) {
+	if types.IsFormat_LD(types.Format_Default) {
 		t.Skip("DOLT_LD keyless indexes are not sorted")
 	}
 
@@ -466,7 +466,7 @@ func TestJoinPlanning(t *testing.T) {
 }
 
 func TestJoinOpsPrepared(t *testing.T) {
-	if types.IsFormat_DOLT_DEV(types.Format_Default) || types.IsFormat_LD(types.Format_Default) {
+	if types.IsFormat_LD(types.Format_Default) {
 		t.Skip("DOLT_LD keyless indexes are not sorted")
 	}
 

go/libraries/doltcore/sqle/sqlselect_test.go

@@ -92,8 +92,6 @@ func BasicSelectTests() []SelectTest {
 	switch types.Format_Default {
 	case types.Format_DOLT:
 		headCommitHash = "a0gt4vif0b0bf19g89k87gs55qqlqpod"
-	case types.Format_DOLT_DEV:
-		headCommitHash = "a0gt4vif0b0bf19g89k87gs55qqlqpod"
 	case types.Format_LD_1:
 		headCommitHash = "73hc2robs4v0kt9taoe3m5hd49dmrgun"
 	}

go/libraries/doltcore/sqle/testutil.go

@@ -564,7 +564,7 @@ func SqlRowsFromDurableIndex(idx durable.Index, sch schema.Schema) ([]sql.Row, e
 		}
 
 	} else {
-		// types.Format_LD_1 and types.Format_DOLT_DEV
+		// types.Format_LD_1
 		rowData := durable.NomsMapFromIndex(idx)
 		_ = rowData.IterAll(ctx, func(key, value types.Value) error {
 			r, err := row.FromNoms(sch, key.(types.Tuple), value.(types.Tuple))

go/libraries/doltcore/table/editor/creation/index.go

@@ -141,7 +141,7 @@ func CreateIndex(
 
 func BuildSecondaryIndex(ctx context.Context, tbl *doltdb.Table, idx schema.Index, opts editor.Options) (durable.Index, error) {
 	switch tbl.Format() {
-	case types.Format_LD_1, types.Format_DOLT_DEV:
+	case types.Format_LD_1:
 		m, err := editor.RebuildIndex(ctx, tbl, idx.Name(), opts)
 		if err != nil {
 			return nil, err

go/store/cmd/noms/noms_ds_test.go

@@ -69,9 +69,6 @@ func (s *nomsDsTestSuite) TestNomsDs() {
 	case types.Format_LD_1:
 		golden1 = "oetp3jigkp5pid2f5c4mknpo17mso31b"
 		golden2 = "tsbj1qq88llk3k8qqqb5n3188sbpiu7r"
-	case types.Format_DOLT_DEV:
-		golden1 = "c7g244286kom2a1326kkgs85pi97cjs7"
-		golden2 = "rn7dsl1146qr2n4chtg41n24n0jqgnte"
 	default:
 		s.Fail("no golden values exist for NBF %s", types.Format_Default.VersionString())
 	}

go/store/cmd/noms/noms_root_test.go

@@ -60,9 +60,6 @@ func (s *nomsRootTestSuite) TestBasic() {
 	case types.Format_LD_1:
 		goldenHello = "u8g2r4qg97kkqn42lvao77st2mv3bpl0\n"
 		goldenGoodbye = "70b9adi6amrab3a5t4hcibdob0cq49m0\n"
-	case types.Format_DOLT_DEV:
-		goldenHello = "sf173aaa57qjoakme0iufkg4c17beoqe\n"
-		goldenGoodbye = "gjcehnn4v0sbtt1hste082hfv1kg0hqv\n"
 	default:
 		s.Fail("no golden values exist for NBF %s", types.Format_Default.VersionString())
 	}

go/store/constants/version.go

@@ -41,13 +41,4 @@ const Format718String = "7.18"
 const FormatLD1String = "__LD_1__"
 const FormatDoltString = "__DOLT__"
 
-// A temporary format used for developing flatbuffers serialization of
-// top-of-DAG entities like StoreRoot, {Tag,WorkingSet,Commit}Head, etc.
-// Semantics are: __LD_1__ for everything that hasn't been migrated, and what
-// will become top-of-DAG in __DOLT__ for everything else.
-//
-// Things that will migrate are all structs leading up to table data and index
-// data maps.
-const FormatDoltDevString = "__DOLT_DEV__"
-
 var FormatDefaultString = FormatDoltString

go/store/types/encoding_test.go

@@ -654,7 +654,5 @@ func TestNomsBinFormat(t *testing.T) {
 		assert.Equal(t, Format_LD_1, Format_Default)
 	case constants.FormatDoltString:
 		assert.Equal(t, Format_DOLT, Format_Default)
-	case constants.FormatDoltDevString:
-		assert.Equal(t, Format_DOLT_DEV, Format_Default)
 	}
 }

go/store/types/format.go

@@ -42,12 +42,10 @@ type formatTag struct {
 var formatTag_7_18 *formatTag = nil
 var formatTag_LD_1 = &formatTag{}
 var formatTag_DOLT = &formatTag{}
-var formatTag_DOLT_DEV = &formatTag{}
 
 var Format_7_18 = &NomsBinFormat{}
 var Format_LD_1 = &NomsBinFormat{formatTag_LD_1}
 var Format_DOLT = &NomsBinFormat{formatTag_DOLT}
-var Format_DOLT_DEV = &NomsBinFormat{formatTag_DOLT_DEV}
 
 var nbfLock = &sync.Mutex{}
 var Format_Default *NomsBinFormat
@@ -57,7 +55,6 @@ var emptyTuples = make(map[*NomsBinFormat]Tuple)
 func init() {
 	emptyTuples[Format_7_18], _ = NewTuple(Format_7_18)
 	emptyTuples[Format_LD_1], _ = NewTuple(Format_LD_1)
-	emptyTuples[Format_DOLT_DEV], _ = NewTuple(Format_DOLT_DEV)
 }
 
 func isFormat_7_18(nbf *NomsBinFormat) bool {
@@ -68,10 +65,6 @@ func IsFormat_DOLT(nbf *NomsBinFormat) bool {
 	return nbf.tag == formatTag_DOLT
 }
 
-func IsFormat_DOLT_DEV(nbf *NomsBinFormat) bool {
-	return nbf.tag == formatTag_DOLT_DEV
-}
-
 func IsFormat_LD(nbf *NomsBinFormat) bool {
 	return nbf.tag == formatTag_LD_1
 }
@@ -83,8 +76,6 @@ func GetFormatForVersionString(s string) (*NomsBinFormat, error) {
 		return Format_LD_1, nil
 	} else if s == constants.FormatDoltString {
 		return Format_DOLT, nil
-	} else if s == constants.FormatDoltDevString {
-		return Format_DOLT_DEV, nil
 	} else {
 		return nil, errors.New("unsupported ChunkStore version " + s)
 	}
@@ -97,13 +88,11 @@ func (nbf *NomsBinFormat) VersionString() string {
 		return constants.FormatLD1String
 	} else if nbf.tag == formatTag_DOLT {
 		return constants.FormatDoltString
-	} else if nbf.tag == formatTag_DOLT_DEV {
-		return constants.FormatDoltDevString
 	} else {
 		panic("unrecognized NomsBinFormat tag value")
 	}
 }
 
 func (nbf *NomsBinFormat) UsesFlatbuffers() bool {
-	return nbf.tag == formatTag_DOLT || nbf.tag == formatTag_DOLT_DEV
+	return nbf.tag == formatTag_DOLT
 }

go/store/types/serial_message.go

@@ -339,19 +339,7 @@ func (sm SerialMessage) WalkAddrs(nbf *NomsBinFormat, cb func(addr hash.Hash) er
 		}
 
 		mapbytes := msg.PrimaryIndexBytes()
-
-		if nbf == Format_DOLT_DEV {
-			dec := newValueDecoder(mapbytes, nil)
-			v, err := dec.readValue(nbf)
-			if err != nil {
-				return err
-			}
-			return v.walkRefs(nbf, func(ref Ref) error {
-				return cb(ref.TargetHash())
-			})
-		} else {
-			return SerialMessage(mapbytes).WalkAddrs(nbf, cb)
-		}
+		return SerialMessage(mapbytes).WalkAddrs(nbf, cb)
 	case serial.CommitFileID:
 		parents, err := SerialCommitParentAddrs(nbf, sm)
 		if err != nil {

go/store/valuefile/value_file.go

@@ -240,8 +240,6 @@ func read(ctx context.Context, rd io.Reader) (hash.Hash, *FileValueStore, error)
 		nbf = types.Format_7_18
 	case types.Format_LD_1.VersionString():
 		nbf = types.Format_LD_1
-	case types.Format_DOLT_DEV.VersionString():
-		nbf = types.Format_DOLT_DEV
 	case types.Format_DOLT.VersionString():
 		nbf = types.Format_DOLT
 	default:

integration-tests/bats/column_tags.bats

@@ -301,12 +301,6 @@ DELIM
     [ $status -ne 0 ]
     echo $output
     [[ $output =~ "update-tag is only available in storage format __DOLT__" ]] || false
-
-    cd ../dev
-    DOLT_DEFAULT_BIN_FORMAT=__DOLT_DEV__ dolt init
-    run dolt schema update-tag t col 5
-    [ $status -ne 0 ]
-    [[ $output =~ "update-tag is only available in storage format __DOLT__" ]] || false
 }
 
 @test "column_tags: update-tag updates a columns tag" {

integration-tests/bats/helper/common.bash

@@ -64,22 +64,14 @@ assert_feature_version() {
 }
 
 skip_nbf_dolt() {
-  if [ ! "$DOLT_DEFAULT_BIN_FORMAT" = "__LD_1__" ] &&
-    [ ! "$DOLT_DEFAULT_BIN_FORMAT" = "__DOLT_DEV__" ];
+  if [ ! "$DOLT_DEFAULT_BIN_FORMAT" = "__LD_1__" ]
   then
     skip "skipping test for nomsBinFormat __DOLT__"
   fi
 }
 
-skip_nbf_dolt_dev() {
-  if [ "$DOLT_DEFAULT_BIN_FORMAT" = "__DOLT_DEV__" ]; then
-    skip "skipping test for nomsBinFormat __DOLT_DEV__"
-  fi
-}
-
 skip_nbf_not_dolt() {
-  if [ "$DOLT_DEFAULT_BIN_FORMAT" = "__LD_1__" ] ||
-    [ "$DOLT_DEFAULT_BIN_FORMAT" = "__DOLT_DEV__" ];
+  if [ "$DOLT_DEFAULT_BIN_FORMAT" = "__LD_1__" ]
   then
     skip "skipping test since nomsBinFormat != __DOLT__"
   fi

integration-tests/bats/migrate.bats

@@ -2,8 +2,6 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
-    skip_nbf_dolt_dev
-
     TARGET_NBF="__DOLT__"
     setup_no_dolt_init
     dolt init --old-format

integration-tests/bats/migration-integration.bats

@@ -3,7 +3,6 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     skip_nbf_dolt
-    skip_nbf_dolt_dev
 
     setup_common
     TARGET_NBF="__DOLT__"

integration-tests/bats/remotes-aws.bats

@@ -11,9 +11,6 @@ teardown() {
 }
 
 skip_if_no_aws_tests() {
-    if [ "$DOLT_DEFAULT_BIN_FORMAT" = "__DOLT_DEV__" ]; then
-      skip "skipping aws tests; DOLT_DEFAULT_BIN_FORMAT is __DOLT_DEV__"
-    fi
     if [ -z "$DOLT_BATS_AWS_TABLE" -o -z "$DOLT_BATS_AWS_BUCKET" -o -z "$DOLT_BATS_AWS_EXISTING_REPO" ]; then
       skip "skipping aws tests; set DOLT_BATS_AWS_TABLE, DOLT_BATS_AWS_BUCKET and DOLT_BATS_AWS_EXISTING_REPO to run"
     fi