Skip to content

Commit d1dafa2

Browse files
committed
ref(relation): rename RelationVersionID to RelationSchemaID
1 parent 27cb2a1 commit d1dafa2

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

src/tgdb/entities/relation/relation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class DerivativeRelationVersion:
2121

2222

2323
@dataclass(frozen=True)
24-
class RelationVersionID:
24+
class RelationSchemaID:
2525
relation_number: Number
2626
relation_version_number: Number
2727

@@ -72,8 +72,8 @@ def last_version(self) -> RelationVersion:
7272
else self._inital_version
7373
)
7474

75-
def last_version_id(self) -> RelationVersionID:
76-
return RelationVersionID(self._number, self.last_version().number)
75+
def last_version_id(self) -> RelationSchemaID:
76+
return RelationSchemaID(self._number, self.last_version().number)
7777

7878
def recent_versions(
7979
self, current_version_number: Number

src/tgdb/entities/relation/tuple.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from uuid import UUID
55

66
from tgdb.entities.numeration.number import Number
7-
from tgdb.entities.relation.relation import RelationVersionID
7+
from tgdb.entities.relation.relation import RelationSchemaID
88
from tgdb.entities.relation.scalar import Scalar
99
from tgdb.entities.relation.schema import Schema
1010

@@ -15,7 +15,7 @@
1515
@dataclass(frozen=True)
1616
class Tuple(Sequence[Scalar]):
1717
tid: TID
18-
relation_version_id: RelationVersionID
18+
relation_schema_id: RelationSchemaID
1919
scalars: tuple[Scalar, ...]
2020

2121
def __iter__(self) -> Iterator[Scalar]:
@@ -51,9 +51,9 @@ def __getitem__(
5151
def tuple_(
5252
*scalars: Scalar,
5353
tid: TID,
54-
relation_version_id: RelationVersionID = RelationVersionID( # noqa: B008
54+
relation_schema_id: RelationSchemaID = RelationSchemaID( # noqa: B008
5555
Number(0), # noqa: B008
5656
Number(0), # noqa: B008
5757
),
5858
) -> Tuple:
59-
return Tuple(tid, relation_version_id, scalars)
59+
return Tuple(tid, relation_schema_id, scalars)

src/tgdb/entities/relation/tuple_effect.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from dataclasses import dataclass
22

33
from tgdb.entities.numeration.number import Number
4-
from tgdb.entities.relation.relation import Relation, RelationVersionID
4+
from tgdb.entities.relation.relation import Relation, RelationSchemaID
55
from tgdb.entities.relation.scalar import Scalar
66
from tgdb.entities.relation.tuple import TID, Tuple
77
from tgdb.entities.relation.versioned_tuple import VersionedTuple
@@ -127,7 +127,7 @@ def constructed_relation_tuple(
127127
"""
128128

129129
relation_last_version = relation.last_version()
130-
relation_last_version_id = RelationVersionID(
130+
relation_last_version_id = RelationSchemaID(
131131
relation.number(), relation_last_version.number
132132
)
133133

src/tgdb/infrastructure/adapters/tuples.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ async def tuples_with_attribute(
3232
attribute_scalar: Scalar,
3333
) -> Sequence[Tuple]:
3434
return self._db.select_many(lambda it: (
35-
it.relation_version_id.relation_number == relation_number
35+
it.relation_schema_id.relation_number == relation_number
3636
and len(it) >= int(attribute_number)
3737
and it[int(attribute_number)] == attribute_scalar
3838
))

src/tgdb/infrastructure/heap_tuple_encoding.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from enum import Enum
22

33
from tgdb.entities.numeration.number import Number
4-
from tgdb.entities.relation.relation import RelationVersionID
4+
from tgdb.entities.relation.relation import RelationSchemaID
55
from tgdb.entities.relation.scalar import Scalar
66
from tgdb.entities.relation.tuple import TID, Tuple
77
from tgdb.infrastructure.primitive_encoding import (
@@ -30,13 +30,13 @@ class HeapTupleEncoding:
3030
@staticmethod
3131
def encoded_tuple(tuple_: Tuple) -> str:
3232
encoded_metadata = _HeapTupleMetadataEncoding.encoded_metadata(
33-
int(tuple_.relation_version_id.relation_number),
34-
int(tuple_.relation_version_id.relation_version_number),
33+
int(tuple_.relation_schema_id.relation_number),
34+
int(tuple_.relation_schema_id.relation_version_number),
3535
tuple_.tid,
3636
)
3737
encoded_attributes = (
3838
_HeapTupleAttributeEncoding.encoded_attribute(
39-
int(tuple_.relation_version_id.relation_number),
39+
int(tuple_.relation_schema_id.relation_number),
4040
attribute_number,
4141
tuple_[attribute_number],
4242
)
@@ -53,14 +53,14 @@ def decoded_tuple(encoded_tuple: str) -> Tuple:
5353
encoded_tuple.split(Separator.top_tuple.value)
5454
)
5555

56-
tid, relation_version_id = _HeapTupleMetadataEncoding.decoded_metadata(
56+
tid, relation_schema_id = _HeapTupleMetadataEncoding.decoded_metadata(
5757
encoded_metadata
5858
)
5959
scalars = tuple(map(
6060
_HeapTupleAttributeEncoding.decoded_scalar, encoded_attributes
6161
))
6262

63-
return Tuple(tid, relation_version_id, scalars)
63+
return Tuple(tid, relation_schema_id, scalars)
6464

6565
@staticmethod
6666
def id_of_encoded_tuple_with_attribute(
@@ -79,7 +79,7 @@ def id_of_encoded_tuple_with_tid(tid: TID) -> str:
7979
return _HeapTupleMetadataEncoding.id_of_encoded_tuple_with_tid(tid)
8080

8181

82-
type _HeapTupleMetadata = tuple[TID, RelationVersionID]
82+
type _HeapTupleMetadata = tuple[TID, RelationSchemaID]
8383

8484

8585
class _HeapTupleMetadataEncoding:
@@ -103,9 +103,9 @@ def decoded_metadata(encoded_metadata: str) -> _HeapTupleMetadata:
103103
relation_number = Number(decoded_int(encoded_relation_number))
104104
tid = decoded_uuid(encoded_tid)
105105

106-
version_id = RelationVersionID(relation_number, relation_version_number)
106+
schema_id = RelationSchemaID(relation_number, relation_version_number)
107107

108-
return tid, version_id
108+
return tid, schema_id
109109

110110
@staticmethod
111111
def id_of_encoded_tuple_with_tid(tid: TID) -> str:

tests/test_tgdb/test_infrastructure/test_heap_tuple_encoding.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from pytest import mark
44

55
from tgdb.entities.numeration.number import Number
6-
from tgdb.entities.relation.relation import RelationVersionID
6+
from tgdb.entities.relation.relation import RelationSchemaID
77
from tgdb.entities.relation.tuple import Tuple, tuple_
88
from tgdb.infrastructure.heap_tuple_encoding import HeapTupleEncoding
99

@@ -22,8 +22,8 @@
2222
tuple_(
2323
None,
2424
tid=UUID(int=100000),
25-
relation_version_id=RelationVersionID(
26-
Number(1000), Number(200000)
25+
relation_schema_id=RelationSchemaID(
26+
Number(1000), Number(200_000)
2727
)),
2828
]
2929
)

0 commit comments

Comments
 (0)