Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-03-30 15:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusted tarantool scripts for use in service (#383)

Browse Source 
* adjusted tarantool scripts for use in service

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

* fixed schema migrate call

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

* fixed version number in changelog

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

---------

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2023-04-18 09:36:07 +02:00 committed by GitHub
parent 033235fb16
commit 461fae27d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 70 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -25,6 +25,9 @@ For reference, the possible headings are:
* **Known Issues**
* **Notes**
## [2.4.3] - 2023-17-04
* **Fixed** fixed migration behaviour for non docker service
## [2.4.2] - 2023-13-04
* **Added** planetmint migration commands

2
docker-compose.yml
View File

@ -23,8 +23,6 @@ services:
- "8081:8081"
volumes:
- ./planetmint/backend/tarantool/opt/init.lua:/opt/tarantool/init.lua
- ./planetmint/backend/tarantool/opt/functions.lua:/opt/tarantool/functions.lua
- ./planetmint/backend/tarantool/opt/migrations.lua:/opt/tarantool/migrations.lua
entrypoint: tarantool /opt/tarantool/init.lua
restart: always
planetmint:

16
planetmint/backend/schema.py
View File

@ -138,20 +138,8 @@ def init_database(connection, dbname):
@singledispatch
def migrate_up(connection):
"""Migrate database up
Args:
connection (:class:`~planetmint.backend.connection.Connection`): an
existing connection to use to migrate the database.
Creates one if not given.
"""
raise NotImplementedError
@singledispatch
def migrate_down(connection):
"""Migrate database down
def migrate(connection):
"""Migrate database
Args:
connection (:class:`~planetmint.backend.connection.Connection`): an

20
planetmint/backend/tarantool/opt/functions.lua
View File

@ -1,20 +0,0 @@
local fiber = require('fiber')
local export = {}
function export.atomic(batch_size, iter, fn)
box.atomic(function()
local i = 0
for _, x in iter:unwrap() do
fn(x)
i = i + 1
if i % batch_size == 0 then
box.commit()
fiber.yield() -- for read-only operations when `commit` doesn't yield
box.begin()
end
end
end)
end
return export

68
planetmint/backend/tarantool/opt/init.lua
View File

@ -1,4 +1,4 @@
local migrations = require('migrations')
local fiber = require('fiber')
box.cfg{listen = 3303}
@ -334,12 +334,64 @@ function delete_output( id )
box.space.outputs:delete(id)
end
function migrate_up()
migrations.update_utxo_13042023.up()
-- add newer migrations below
function atomic(batch_size, iter, fn)
box.atomic(function()
local i = 0
for _, x in iter:unwrap() do
fn(x)
i = i + 1
if i % batch_size == 0 then
box.commit()
fiber.yield() -- for read-only operations when `commit` doesn't yield
box.begin()
end
end
end)
end
function migrate_down()
-- add newer migrations above
migrations.update_utxo_13042023.down()
end
function migrate()
-- migration code from 2.4.0 to 2.4.3
box.once("planetmint:v2.4.3", function()
box.space.utxos:drop()
utxos = box.schema.create_space('utxos', { if_not_exists = true })
utxos:format({
{ name = 'id', type = 'string' },
{ name = 'amount' , type = 'unsigned' },
{ name = 'public_keys', type = 'array' },
{ name = 'condition', type = 'map' },
{ name = 'output_index', type = 'number' },
{ name = 'transaction_id' , type = 'string' }
})
utxos:create_index('id', {
if_not_exists = true,
parts = {{ field = 'id', type = 'string' }}
})
utxos:create_index('utxos_by_transaction_id', {
if_not_exists = true,
unique = false,
parts = {{ field = 'transaction_id', type = 'string' }}
})
utxos:create_index('utxo_by_transaction_id_and_output_index', {
if_not_exists = true,
parts = {
{ field = 'transaction_id', type = 'string' },
{ field = 'output_index', type = 'unsigned' }
}
})
utxos:create_index('public_keys', {
if_not_exists = true,
unique = false,
parts = {{field = 'public_keys[*]', type = 'string' }}
})
atomic(1000, outputs:pairs(), function(output)
utxos:insert{output[0], output[1], output[2], output[3], output[4], output[5]}
end)
atomic(1000, utxos:pairs(), function(utxo)
spending_transaction = transactions.index.spending_transaction_by_id_and_output_index:select{utxo[5], utxo[4]}
if table.getn(spending_transaction) > 0 then
utxos:delete(utxo[0])
end
end)
end)
end

79
planetmint/backend/tarantool/opt/migrations.lua
View File

@ -1,79 +0,0 @@
local functions = require('functions')
local migrations = {}
migrations.update_utxo_13042023 = {}
migrations.update_utxo_13042023.up = function()
if utxos.index.public_keys == nil then
box.space.utxos:drop()
utxos = box.schema.create_space('utxos', { if_not_exists = true })
utxos:format({
{ name = 'id', type = 'string' },
{ name = 'amount' , type = 'unsigned' },
{ name = 'public_keys', type = 'array' },
{ name = 'condition', type = 'map' },
{ name = 'output_index', type = 'number' },
{ name = 'transaction_id' , type = 'string' }
})
utxos:create_index('id', {
if_not_exists = true,
parts = {{ field = 'id', type = 'string' }}
})
utxos:create_index('utxos_by_transaction_id', {
if_not_exists = true,
unique = false,
parts = {{ field = 'transaction_id', type = 'string' }}
})
utxos:create_index('utxo_by_transaction_id_and_output_index', {
if_not_exists = true,
parts = {
{ field = 'transaction_id', type = 'string' },
{ field = 'output_index', type = 'unsigned' }
}
})
utxos:create_index('public_keys', {
if_not_exists = true,
unique = false,
parts = {{field = 'public_keys[*]', type = 'string' }}
})
end
outputs = box.space.outputs
functions.atomic(1000, outputs:pairs(), function(output)
utxos:insert{output[0], output[1], output[2], output[3], output[4], output[5]}
end)
functions.atomic(1000, utxos:pairs(), function(utxo)
spending_transaction = transactions.index.spending_transaction_by_id_and_output_index:select{utxo[5], utxo[4]}
if table.getn(spending_transaction) > 0 then
utxos:delete(utxo[0])
end
end)
end
migrations.update_utxo_13042023.down = function()
box.space.utxos:drop()
utxos = box.schema.create_space('utxos', { if_not_exists = true })
utxos:format({
{ name = 'id', type = 'string' },
{ name = 'transaction_id', type = 'string' },
{ name = 'output_index', type = 'unsigned' },
{ name = 'utxo', type = 'map' }
})
utxos:create_index('id', {
if_not_exists = true,
parts = {{ field = 'id', type = 'string' }}
})
utxos:create_index('utxos_by_transaction_id', {
if_not_exists = true,
unique = false,
parts = {{ field = 'transaction_id', type = 'string' }}
})
utxos:create_index('utxo_by_transaction_id_and_output_index', {
if_not_exists = true,
parts = {
{ field = 'transaction_id', type = 'string' },
{ field = 'output_index', type = 'unsigned' }
}})
end
return migrations

9
planetmint/backend/tarantool/sync_io/schema.py
View File

@ -38,10 +38,5 @@ def create_tables(connection, dbname):
@register_schema(TarantoolDBConnection)
def migrate_up(connection):
connection.connect().call("migrate_up")
@register_schema(TarantoolDBConnection)
def migrate_down(connection):
connection.connect().call("migrate_down")
def migrate(connection):
connection.connect().call("migrate")

12
planetmint/commands/planetmint.py
View File

@ -259,15 +259,9 @@ def run_init(args):
@configure_planetmint
def run_migrate_up(args):
def run_migrate(args):
validator = Validator()
schema.migrate_up(validator.models.connection)
@configure_planetmint
def run_migrate_down(args):
validator = Validator()
schema.migrate_up(validator.models.connection)
schema.migrate(validator.models.connection)
@configure_planetmint
@ -377,8 +371,6 @@ def create_parser():
subparsers.add_parser("migrate_up", help="Migrate up")
subparsers.add_parser("migrate_down", help="Migrate down")
# parser for starting Planetmint
start_parser = subparsers.add_parser("start", help="Start Planetmint")

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "planetmint"
version = "2.4.2"
version = "2.4.3"
description = "Planetmint: The Blockchain Database"
authors = ["Planetmint contributors"]
license = "AGPLv3"