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
Iliya Manolov
neoppod
Commits
0b8bfba3
Commit
0b8bfba3
authored
Jul 04, 2014
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
storage: do not recreate tables when clearing database at exit
parent
1745d6ac
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
21 deletions
+25
-21
neo/storage/app.py
neo/storage/app.py
+3
-2
neo/storage/database/manager.py
neo/storage/database/manager.py
+9
-5
neo/storage/database/mysqldb.py
neo/storage/database/mysqldb.py
+5
-5
neo/storage/database/sqlite.py
neo/storage/database/sqlite.py
+5
-6
neo/tests/storage/testStorageDBTests.py
neo/tests/storage/testStorageDBTests.py
+1
-1
neo/tests/storage/testStorageMySQL.py
neo/tests/storage/testStorageMySQL.py
+1
-1
neo/tests/storage/testStorageSQLite.py
neo/tests/storage/testStorageSQLite.py
+1
-1
No files found.
neo/storage/app.py
View file @
0b8bfba3
...
...
@@ -81,7 +81,7 @@ class Application(object):
# ready is True when operational and got all informations
self
.
ready
=
False
self
.
dm
.
setup
(
reset
=
config
.
getReset
())
self
.
dm
.
setup
(
self
,
reset
=
config
.
getReset
())
self
.
loadConfiguration
()
# force node uuid from command line argument, for testing purpose only
...
...
@@ -400,6 +400,7 @@ class Application(object):
except
PrimaryFailure
:
pass
# clear database to avoid polluting the cluster at restart
self
.
dm
.
setup
(
reset
=
erase
)
if
erase
:
self
.
dm
.
erase
()
logging
.
info
(
"Application has been asked to shut down"
)
sys
.
exit
()
neo/storage/database/manager.py
View file @
0b8bfba3
...
...
@@ -34,17 +34,21 @@ class DatabaseManager(object):
"""Called during instanciation, to process database parameter."""
pass
def
setup
(
self
,
reset
=
0
):
"""Set up a database
def
setup
(
self
,
app
,
reset
=
0
):
"""Set up a database, discarding existing data first if reset is True
"""
if
reset
:
self
.
erase
()
self
.
_setup
(
app
)
def
_setup
(
self
,
app
):
"""To be overriden by the backend to set up a database
It must recover self._uncommitted_data from temporary object table.
_uncommitted_data is a dict containing refcounts to data of
write-locked objects, except in case of undo, where the refcount is
increased later, when the object is read-locked.
Keys are data ids and values are number of references.
If reset is true, existing data must be discarded and
self._uncommitted_data must be an empty dict.
"""
raise
NotImplementedError
...
...
neo/storage/database/mysqldb.py
View file @
0b8bfba3
...
...
@@ -135,13 +135,13 @@ class MySQLDatabaseManager(DatabaseManager):
"""Escape special characters in a string."""
return
self
.
conn
.
escape_string
(
s
)
def
setup
(
self
,
reset
=
0
):
def
erase
(
self
):
self
.
query
(
"DROP TABLE IF EXISTS config, pt, trans, obj, data, ttrans, tobj"
)
def
_setup
(
self
,
app
):
self
.
_config
.
clear
()
q
=
self
.
query
if
reset
:
q
(
'DROP TABLE IF EXISTS config, pt, trans, obj, data, ttrans, tobj'
)
# The table "config" stores configuration parameters which affect the
# persistent data.
q
(
"""CREATE TABLE IF NOT EXISTS config (
...
...
neo/storage/database/sqlite.py
View file @
0b8bfba3
...
...
@@ -101,14 +101,13 @@ class SQLiteDatabaseManager(DatabaseManager):
else
:
query
=
property
(
lambda
self
:
self
.
conn
.
execute
)
def
setup
(
self
,
reset
=
0
):
def
erase
(
self
):
for
t
in
'config'
,
'pt'
,
'trans'
,
'obj'
,
'data'
,
'ttrans'
,
'tobj'
:
self
.
query
(
'DROP TABLE IF EXISTS '
+
t
)
def
_setup
(
self
,
app
):
self
.
_config
.
clear
()
q
=
self
.
query
if
reset
:
for
t
in
'config'
,
'pt'
,
'trans'
,
'obj'
,
'data'
,
'ttrans'
,
'tobj'
:
q
(
'DROP TABLE IF EXISTS '
+
t
)
# The table "config" stores configuration parameters which affect the
# persistent data.
q
(
"""CREATE TABLE IF NOT EXISTS config (
...
...
neo/tests/storage/testStorageDBTests.py
View file @
0b8bfba3
...
...
@@ -53,7 +53,7 @@ class StorageDBTests(NeoUnitTestBase):
self
.
_db
=
db
=
self
.
getDB
(
reset
)
else
:
if
reset
:
db
.
setup
(
reset
)
db
.
setup
(
None
,
reset
)
else
:
try
:
n
=
db
.
getNumPartitions
()
...
...
neo/tests/storage/testStorageMySQL.py
View file @
0b8bfba3
...
...
@@ -31,7 +31,7 @@ class StorageMySQSLdbTests(StorageDBTests):
# db manager
database
=
'%s@%s'
%
(
NEO_SQL_USER
,
NEO_SQL_DATABASE
)
db
=
MySQLDatabaseManager
(
database
,
0
)
db
.
setup
(
reset
)
db
.
setup
(
None
,
reset
)
return
db
def
test_MySQLDatabaseManagerInit
(
self
):
...
...
neo/tests/storage/testStorageSQLite.py
View file @
0b8bfba3
...
...
@@ -22,7 +22,7 @@ class StorageSQLiteTests(StorageDBTests):
def
getDB
(
self
,
reset
=
0
):
db
=
SQLiteDatabaseManager
(
':memory:'
,
0
)
db
.
setup
(
reset
)
db
.
setup
(
None
,
reset
)
return
db
del
StorageDBTests
...
...
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