OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose current operation to client

Browse Source
This commit is contained in:
wqy
2022-09-17 23:56:53 +08:00
parent 5f87bb9e97
commit 6a8db3f661
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/__init__.py
View File

@@ -4,6 +4,7 @@ from .project import copy_project
from .change_set import ChangeSet from .change_set import ChangeSet
from .operation import get_current_operation
from .operation import execute_undo as undo from .operation import execute_undo as undo
from .operation import execute_redo as redo from .operation import execute_redo as redo
from .operation import have_snapshot, take_snapshot, pick_snapshot from .operation import have_snapshot, take_snapshot, pick_snapshot

18
api/operation.py
View File

@@ -29,7 +29,7 @@ def _get_parents(name: str, id: int) -> list[int]:
ids.append(int(cur.fetchone()['parent'])) ids.append(int(cur.fetchone()['parent']))
return ids return ids
def _get_current_operation(name: str) -> int: def get_current_operation(name: str) -> int:
with conn[name].cursor(row_factory=dict_row) as cur: with conn[name].cursor(row_factory=dict_row) as cur:
cur.execute(f"select id from current_operation") cur.execute(f"select id from current_operation")
return int(cur.fetchone()['id']) return int(cur.fetchone()['id'])
@@ -40,7 +40,7 @@ def _update_current_operation(name: str, old_id: int, id: int) -> None:
def _add_redo_undo(name: str, redo: str, undo: str) -> int: def _add_redo_undo(name: str, redo: str, undo: str) -> int:
with conn[name].cursor(row_factory=dict_row) as cur: with conn[name].cursor(row_factory=dict_row) as cur:
parent = _get_current_operation(name) parent = get_current_operation(name)
cur.execute(f"insert into operation (id, redo, undo, parent) values (default, '{redo}', '{undo}', {parent})") cur.execute(f"insert into operation (id, redo, undo, parent) values (default, '{redo}', '{undo}', {parent})")
cur.execute("select max(id) from operation") cur.execute("select max(id) from operation")
return int(cur.fetchone()['max']) return int(cur.fetchone()['max'])
@@ -73,11 +73,11 @@ def _execute(name: str, sql: str) -> None:
def add_operation(name: str, redo: str, undo: str) -> None: def add_operation(name: str, redo: str, undo: str) -> None:
curr = _add_redo_undo(name, redo, undo) curr = _add_redo_undo(name, redo, undo)
old = _get_current_operation(name) old = get_current_operation(name)
_update_current_operation(name, old, curr) _update_current_operation(name, old, curr)
def execute_undo(name: str, discard: bool = False) -> None: def execute_undo(name: str, discard: bool = False) -> None:
curr = _get_current_operation(name) curr = get_current_operation(name)
# transaction control # transaction control
if have_transaction(name): if have_transaction(name):
@@ -106,7 +106,7 @@ def execute_undo(name: str, discard: bool = False) -> None:
_remove_operation(name, curr) _remove_operation(name, curr)
def execute_redo(name: str) -> None: def execute_redo(name: str) -> None:
curr = _get_current_operation(name) curr = get_current_operation(name)
redoChild = _query_redo_child(name, curr) redoChild = _query_redo_child(name, curr)
if redoChild == None: if redoChild == None:
print("nothing to redo!") print("nothing to redo!")
@@ -132,7 +132,7 @@ def take_snapshot(name: str, tag: str) -> None:
print('Non empty tag is expected!') print('Non empty tag is expected!')
return return
curr = _get_current_operation(name) curr = get_current_operation(name)
with conn[name].cursor() as cur: with conn[name].cursor() as cur:
cur.execute(f"insert into snapshot_operation (id, tag) values ({curr}, '{tag}')") cur.execute(f"insert into snapshot_operation (id, tag) values ({curr}, '{tag}')")
@@ -146,7 +146,7 @@ def pick_snapshot(name: str, tag: str) -> None:
print('No such snapshot!') print('No such snapshot!')
return return
curr = _get_current_operation(name) curr = get_current_operation(name)
curr_parents = _get_parents(name, curr) curr_parents = _get_parents(name, curr)
with conn[name].cursor(row_factory=dict_row) as cur: with conn[name].cursor(row_factory=dict_row) as cur:
@@ -192,7 +192,7 @@ def start_transaction(name: str, strict: bool = False) -> None:
print("Only support single transaction now, please commit/abort current transaction!") print("Only support single transaction now, please commit/abort current transaction!")
return return
curr = _get_current_operation(name) curr = get_current_operation(name)
with conn[name].cursor() as cur: with conn[name].cursor() as cur:
cur.execute(f"insert into transaction_operation (id, strict) values ({curr}, {strict});") cur.execute(f"insert into transaction_operation (id, strict) values ({curr}, {strict});")
@@ -211,7 +211,7 @@ def abort_transaction(name: str) -> None:
tran = _get_current_transaction_id(name) tran = _get_current_transaction_id(name)
curr = _get_current_operation(name) curr = get_current_operation(name)
curr_parents = _get_parents(name, curr) curr_parents = _get_parents(name, curr)
for i in range(curr_parents.index(tran)): for i in range(curr_parents.index(tran)):

3
tjnetwork.py
View File

@@ -64,6 +64,9 @@ def copy_project(source: str, new: str) -> None:
# operation # operation
############################################################ ############################################################
def get_current_operation(name: str) -> int:
return api.get_current_operation(name)
def undo(name: str) -> None: def undo(name: str) -> None:
return api.undo(name) return api.undo(name)