diff --git a/.github/workflows/ci-go-tests.yaml b/.github/workflows/ci-go-tests.yaml index fb5ef7b5c6..6235338c91 100644 --- a/.github/workflows/ci-go-tests.yaml +++ b/.github/workflows/ci-go-tests.yaml @@ -29,7 +29,7 @@ jobs: dolt_fmt: "__DOLT_DEV__" journal_store: "" - os: "ubuntu-22.04" - dolt_fmt: "__DOLT_DEV__" + dolt_fmt: "__DOLT__" journal_store: "true" steps: - name: Set up Go 1.x diff --git a/go/store/nbs/chunk_journal.go b/go/store/nbs/chunk_journal.go index da0cb03bcf..26636091c8 100644 --- a/go/store/nbs/chunk_journal.go +++ b/go/store/nbs/chunk_journal.go @@ -223,10 +223,6 @@ func (j *chunkJournal) Name() string { // Update implements manifest. func (j *chunkJournal) Update(ctx context.Context, lastLock addr, next manifestContents, stats *Stats, writeHook func() error) (manifestContents, error) { - if emptyAddr(addr(next.root)) { - next.root = next.root - } - if j.journal == nil { // pass the update to |j.backing| if the journals is not initialized return j.backing.Update(ctx, lastLock, next, stats, writeHook) diff --git a/go/store/nbs/store_test.go b/go/store/nbs/store_test.go index 8841e10533..6c353603df 100644 --- a/go/store/nbs/store_test.go +++ b/go/store/nbs/store_test.go @@ -41,10 +41,6 @@ import ( ) func makeTestLocalStore(t *testing.T, maxTableFiles int) (st *NomsBlockStore, nomsDir string, q MemoryQuotaProvider) { - if ChunkJournalFeatureFlag { - t.Skip() // todo - } - ctx := context.Background() nomsDir = filepath.Join(tempfiles.MovableTempFileProvider.GetTempDir(), "noms_"+uuid.New().String()[:8]) err := os.MkdirAll(nomsDir, os.ModePerm)