Skip to content

Commit

Permalink
manifest: improve VersionEdit stringification
Browse files Browse the repository at this point in the history 
This makes the format of the fields more consistent.
  • Loading branch information
@RaduBerinde
RaduBerinde committed Mar 11, 2024
1 parent 31b3724 commit cb66088
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 103 deletions.
58 changes: 29 additions & 29 deletions internal/manifest/testdata/version_edit_apply
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ L0.0:
000002:[c#3,SET-d#4,SET] seqnums:[3-4] points:[c#3,SET-d#4,SET]

apply v1
deleted: L0 000001
added: L2 000001:[a#1,SET-b#2,SET] seqnums:[1-2]
added: L2 000004:[c#3,SET-d#4,SET] seqnums:[3-4]
del-table: L0 000001
add-table: L2 000001:[a#1,SET-b#2,SET] seqnums:[1-2]
add-table: L2 000004:[c#3,SET-d#4,SET] seqnums:[3-4]
----
L0.0:
000002:[c#3,SET-d#4,SET] seqnums:[3-4] points:[c#3,SET-d#4,SET]
Expand All @@ -26,14 +26,14 @@ L2:
000004:[c#3,SET-d#4,SET] seqnums:[3-4] points:[c#3,SET-d#4,SET]

apply v1
deleted: L1 000001
del-table: L1 000001
----
pebble: internal error: No current or added files but have deleted files: 1

apply v1
deleted: L0 000001
added: L2 000001:[a#1,SET-b#2,SET] seqnums:[1-2]
added: L2 000004:[b#3,SET-d#4,SET] seqnums:[3-4]
del-table: L0 000001
add-table: L2 000001:[a#1,SET-b#2,SET] seqnums:[1-2]
add-table: L2 000004:[b#3,SET-d#4,SET] seqnums:[3-4]
----
pebble: internal error: L2 files 000001 and 000004 have overlapping ranges: [a#1,SET-b#2,SET] vs [b#3,SET-d#4,SET]

Expand All @@ -48,7 +48,7 @@ L0.0:
000001:[a#1,SET-c#2,SET] seqnums:[1-2] points:[a#1,SET-c#2,SET]

apply v2
added: L0 000004:[b#3,SET-d#5,SET] seqnums:[3-5]
add-table: L0 000004:[b#3,SET-d#5,SET] seqnums:[3-5]
----
L0.2:
000004:[b#3,SET-d#5,SET] seqnums:[3-5] points:[b#3,SET-d#5,SET]
Expand All @@ -58,7 +58,7 @@ L0.0:
000001:[a#1,SET-c#2,SET] seqnums:[1-2] points:[a#1,SET-c#2,SET]

apply v2
added: L0 000004:[b#0,SET-d#0,SET] seqnums:[0-0]
add-table: L0 000004:[b#0,SET-d#0,SET] seqnums:[0-0]
----
L0.2:
000002:[c#3,SET-d#4,SET] seqnums:[3-4] points:[c#3,SET-d#4,SET]
Expand All @@ -72,28 +72,28 @@ define empty
----

apply empty
added: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
added: L0 000004:[b#3,SET-d#5,SET] seqnums:[3-5]
add-table: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
add-table: L0 000004:[b#3,SET-d#5,SET] seqnums:[3-5]
----
L0.1:
000004:[b#3,SET-d#5,SET] seqnums:[3-5] points:[b#3,SET-d#5,SET]
L0.0:
000001:[a#1,SET-c#2,SET] seqnums:[1-2] points:[a#1,SET-c#2,SET]

apply v2
added: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
add-table: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
----
pebble: files 000001 and 000001 collided on sort keys

apply empty
added: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
add-table: L0 000001:[a#1,SET-c#2,SET] seqnums:[1-2]
----
L0.0:
000001:[a#1,SET-c#2,SET] seqnums:[1-2] points:[a#1,SET-c#2,SET]

apply empty
added: L2 000010:[j#3,SET-m#2,SET]
added: L2 000006:[a#10,SET-a#7,SET]
add-table: L2 000010:[j#3,SET-m#2,SET]
add-table: L2 000006:[a#10,SET-a#7,SET]
----
L2:
000006:[a#10,SET-a#7,SET] seqnums:[0-0] points:[a#10,SET-a#7,SET]
Expand All @@ -115,11 +115,11 @@ L2:
000001:[r#2,SET-t#1,SET] seqnums:[0-0] points:[r#2,SET-t#1,SET]

apply v3
deleted: L2 000004
deleted: L2 000001
added: L2 000006:[a#10,SET-a#7,SET]
added: L2 000007:[e#1,SET-g#2,SET]
added: L2 000010:[j#3,SET-m#2,SET]
del-table: L2 000004
del-table: L2 000001
add-table: L2 000006:[a#10,SET-a#7,SET]
add-table: L2 000007:[e#1,SET-g#2,SET]
add-table: L2 000010:[j#3,SET-m#2,SET]
----
L2:
000006:[a#10,SET-a#7,SET] seqnums:[0-0] points:[a#10,SET-a#7,SET]
Expand All @@ -141,13 +141,13 @@ L1:
000002:[c#3,SET-d#2,SET] seqnums:[0-0] points:[c#3,SET-d#2,SET]

apply v4
deleted: L0 000001
deleted: L1 000002
del-table: L0 000001
del-table: L1 000002
----

# Deletion of a non-existent table results in an error.
apply v4
deleted: L0 000004
del-table: L0 000004
----
error during Accumulate: pebble: file deleted L0.000004 before it was inserted

Expand All @@ -159,13 +159,13 @@ L0.0:
000001:[a#1,SET-b#2,SET] seqnums:[0-0] points:[a#1,SET-b#2,SET]

apply v5
deleted: L0 1
added: L2 000001:[a#1,SET-b#2,SET]
added: L2 000004:[c#3,SET-d#4,SET]
added: L2 000005:[s#3,SET-z#4,SET]
del-table: L0 1
add-table: L2 000001:[a#1,SET-b#2,SET]
add-table: L2 000004:[c#3,SET-d#4,SET]
add-table: L2 000005:[s#3,SET-z#4,SET]
new version edit
deleted: L2 000001
deleted: L2 000004
del-table: L2 000001
del-table: L2 000004
----
L2:
000005:[s#3,SET-z#4,SET] seqnums:[0-0] points:[s#3,SET-z#4,SET]
27 changes: 13 additions & 14 deletions internal/manifest/version_edit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,15 +512,11 @@ func (v *VersionEdit) string(verbose bool, fmtKey base.FormatKey) string {
return stdcmp.Compare(a.FileNum, b.FileNum)
})
for _, df := range entries {
fmt.Fprintf(&buf, " deleted: L%d %s\n", df.Level, df.FileNum)
fmt.Fprintf(&buf, " del-table: L%d %s\n", df.Level, df.FileNum)
}
for _, nf := range v.NewFiles {
fmt.Fprintf(&buf, " added: L%d", nf.Level)
if verbose {
fmt.Fprintf(&buf, " %s", nf.Meta.DebugString(fmtKey, true /* verbose */))
} else {
fmt.Fprintf(&buf, " %s", nf.Meta.String())
}
fmt.Fprintf(&buf, " add-table: L%d", nf.Level)
fmt.Fprintf(&buf, " %s", nf.Meta.DebugString(fmtKey, verbose))
if nf.Meta.CreationTime != 0 {
fmt.Fprintf(&buf, " (%s)",
time.Unix(nf.Meta.CreationTime, 0).UTC().Format(time.RFC3339))
Expand All @@ -529,10 +525,10 @@ func (v *VersionEdit) string(verbose bool, fmtKey base.FormatKey) string {
}

for _, b := range v.CreatedBackingTables {
fmt.Fprintf(&buf, " add backing: %s\n", b.DiskFileNum)
fmt.Fprintf(&buf, " add-backing: %s\n", b.DiskFileNum)
}
for _, n := range v.RemovedBackingTables {
fmt.Fprintf(&buf, " del backing: %s\n", n)
fmt.Fprintf(&buf, " del-backing: %s\n", n)
}
return buf.String()
}
Expand Down Expand Up @@ -563,11 +559,14 @@ func ParseVersionEditDebug(s string) (_ *VersionEdit, err error) {
if l == "" {
continue
}
p := makeDebugParser(l)
field := p.Next()
p.Expect(":")
field, value, ok := strings.Cut(l, ":")
if !ok {
return nil, errors.Errorf("malformed line %q", l)
}
field = strings.TrimSpace(field)
p := makeDebugParser(value)
switch field {
case "added":
case "add-table":
level := p.Level()
meta, err := ParseFileMetadataDebug(p.Remaining())
if err != nil {
Expand All @@ -578,7 +577,7 @@ func ParseVersionEditDebug(s string) (_ *VersionEdit, err error) {
Meta: meta,
})

case "deleted":
case "del-table":
level := p.Level()
num := p.FileNum()
if ve.DeletedFiles == nil {
Expand Down
16 changes: 8 additions & 8 deletions internal/manifest/version_edit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,21 +506,21 @@ func TestParseVersionEditDebugRoundTrip(t *testing.T) {
output string
}{
{
input: ` added: L1 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
input: ` add-table: L1 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
},
{
input: `added: L0 1:[a#0,SET-z#0,DEL]`,
output: ` added: L0 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
input: `add-table: L0 1:[a#0,SET-z#0,DEL]`,
output: ` add-table: L0 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
},
{
input: ` deleted: L1 000001`,
input: ` del-table: L1 000001`,
},
{
input: strings.Join([]string{
` deleted: L1 000002`,
` deleted: L3 000003`,
` added: L1 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
` added: L2 000002:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
` del-table: L1 000002`,
` del-table: L3 000003`,
` add-table: L1 000001:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
` add-table: L2 000002:[a#0,SET-z#0,DEL] seqnums:[0-0] points:[a#0,SET-z#0,DEL]`,
}, "\n"),
},
}
Expand Down
88 changes: 44 additions & 44 deletions testdata/excise
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,53 +31,53 @@ L6:
excise c k
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000006
deleted: L6 000004
added: L6 000007(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
added: L6 000008(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add backing: 000004
del-table: L0 000006
del-table: L6 000004
add-table: L6 000007(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add-table: L6 000008(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add-backing: 000004


excise a e
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000006
deleted: L6 000004
added: L0 000009(000006):[f#12,SET-f#12,SET] seqnums:[11-12] points:[f#12,SET-f#12,SET]
added: L6 000010(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add backing: 000006
add backing: 000004
del-table: L0 000006
del-table: L6 000004
add-table: L0 000009(000006):[f#12,SET-f#12,SET] seqnums:[11-12] points:[f#12,SET-f#12,SET]
add-table: L6 000010(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add-backing: 000006
add-backing: 000004

excise e z
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000006
deleted: L6 000004
added: L0 000011(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
added: L6 000012(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add backing: 000006
add backing: 000004
del-table: L0 000006
del-table: L6 000004
add-table: L0 000011(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
add-table: L6 000012(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add-backing: 000006
add-backing: 000004

excise f l
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000006
deleted: L6 000004
added: L0 000013(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
added: L6 000014(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
added: L6 000015(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add backing: 000006
add backing: 000004
del-table: L0 000006
del-table: L6 000004
add-table: L0 000013(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
add-table: L6 000014(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add-table: L6 000015(000004):[l#10,SET-l#10,SET] seqnums:[10-10] points:[l#10,SET-l#10,SET]
add-backing: 000006
add-backing: 000004

excise f ll
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000006
deleted: L6 000004
added: L0 000016(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
added: L6 000017(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add backing: 000006
add backing: 000004
del-table: L0 000006
del-table: L6 000004
add-table: L0 000016(000006):[d#11,SET-d#11,SET] seqnums:[11-12] points:[d#11,SET-d#11,SET]
add-table: L6 000017(000004):[a#10,SET-a#10,SET] seqnums:[10-10] points:[a#10,SET-a#10,SET]
add-backing: 000006
add-backing: 000004

excise p q
----
Expand Down Expand Up @@ -162,17 +162,17 @@ L6:
excise f g
----
would excise 1 files, use ingest-and-excise to excise.
deleted: L0 000005
added: L0 000006(000005):[b#11,SET-b#11,SET] seqnums:[11-11] points:[b#11,SET-b#11,SET]
added: L0 000007(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
add backing: 000005
del-table: L0 000005
add-table: L0 000006(000005):[b#11,SET-b#11,SET] seqnums:[11-11] points:[b#11,SET-b#11,SET]
add-table: L0 000007(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
add-backing: 000005

excise b c
----
would excise 1 files, use ingest-and-excise to excise.
deleted: L0 000005
added: L0 000008(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
add backing: 000005
del-table: L0 000005
add-table: L0 000008(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
add-backing: 000005

excise i j
----
Expand All @@ -184,13 +184,13 @@ would excise 0 files, use ingest-and-excise to excise.
excise c d
----
would excise 2 files, use ingest-and-excise to excise.
deleted: L0 000005
deleted: L6 000004
added: L0 000009(000005):[b#11,SET-b#11,SET] seqnums:[11-11] points:[b#11,SET-b#11,SET]
added: L0 000010(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
added: L6 000011(000004):[d#10,RANGEKEYSET-f#inf,RANGEKEYSET] seqnums:[10-10] ranges:[d#10,RANGEKEYSET-f#inf,RANGEKEYSET]
add backing: 000005
add backing: 000004
del-table: L0 000005
del-table: L6 000004
add-table: L0 000009(000005):[b#11,SET-b#11,SET] seqnums:[11-11] points:[b#11,SET-b#11,SET]
add-table: L0 000010(000005):[g#11,RANGEDEL-i#inf,RANGEDEL] seqnums:[11-11] points:[g#11,RANGEDEL-i#inf,RANGEDEL]
add-table: L6 000011(000004):[d#10,RANGEKEYSET-f#inf,RANGEKEYSET] seqnums:[10-10] ranges:[d#10,RANGEKEYSET-f#inf,RANGEKEYSET]
add-backing: 000005
add-backing: 000004

reset
----
Expand Down
8 changes: 4 additions & 4 deletions testdata/ingest_shared
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ L6:
excise e gg
----
would excise 1 files, use ingest-and-excise to excise.
deleted: L6 000007
added: L6 000008:[a#0,SET-d#0,SET]
added: L6 000009:[l#0,SET-l#0,SET]
add backing: 000007
del-table: L6 000007
add-table: L6 000008(000007):[a#0,SET-d#0,SET]
add-table: L6 000009(000007):[l#0,SET-l#0,SET]
add-backing: 000007

replicate 2 1 e gg
----
Expand Down
8 changes: 4 additions & 4 deletions testdata/ingest_shared_lower
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ L6:
excise e gg
----
would excise 1 files, use ingest-and-excise to excise.
deleted: L6 000008
added: L6 000009:[a#0,SET-d#0,SET]
added: L6 000010:[l#0,SET-l#0,SET]
add backing: 000008
del-table: L6 000008
add-table: L6 000009(000008):[a#0,SET-d#0,SET]
add-table: L6 000010(000008):[l#0,SET-l#0,SET]
add-backing: 000008

replicate 2 1 e gg
----
Expand Down

0 comments on commit cb66088

Please sign in to comment.