Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vincent Pelletier
neoppod
Commits
de645092
Commit
de645092
authored
May 07, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
importer: add support for undo, faster conflict check when import is finished
parent
bd5ba87a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
neo/storage/database/importer.py
neo/storage/database/importer.py
+14
-1
neo/tests/threaded/testImporter.py
neo/tests/threaded/testImporter.py
+10
-2
No files found.
neo/storage/database/importer.py
View file @
de645092
...
...
@@ -516,7 +516,7 @@ class ImporterDatabaseManager(DatabaseManager):
" your configuration to use the native backend and restart."
)
self
.
_import
=
None
for
x
in
"""getObject getReplicationTIDList getReplicationObjectList
_fetchObject
_fetchObject
_getDataTID getLastObjectTID
"""
.
split
():
setattr
(
self
,
x
,
getattr
(
self
.
db
,
x
))
for
zodb
in
self
.
zodb
:
...
...
@@ -574,6 +574,19 @@ class ImporterDatabaseManager(DatabaseManager):
return
(
max
(
tid
,
util
.
p64
(
self
.
zodb_ltid
)),
max
(
oid
,
util
.
p64
(
self
.
zodb_loid
)))
def
_getObject
(
self
,
oid
,
tid
=
None
,
before_tid
=
None
):
p64
=
util
.
p64
r
=
self
.
getObject
(
p64
(
oid
),
None
if
tid
is
None
else
p64
(
tid
),
None
if
before_tid
is
None
else
p64
(
before_tid
))
if
r
:
serial
,
next_serial
,
compression
,
checksum
,
data
,
data_serial
=
r
u64
=
util
.
u64
return
(
u64
(
serial
),
next_serial
and
u64
(
next_serial
),
compression
,
checksum
,
data
,
data_serial
and
u64
(
data_serial
))
def
getObject
(
self
,
oid
,
tid
=
None
,
before_tid
=
None
):
u64
=
util
.
u64
u_oid
=
u64
(
oid
)
...
...
neo/tests/threaded/testImporter.py
View file @
de645092
...
...
@@ -29,6 +29,7 @@ from neo.storage.database.importer import \
from
..
import
expectedFailure
,
getTempDirectory
,
random_tree
,
Patch
from
.
import
NEOCluster
,
NEOThreadedTest
from
ZODB
import
serialize
from
ZODB.DB
import
TransactionalUndo
from
ZODB.FileStorage
import
FileStorage
class
Equal
:
...
...
@@ -242,6 +243,13 @@ class ImporterTests(NEOThreadedTest):
t
.
commit
()
if
cluster
.
storage
.
dm
.
_import
:
last_import
=
i
for
x
in
0
,
1
:
undo
=
TransactionalUndo
(
c
.
db
(),
[
storage
.
lastTransaction
()])
txn
=
transaction
.
Transaction
()
undo
.
tpc_begin
(
txn
)
undo
.
commit
(
txn
)
undo
.
tpc_vote
(
txn
)
undo
.
tpc_finish
(
txn
)
self
.
tic
()
# Same as above. We want last_import smaller enough compared to i
assert
i
<
last_import
*
3
<
2
*
i
,
(
last_import
,
i
)
...
...
@@ -286,7 +294,7 @@ class ImporterTests(NEOThreadedTest):
Patch
(
time
,
sleep
=
sleep
)
as
p
:
self
.
_importFromFileStorage
()
self
.
assertFalse
(
p
.
applied
)
self
.
assertEqual
(
len
(
tid_list
),
1
1
)
self
.
assertEqual
(
len
(
tid_list
),
1
3
)
def
testThreadedWritebackWithUnbalancedPartitions
(
self
):
N
=
7
...
...
@@ -304,7 +312,7 @@ class ImporterTests(NEOThreadedTest):
Patch
(
WriteBack
,
chunk_size
=
N
-
2
),
\
Patch
(
WriteBack
,
committed
=
committed
):
self
.
_importFromFileStorage
()
self
.
assertEqual
(
nonlocal_
[
0
],
1
0
)
self
.
assertEqual
(
nonlocal_
[
0
],
1
2
)
def
testMerge
(
self
):
multi
=
1
,
2
,
3
...
...
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