Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Kirill Smelkov
neo
Commits
467c573c
Commit
467c573c
authored
Nov 09, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X fs1: Load of deleted oid should return "no data"
parent
35eb77b2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
42 additions
and
21 deletions
+42
-21
go/zodb/storage/fs1/filestorage_test.go
go/zodb/storage/fs1/filestorage_test.go
+42
-21
No files found.
go/zodb/storage/fs1/filestorage_test.go
View file @
467c573c
...
@@ -67,18 +67,40 @@ func (txe *txnEntry) DataTid() zodb.Tid {
...
@@ -67,18 +67,40 @@ func (txe *txnEntry) DataTid() zodb.Tid {
return
dataTid
return
dataTid
}
}
// s
uccessfull result of load for an oid
// s
tate of an object in the database for some particular revision
type
o
idLoadedOk
struct
{
type
o
bjState
struct
{
tid
zodb
.
Tid
tid
zodb
.
Tid
data
[]
byte
data
[]
byte
// nil if obj was deleted
}
}
// checkLoad verifies that fs.Load(xid) returns expected result
// checkLoad verifies that fs.Load(xid) returns expected result
func
checkLoad
(
t
*
testing
.
T
,
fs
*
FileStorage
,
xid
zodb
.
Xid
,
expect
oidLoadedOk
)
{
func
checkLoad
(
t
*
testing
.
T
,
fs
*
FileStorage
,
xid
zodb
.
Xid
,
expect
objState
)
{
t
.
Helper
()
buf
,
tid
,
err
:=
fs
.
Load
(
context
.
Background
(),
xid
)
buf
,
tid
,
err
:=
fs
.
Load
(
context
.
Background
(),
xid
)
// deleted obj - it should load with "no data
if
expect
.
data
==
nil
{
errOk
:=
&
zodb
.
ErrXidMissing
{
Xid
:
xid
}
e
,
ok
:=
err
.
(
*
zodb
.
ErrXidMissing
)
if
!
(
ok
&&
*
e
==
*
errOk
)
{
t
.
Errorf
(
"load %v: returned err unexpected: %v ; want: %v"
,
xid
,
err
,
errOk
)
}
if
tid
!=
0
{
t
.
Errorf
(
"load %v: returned tid unexpected: %v ; want: %v"
,
xid
,
tid
,
expect
.
tid
)
}
if
buf
!=
nil
{
t
.
Errorf
(
"load %v: returned buf != nil"
,
xid
)
}
// regular load
}
else
{
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"load %v: %v
"
,
xid
,
err
)
t
.
Errorf
(
"load %v: returned err unexpected: %v ; want: nil
"
,
xid
,
err
)
}
}
if
tid
!=
expect
.
tid
{
if
tid
!=
expect
.
tid
{
t
.
Errorf
(
"load %v: returned tid unexpected: %v ; want: %v"
,
xid
,
tid
,
expect
.
tid
)
t
.
Errorf
(
"load %v: returned tid unexpected: %v ; want: %v"
,
xid
,
tid
,
expect
.
tid
)
}
}
...
@@ -90,6 +112,7 @@ func checkLoad(t *testing.T, fs *FileStorage, xid zodb.Xid, expect oidLoadedOk)
...
@@ -90,6 +112,7 @@ func checkLoad(t *testing.T, fs *FileStorage, xid zodb.Xid, expect oidLoadedOk)
case
!
reflect
.
DeepEqual
(
buf
.
Data
,
expect
.
data
)
:
// NOTE reflect to catch nil != ""
case
!
reflect
.
DeepEqual
(
buf
.
Data
,
expect
.
data
)
:
// NOTE reflect to catch nil != ""
t
.
Errorf
(
"load %v: different data:
\n
have: %q
\n
want: %q"
,
xid
,
buf
.
Data
,
expect
.
data
)
t
.
Errorf
(
"load %v: different data:
\n
have: %q
\n
want: %q"
,
xid
,
buf
.
Data
,
expect
.
data
)
}
}
}
}
}
func
xfsopen
(
t
testing
.
TB
,
path
string
)
*
FileStorage
{
func
xfsopen
(
t
testing
.
TB
,
path
string
)
*
FileStorage
{
...
@@ -106,7 +129,7 @@ func TestLoad(t *testing.T) {
...
@@ -106,7 +129,7 @@ func TestLoad(t *testing.T) {
// current knowledge of what was "before" for an oid as we scan over
// current knowledge of what was "before" for an oid as we scan over
// data base entries
// data base entries
before
:=
map
[
zodb
.
Oid
]
o
idLoadedOk
{}
before
:=
map
[
zodb
.
Oid
]
o
bjState
{}
for
_
,
dbe
:=
range
_1fs_dbEntryv
{
for
_
,
dbe
:=
range
_1fs_dbEntryv
{
for
_
,
txe
:=
range
dbe
.
Entryv
{
for
_
,
txe
:=
range
dbe
.
Entryv
{
...
@@ -115,12 +138,10 @@ func TestLoad(t *testing.T) {
...
@@ -115,12 +138,10 @@ func TestLoad(t *testing.T) {
// XXX check Load finds data at correct .Pos / etc ?
// XXX check Load finds data at correct .Pos / etc ?
// loadSerial
// loadSerial
// TODO also test for getting error when not found
xid
:=
zodb
.
Xid
{
zodb
.
XTid
{
txh
.
Tid
,
false
},
txh
.
Oid
}
xid
:=
zodb
.
Xid
{
zodb
.
XTid
{
txh
.
Tid
,
false
},
txh
.
Oid
}
checkLoad
(
t
,
fs
,
xid
,
o
idLoadedOk
{
txh
.
Tid
,
txe
.
Data
()})
checkLoad
(
t
,
fs
,
xid
,
o
bjState
{
txh
.
Tid
,
txe
.
Data
()})
// loadBefore
// loadBefore
// TODO also test for getting error when not found
xid
=
zodb
.
Xid
{
zodb
.
XTid
{
txh
.
Tid
,
true
},
txh
.
Oid
}
xid
=
zodb
.
Xid
{
zodb
.
XTid
{
txh
.
Tid
,
true
},
txh
.
Oid
}
expect
,
ok
:=
before
[
txh
.
Oid
]
expect
,
ok
:=
before
[
txh
.
Oid
]
if
ok
{
if
ok
{
...
@@ -129,9 +150,9 @@ func TestLoad(t *testing.T) {
...
@@ -129,9 +150,9 @@ func TestLoad(t *testing.T) {
// loadBefore to get current record
// loadBefore to get current record
xid
.
Tid
+=
1
xid
.
Tid
+=
1
checkLoad
(
t
,
fs
,
xid
,
o
idLoadedOk
{
txh
.
Tid
,
txe
.
Data
()})
checkLoad
(
t
,
fs
,
xid
,
o
bjState
{
txh
.
Tid
,
txe
.
Data
()})
before
[
txh
.
Oid
]
=
o
idLoadedOk
{
txh
.
Tid
,
txe
.
Data
()}
before
[
txh
.
Oid
]
=
o
bjState
{
txh
.
Tid
,
txe
.
Data
()}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment