PTV/ptvp35
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

1.0rc6: rename to commit

Browse Source
This commit is contained in:
AF 2022-11-21 16:09:22 +00:00
parent e1a2cb59b1
commit 0e7efbb1d5
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/source/conf.py
View File

@ -9,7 +9,11 @@
project = 'ptvp35' project = 'ptvp35'
copyright = '2022, PARRRATE TNV' copyright = '2022, PARRRATE TNV'
author = 'PARRRATE TNV' author = 'PARRRATE TNV'
release = '1.0rc5' with open('../setup.py') as f:
_src = f.read()
_src = _src[_src.index('version=\'') + 9:]
_src = _src[:_src.index('\'')]
release = _src
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

32
ptvp35/__init__.py
View File

@ -116,7 +116,7 @@ class KVRequest(LineRequest):
self.value = value self.value = value
class DumpRequest(Request): class CommitRequest(Request):
__slots__ = () __slots__ = ()
@ -283,11 +283,11 @@ class DbConnection:
self.__kvfactory.db2io(bufferdb, buffer) self.__kvfactory.db2io(bufferdb, buffer)
return buffer return buffer
def _dump_compressed_buffer_sync(self, /) -> None: def _commit_compressed_buffer_sync(self, /) -> None:
self._file_write_sync(self._compress_buffer().getvalue()) self._file_write_sync(self._compress_buffer().getvalue())
async def _dump_compressed_buffer(self, /) -> None: async def _commit_compressed_buffer(self, /) -> None:
await self.__loop.run_in_executor(None, self._dump_compressed_buffer_sync) await self.__loop.run_in_executor(None, self._commit_compressed_buffer_sync)
def _satisfy_buffer_future(self, /) -> None: def _satisfy_buffer_future(self, /) -> None:
self.__buffer_future.set_result(None) self.__buffer_future.set_result(None)
@ -297,17 +297,17 @@ class DbConnection:
self.__buffer_future.set_exception(exception) self.__buffer_future.set_exception(exception)
self._clear_buffer() self._clear_buffer()
async def _do_dump_buffer(self, /) -> None: async def _do_commit_buffer(self, /) -> None:
try: try:
await self._dump_compressed_buffer() await self._commit_compressed_buffer()
except Exception as e: except Exception as e:
self._fail_buffer_future(e) self._fail_buffer_future(e)
else: else:
self._satisfy_buffer_future() self._satisfy_buffer_future()
async def _dump_buffer(self, /) -> None: async def _commit_buffer(self, /) -> None:
if self.__buffer.tell(): if self.__buffer.tell():
await self._do_dump_buffer() await self._do_commit_buffer()
await self._reload_if_oversized() await self._reload_if_oversized()
elif self.__buffer_requested: elif self.__buffer_requested:
self._satisfy_buffer_future() self._satisfy_buffer_future()
@ -326,18 +326,18 @@ class DbConnection:
) )
if not self.__buffer_requested: if not self.__buffer_requested:
self.__buffer_requested = True self.__buffer_requested = True
self.__queue.put_nowait(DumpRequest(None)) self.__queue.put_nowait(CommitRequest(None))
async def _dump_buffer_or_request_so(self, request: Request, /) -> None: async def _commit_buffer_or_request_so(self, request: Request, /) -> None:
if self.__buffer.tell() >= self.__buffersize: if self.__buffer.tell() >= self.__buffersize:
await self._dump_buffer() await self._commit_buffer()
request.set_result(None) request.set_result(None)
else: else:
self._request_buffer(request) self._request_buffer(request)
async def _write(self, line: str, request: Request, /) -> None: async def _write(self, line: str, request: Request, /) -> None:
self.__buffer.write(line) self.__buffer.write(line)
await self._dump_buffer_or_request_so(request) await self._commit_buffer_or_request_so(request)
def _truncation_set_sync(self, /) -> None: def _truncation_set_sync(self, /) -> None:
self.__path_truncate.write_bytes( self.__path_truncate.write_bytes(
@ -386,8 +386,8 @@ class DbConnection:
async def _handle_request(self, request: Request, /) -> None: async def _handle_request(self, request: Request, /) -> None:
if isinstance(request, LineRequest): if isinstance(request, LineRequest):
await self._write(request.line, request) await self._write(request.line, request)
elif isinstance(request, DumpRequest): elif isinstance(request, CommitRequest):
await self._dump_buffer() await self._commit_buffer()
request.set_result(None) request.set_result(None)
else: else:
raise UnknownRequestType raise UnknownRequestType
@ -520,7 +520,7 @@ note: unstable signature."""
if not self.__task.done(): if not self.__task.done():
await self.__queue.join() await self.__queue.join()
self.__task.cancel() self.__task.cancel()
await self._dump_buffer() await self._commit_buffer()
if not self.__buffer_future.done(): if not self.__buffer_future.done():
self.__buffer_future.cancel() self.__buffer_future.cancel()
self.__file.close() self.__file.close()
@ -576,7 +576,7 @@ note: unstable signature."""
async def commit(self, /) -> None: async def commit(self, /) -> None:
"""wait until all requests queued before are completed.""" """wait until all requests queued before are completed."""
future = self._create_future() future = self._create_future()
self.__queue.put_nowait(DumpRequest(future)) self.__queue.put_nowait(CommitRequest(future))
await future await future
def transaction(self, /) -> 'Transaction': def transaction(self, /) -> 'Transaction':

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name='ptvp35', name='ptvp35',
version='1.0rc5', version='1.0rc6',
packages=['ptvp35'], packages=['ptvp35'],
url='https://gitea.ongoteam.net/PTV/ptvp35', url='https://gitea.ongoteam.net/PTV/ptvp35',
license='', license='',

10
traced_example.py
View File

@ -161,14 +161,14 @@ async def main():
LogEE(__import__('ptvp35').DbConnection, 'set_nowait').enter(es) LogEE(__import__('ptvp35').DbConnection, 'set_nowait').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_clear_buffer').enter(es) LogEE(__import__('ptvp35').DbConnection, '_clear_buffer').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_compress_buffer').enter(es) LogEE(__import__('ptvp35').DbConnection, '_compress_buffer').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_dump_compressed_buffer_sync').enter(es) LogEE(__import__('ptvp35').DbConnection, '_commit_compressed_buffer_sync').enter(es)
ALogEE(__import__('ptvp35').DbConnection, '_dump_compressed_buffer').enter(es) ALogEE(__import__('ptvp35').DbConnection, '_commit_compressed_buffer').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_satisfy_buffer_future').enter(es) LogEE(__import__('ptvp35').DbConnection, '_satisfy_buffer_future').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_fail_buffer_future').enter(es) LogEE(__import__('ptvp35').DbConnection, '_fail_buffer_future').enter(es)
ALogEE(__import__('ptvp35').DbConnection, '_do_dump_buffer').enter(es) ALogEE(__import__('ptvp35').DbConnection, '_do_commit_buffer').enter(es)
ALogEE(__import__('ptvp35').DbConnection, '_dump_buffer').enter(es) ALogEE(__import__('ptvp35').DbConnection, '_commit_buffer').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_request_buffer').enter(es) LogEE(__import__('ptvp35').DbConnection, '_request_buffer').enter(es)
ALogEE(__import__('ptvp35').DbConnection, '_dump_buffer_or_request_so').enter(es) ALogEE(__import__('ptvp35').DbConnection, '_commit_buffer_or_request_so').enter(es)
ALogEE(__import__('ptvp35').DbConnection, '_write').enter(es) ALogEE(__import__('ptvp35').DbConnection, '_write').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_truncation_set_sync').enter(es) LogEE(__import__('ptvp35').DbConnection, '_truncation_set_sync').enter(es)
LogEE(__import__('ptvp35').DbConnection, '_truncation_unset_sync').enter(es) LogEE(__import__('ptvp35').DbConnection, '_truncation_unset_sync').enter(es)