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

Dataset.currentVersionUuid -> DatasetVersion.uuid #2954

Merged
merged 2 commits into from
Oct 25, 2024
+8 −8
Merged

Dataset.currentVersionUuid -> DatasetVersion.uuid #2954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7b6fd0
`Dataset.currentVersionUuid` `->` `DatasetVersion.uuid`
wslulciuc Oct 25, 2024
342b65e
Merge branch 'main' into bug/use-dataset-version-uuid-for-version
wslulciuc Oct 25, 2024
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
12 changes: 6 additions & 6 deletions api/src/main/java/marquez/db/DatasetVersionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ default void updateDatasetVersionMetric(
WITH selected_dataset_versions AS (
SELECT dv.*
FROM dataset_versions dv
WHERE dv.version = :version
WHERE dv.uuid = :version
), 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
)
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.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
dv.created_at, dv.uuid AS current_version_uuid, dv.version, dv.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
sv.schema_location, t.tags, f.facets
FROM selected_dataset_versions dv
LEFT JOIN datasets_view d ON d.uuid = dv.dataset_uuid
Expand Down Expand Up @@ -206,7 +206,7 @@ WITH selected_dataset_versions AS (
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.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
dv.created_at, dv.uuid AS current_version_uuid, dv.version, dv.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
sv.schema_location, t.tags, f.facets
FROM selected_dataset_versions dv
LEFT JOIN datasets_view d ON d.uuid = dv.dataset_uuid
Expand Down Expand Up @@ -255,7 +255,7 @@ default Optional<DatasetVersion> findByWithRun(UUID version) {
"""
WITH dataset_info AS (
SELECT d.type, d.name, d.physical_name, d.namespace_name, d.source_name, d.description, dv.lifecycle_state,
dv.created_at, dv.version, dv.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
dv.created_at, dv.uuid AS current_version_uuid, dv.version, dv.dataset_schema_version_uuid, dv.fields, dv.run_uuid AS createdByRunUuid,
sv.schema_location, t.tags, f.facets, f.lineage_event_time, f.dataset_version_uuid, facet_name
FROM dataset_versions dv
LEFT JOIN datasets_view d ON d.uuid = dv.dataset_uuid
Expand Down Expand Up @@ -285,13 +285,13 @@ dataset_symlinks_names as (
)
SELECT
type, name, physical_name, namespace_name, source_name, description, lifecycle_state,
created_at, version, dataset_schema_version_uuid, fields, createdByRunUuid, schema_location,
created_at, current_version_uuid, version, dataset_schema_version_uuid, fields, createdByRunUuid, schema_location,
tags, dataset_version_uuid,
JSONB_AGG(facets ORDER BY lineage_event_time ASC) AS facets
FROM dataset_info
WHERE name NOT IN (SELECT name FROM dataset_symlinks_names)
GROUP BY type, name, physical_name, namespace_name, source_name, description, lifecycle_state,
created_at, version, dataset_schema_version_uuid, fields, createdByRunUuid, schema_location,
created_at, current_version_uuid, version, dataset_schema_version_uuid, fields, createdByRunUuid, schema_location,
tags, dataset_version_uuid
ORDER BY created_at DESC
LIMIT :limit OFFSET :offset
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/marquez/db/mappers/DatasetVersionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public DatasetVersion map(@NonNull ResultSet results, @NonNull StatementContext
DatasetName.of(stringOrThrow(results, Columns.NAME)),
DatasetName.of(stringOrThrow(results, Columns.PHYSICAL_NAME)),
timestampOrThrow(results, Columns.CREATED_AT),
Version.of(uuidOrThrow(results, Columns.VERSION)),
Version.of(uuidOrThrow(results, Columns.CURRENT_VERSION_UUID)),
SourceName.of(stringOrThrow(results, Columns.SOURCE_NAME)),
toFields(results, "fields"),
columnNames.contains("tags") ? toTags(results, "tags") : null,
Expand All @@ -70,7 +70,7 @@ public DatasetVersion map(@NonNull ResultSet results, @NonNull StatementContext
DatasetName.of(stringOrThrow(results, Columns.NAME)),
DatasetName.of(stringOrThrow(results, Columns.PHYSICAL_NAME)),
timestampOrThrow(results, Columns.CREATED_AT),
Version.of(uuidOrThrow(results, Columns.VERSION)),
Version.of(uuidOrThrow(results, Columns.CURRENT_VERSION_UUID)),
SourceName.of(stringOrThrow(results, Columns.SOURCE_NAME)),
toURL(stringOrThrow(results, Columns.SCHEMA_LOCATION)),
toFields(results, "fields"),
Expand Down
Loading