|
3 | 3 | from dataclasses import dataclass |
4 | 4 | from uuid import UUID |
5 | 5 |
|
6 | | -from tgdb.entities.assert_ import not_none |
7 | | -from tgdb.entities.logic_time import LogicTime, age |
8 | | -from tgdb.entities.operator import ( |
| 6 | +from tgdb.entities.horizon.operator import ( |
9 | 7 | AppliedOperator, |
10 | 8 | CommitOperator, |
11 | 9 | IntermediateOperator, |
12 | 10 | Operator, |
13 | 11 | RollbackOperator, |
14 | 12 | StartOperator, |
15 | 13 | ) |
16 | | -from tgdb.entities.transaction import ( |
| 14 | +from tgdb.entities.horizon.transaction import ( |
17 | 15 | NoTransaction, |
18 | 16 | Transaction, |
19 | 17 | TransactionCommit, |
|
22 | 20 | TransactionState, |
23 | 21 | start_transaction, |
24 | 22 | ) |
| 23 | +from tgdb.entities.time.logic_time import LogicTime, age |
| 24 | +from tgdb.entities.tools.assert_ import not_none |
25 | 25 |
|
26 | 26 |
|
27 | 27 | class NonLinearizedOperatorError(Exception): ... |
28 | 28 |
|
29 | 29 |
|
30 | | -class UnlimitedTransactionHorizonError(Exception): ... |
| 30 | +class UnlimitedHorizonError(Exception): ... |
31 | 31 |
|
32 | 32 |
|
33 | | -class UnattainableTransactionHorizonError(Exception): ... |
| 33 | +class UnattainableHorizonError(Exception): ... |
34 | 34 |
|
35 | 35 |
|
36 | 36 | class UselessMaxHeightError(Exception): ... |
37 | 37 |
|
38 | 38 |
|
39 | 39 | @dataclass |
40 | | -class TransactionHorizon: |
| 40 | +class Horizon: |
41 | 41 | _max_width: LogicTime | None |
42 | 42 | _max_height: int | None |
43 | 43 | _time: LogicTime | None |
44 | 44 | _active_transaction_by_id: OrderedDict[UUID, Transaction] |
45 | 45 |
|
46 | 46 | def __post_init__(self) -> None: |
47 | 47 | """ |
48 | | - :raises tgdb.entities.transaction_horizon.UnlimitedTransactionHorizonError: |
49 | | - :raises tgdb.entities.transaction_horizon.UnattainableTransactionHorizonError: |
50 | | - :raises tgdb.entities.transaction_horizon.UselessMaxHeightError: |
51 | | - """ # noqa: E501 |
| 48 | + :raises tgdb.entities.horizon.horizon.UnlimitedHorizonError: |
| 49 | + :raises tgdb.entities.horizon.horizon.UnattainableHorizonError: |
| 50 | + :raises tgdb.entities.horizon.horizon.UselessMaxHeightError: |
| 51 | + """ |
52 | 52 |
|
53 | 53 | if self._max_width is None and self._max_height is None: |
54 | | - raise UnlimitedTransactionHorizonError |
| 54 | + raise UnlimitedHorizonError |
55 | 55 |
|
56 | 56 | if self._max_width is not None and self._max_width <= 0: |
57 | | - raise UnattainableTransactionHorizonError |
| 57 | + raise UnattainableHorizonError |
58 | 58 |
|
59 | 59 | if self._max_height is not None and self._max_height <= 0: |
60 | | - raise UnattainableTransactionHorizonError |
| 60 | + raise UnattainableHorizonError |
61 | 61 |
|
62 | 62 | if ( |
63 | 63 | self._max_height is not None and self._max_width is not None |
@@ -107,7 +107,7 @@ def add( |
107 | 107 | self, applied_operator: AppliedOperator |
108 | 108 | ) -> TransactionPreparedCommit | None: |
109 | 109 | """ |
110 | | - :raises tgdb.entities.transaction_horizon.NonLinearizedOperatorError: |
| 110 | + :raises tgdb.entities.horizon.horizon.NonLinearizedOperatorError: |
111 | 111 | """ |
112 | 112 |
|
113 | 113 | if self._time is not None and applied_operator.time <= self._time: |
@@ -138,15 +138,15 @@ def _add_operator( |
138 | 138 | Transaction(), |
139 | 139 | TransactionState.active |
140 | 140 | ): |
141 | | - transaction.add_effect(effect) |
| 141 | + transaction.include(effect) |
142 | 142 |
|
143 | 143 | case ( |
144 | 144 | CommitOperator(_, intermediate_operators), |
145 | 145 | Transaction(), |
146 | 146 | TransactionState.active |
147 | 147 | ): |
148 | 148 | for intermediate_operator in intermediate_operators: |
149 | | - transaction.add_effect(intermediate_operator.effect) |
| 149 | + transaction.include(intermediate_operator.effect) |
150 | 150 |
|
151 | 151 | return transaction.prepare_commit() |
152 | 152 |
|
@@ -191,17 +191,17 @@ def _oldest_transaction(self) -> Transaction | None: |
191 | 191 | return None |
192 | 192 |
|
193 | 193 |
|
194 | | -def create_transaction_horizon( |
| 194 | +def create_horizon( |
195 | 195 | max_width: LogicTime | None, |
196 | 196 | max_height: int | None, |
197 | | -) -> TransactionHorizon: |
| 197 | +) -> Horizon: |
| 198 | + """ |
| 199 | + :raises tgdb.entities.horizon.horizon.UnlimitedHorizonError: |
| 200 | + :raises tgdb.entities.horizon.horizon.UnattainableHorizonError: |
| 201 | + :raises tgdb.entities.horizon.horizon.UselessMaxHeightError: |
198 | 202 | """ |
199 | | - :raises tgdb.entities.transaction_horizon.UnlimitedTransactionHorizonError: |
200 | | - :raises tgdb.entities.transaction_horizon.UnattainableTransactionHorizonError: |
201 | | - :raises tgdb.entities.transaction_horizon.UselessMaxHeightError: |
202 | | - """ # noqa: E501 |
203 | 203 |
|
204 | | - return TransactionHorizon( |
| 204 | + return Horizon( |
205 | 205 | _max_width=max_width, |
206 | 206 | _max_height=max_height, |
207 | 207 | _time=None, |
|
0 commit comments