fix CI stage for chunk journal, fix go vet, remove test skip

This commit is contained in:
Andy Arthur
2022-12-07 12:24:09 -08:00
parent 1c70b11edd
commit 6f9474bd4b
3 changed files with 1 additions and 9 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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)