From cbc2ddd5cad00bb14c1b2bc4534394c042141c5c Mon Sep 17 00:00:00 2001 From: sophiely Date: Tue, 27 Jun 2023 16:07:46 +0200 Subject: [PATCH] add input dataset type --- api/src/main/java/marquez/db/DatasetDao.java | 4 ++-- api/src/main/java/marquez/db/DatasetVersionDao.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/marquez/db/DatasetDao.java b/api/src/main/java/marquez/db/DatasetDao.java index 04919cd8fd..9ee654c10d 100644 --- a/api/src/main/java/marquez/db/DatasetDao.java +++ b/api/src/main/java/marquez/db/DatasetDao.java @@ -86,7 +86,7 @@ LEFT JOIN ( df.dataset_version_uuid, JSONB_AGG(df.facet ORDER BY df.lineage_event_time ASC) AS facets FROM dataset_facets_view AS df - WHERE df.facet IS NOT NULL AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown') + WHERE df.facet IS NOT NULL AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown' OR df.type ILIKE 'input') GROUP BY df.dataset_version_uuid ) f ON f.dataset_version_uuid = d.current_version_uuid WHERE CAST((:namespaceName, :datasetName) AS DATASET_NAME) = ANY(d.dataset_symlinks) @@ -134,7 +134,7 @@ LEFT JOIN ( df.dataset_version_uuid, JSONB_AGG(df.facet ORDER BY df.lineage_event_time ASC) AS facets FROM dataset_facets_view AS df - WHERE df.facet IS NOT NULL AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown') + WHERE df.facet IS NOT NULL AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown' OR df.type ILIKE 'input') GROUP BY df.dataset_version_uuid ) f ON f.dataset_version_uuid = d.current_version_uuid WHERE d.namespace_name = :namespaceName diff --git a/api/src/main/java/marquez/db/DatasetVersionDao.java b/api/src/main/java/marquez/db/DatasetVersionDao.java index 7b3b544a32..d59b64bf57 100644 --- a/api/src/main/java/marquez/db/DatasetVersionDao.java +++ b/api/src/main/java/marquez/db/DatasetVersionDao.java @@ -194,7 +194,7 @@ WITH selected_dataset_versions AS ( ), selected_dataset_version_facets AS ( SELECT dv.uuid, dv.dataset_name, dv.namespace_name, df.run_uuid, df.lineage_event_time, df.facet FROM selected_dataset_versions dv - LEFT JOIN dataset_facets_view df ON df.dataset_version_uuid = dv.uuid AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown') + LEFT JOIN dataset_facets_view df ON df.dataset_version_uuid = dv.uuid AND (df.type ILIKE 'dataset' OR df.type ILIKE 'unknown' OR df.type ILIKE 'input') ) SELECT d.type, d.name, d.physical_name, d.namespace_name, d.source_name, d.description, dv.lifecycle_state,\s dv.created_at, dv.version, dv.fields, dv.run_uuid AS createdByRunUuid, sv.schema_location, @@ -260,7 +260,7 @@ LEFT JOIN ( SELECT dvf.dataset_version_uuid, JSONB_AGG(dvf.facet ORDER BY dvf.lineage_event_time ASC) AS facets FROM dataset_facets_view dvf - WHERE (type ILIKE 'dataset' OR type ILIKE 'unknown') + WHERE (type ILIKE 'dataset' OR type ILIKE 'unknown' OR type ILIKE 'input') GROUP BY dataset_version_uuid ) f ON f.dataset_version_uuid = dv.uuid WHERE dv.namespace_name = :namespaceName