Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete tables from data.all when they are deleted in Glue #89

Merged
merged 1 commit into from
Jul 19, 2022
Merged

Delete tables from data.all when they are deleted in Glue #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/dataall/api/Objects/Dataset/resolvers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ def sync_tables(context: Context, source, datasetUri: str = None):
indexers.upsert_dataset_tables(
session=session, es=context.es, datasetUri=dataset.datasetUri
)
indexers.remove_deleted_tables(
session=session, es=context.es, datasetUri=dataset.datasetUri
)
return Dataset.paginated_dataset_tables(
session=session,
username=context.username,
Expand Down
7 changes: 6 additions & 1 deletion backend/dataall/db/api/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,12 @@ def paginated_dataset_tables(
) -> dict:
query = (
session.query(models.DatasetTable)
.filter(models.DatasetTable.datasetUri == uri)
.filter(
and_(
models.DatasetTable.datasetUri == uri,
models.DatasetTable.LastGlueTableStatus != 'Deleted',
)
)
.order_by(models.DatasetTable.created.desc())
)
if data and data.get('term'):
Expand Down
23 changes: 22 additions & 1 deletion backend/dataall/searchproxy/indexers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,35 @@ def upsert_dashboard(session, es, dashboardUri: str):
def upsert_dataset_tables(session, es, datasetUri: str):
tables = (
session.query(models.DatasetTable)
.filter(models.DatasetTable.datasetUri == datasetUri)
.filter(
and_(
models.DatasetTable.datasetUri == datasetUri,
models.DatasetTable.LastGlueTableStatus != 'Deleted',
)
)
.all()
)
for table in tables:
upsert_table(session, es, table.tableUri)
return tables


def remove_deleted_tables(session, es, datasetUri: str):
tables = (
session.query(models.DatasetTable)
.filter(
and_(
models.DatasetTable.datasetUri == datasetUri,
models.DatasetTable.LastGlueTableStatus == 'Deleted',
)
)
.all()
)
for table in tables:
delete_doc(es, doc_id=table.tableUri)
return tables


def upsert_dataset_folders(session, es, datasetUri: str):
folders = (
session.query(models.DatasetStorageLocation)
Expand Down