itqop
/
dataloader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: rename columns

This commit is contained in:
itqop 2025-11-05 17:57:42 +03:00
parent d319a1c5e0
commit b02b4e84fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dataloader/storage/models/queue.py
View File

@ -52,7 +52,7 @@ class DLJob(Base):
error: Mapped[Optional[str]] = mapped_column(Text) error: Mapped[Optional[str]] = mapped_column(Text)
producer: Mapped[Optional[str]] = mapped_column(Text) producer: Mapped[Optional[str]] = mapped_column(Text)
consumer_group: Mapped[Optional[str]] = mapped_column(Text) consumer_group: Mapped[Optional[str]] = mapped_column(Text)
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False) load_dttm: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
started_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True)) started_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
finished_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True)) finished_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True))
@ -68,6 +68,6 @@ class DLJobEvent(Base):
event_id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True) event_id: Mapped[int] = mapped_column(BigInteger, primary_key=True, autoincrement=True)
job_id: Mapped[str] = mapped_column(UUID(as_uuid=False), nullable=False) job_id: Mapped[str] = mapped_column(UUID(as_uuid=False), nullable=False)
queue: Mapped[str] = mapped_column(Text, nullable=False) queue: Mapped[str] = mapped_column(Text, nullable=False)
ts: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False) load_dttm: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
kind: Mapped[str] = mapped_column(Text, nullable=False) kind: Mapped[str] = mapped_column(Text, nullable=False)
payload: Mapped[Optional[dict[str, Any]]] = mapped_column(JSONB) payload: Mapped[Optional[dict[str, Any]]] = mapped_column(JSONB)

6
src/dataloader/storage/repositories/queue.py
View File

@ -57,7 +57,7 @@ class QueueRepository:
error=None, error=None,
producer=req.producer, producer=req.producer,
consumer_group=req.consumer_group, consumer_group=req.consumer_group,
created_at=datetime.now(timezone.utc), load_dttm=datetime.now(timezone.utc),
started_at=None, started_at=None,
finished_at=None, finished_at=None,
) )
@ -137,7 +137,7 @@ class QueueRepository:
DLJob.queue == queue, DLJob.queue == queue,
DLJob.available_at <= func.now(), DLJob.available_at <= func.now(),
) )
.order_by(DLJob.priority.asc(), DLJob.created_at.asc()) .order_by(DLJob.priority.asc(), DLJob.load_dttm.asc())
.with_for_update(skip_locked=True) .with_for_update(skip_locked=True)
.limit(1) .limit(1)
) )
@ -323,7 +323,7 @@ class QueueRepository:
ev = DLJobEvent( ev = DLJobEvent(
job_id=job_id, job_id=job_id,
queue=queue or "", queue=queue or "",
ts=datetime.now(timezone.utc), load_dttm=datetime.now(timezone.utc),
kind=kind, kind=kind,
payload=payload or None, payload=payload or None,
) )