From aabcec462c748fa2bb9219a84e6b85fb53abd9bf Mon Sep 17 00:00:00 2001 From: Nisarg Chokshi <101206240+Nisarg-Chokshi@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:08:52 +0530 Subject: [PATCH 1/6] Proposal/pagination (#2559) * Update dataset pagination rendering to remove pagination in case of no content Signed-off-by: Nisarg-Chokshi * Update event pagination rendering to remove pagination in case of no content Signed-off-by: Nisarg-Chokshi * Resolved comment on the PR Signed-off-by: Nisarg-Chokshi --------- Signed-off-by: Nisarg-Chokshi --- web/src/routes/datasets/Datasets.tsx | 44 +++++++------- web/src/routes/events/Events.tsx | 86 ++++++++++++++-------------- 2 files changed, 66 insertions(+), 64 deletions(-) diff --git a/web/src/routes/datasets/Datasets.tsx b/web/src/routes/datasets/Datasets.tsx index 1eb0200822..53d6a64830 100644 --- a/web/src/routes/datasets/Datasets.tsx +++ b/web/src/routes/datasets/Datasets.tsx @@ -136,7 +136,7 @@ class Datasets extends React.Component { {i18next.t('datasets_route.empty_body')} - + ) : ( <> @@ -227,29 +227,29 @@ class Datasets extends React.Component { })} + + + this.handleClickPage('prev')} + > + + + + + this.handleClickPage('next')} + > + + + + )} - - - this.handleClickPage('prev')} - > - - - - - this.handleClickPage('next')} - > - - - - diff --git a/web/src/routes/events/Events.tsx b/web/src/routes/events/Events.tsx index b786da2fa2..1677962825 100644 --- a/web/src/routes/events/Events.tsx +++ b/web/src/routes/events/Events.tsx @@ -186,27 +186,29 @@ class Events extends React.Component { {i18next.t('events_route.title')} Page: {this.pageNavigation()} - - - this.handleClickPage('prev')} - > - - - - - this.handleClickPage('next')} - > - - - - + {events.length === 0 && ( + + + this.handleClickPage('prev')} + > + + + + + this.handleClickPage('next')} + > + + + + + )} { })} + + + this.handleClickPage('prev')} + > + + + + + this.handleClickPage('next')} + > + + + + )} - - - this.handleClickPage('prev')} - > - - - - - this.handleClickPage('next')} - > - - - - From 21d9bfb8908ea0a911e772bff2388839b1ff22fa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 05:52:48 -0700 Subject: [PATCH 2/6] Update dependency gradle to v8 (#2440) * Update dependency gradle to v8 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix `build.gradle` Signed-off-by: wslulciuc --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: wslulciuc Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: wslulciuc --- api/build.gradle | 2 +- build.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index aea3a38c25..445eaa7400 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -148,7 +148,7 @@ application { } shadowJar { - classifier = '' + archiveClassifier.set('') transform(ServiceFileTransformer) // Add LICENSE to Jar from(projectDir) { diff --git a/build.gradle b/build.gradle index ed44f3f013..1d9af6750d 100644 --- a/build.gradle +++ b/build.gradle @@ -95,14 +95,14 @@ subprojects { targetCompatibility = JavaVersion.VERSION_17 } - task sourceJar(type: Jar) { - classifier 'sources' + task sourceJar(type: Jar, dependsOn: classes) { from sourceSets.main.allJava + archiveClassifier.set("sources") } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' from javadoc.destinationDir + archiveClassifier.set("javadoc") } pmd { @@ -146,9 +146,9 @@ subprojects { jacocoTestReport { reports { - xml.enabled = true - html.enabled = true - html.destination = file(coverageDir) + xml.required = true + html.required = true + html.outputLocation = file(coverageDir) } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 508322917b..17a8ddce2d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3187a2151fff6df429830e1f6a8e5166d3d0ec64 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 06:02:44 -0700 Subject: [PATCH 3/6] Update dependency org.postgresql:postgresql to v42.6.0 (#2510) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1d9af6750d..2b2408b1b8 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ subprojects { mockitoVersion = '5.1.1' openlineageVersion = '0.26.0' slf4jVersion = '1.7.36' - postgresqlVersion = '42.5.4' + postgresqlVersion = '42.6.0' isReleaseVersion = !version.endsWith('SNAPSHOT') } From 8950c8147d358378a5960e088bf6a6bf40d5f777 Mon Sep 17 00:00:00 2001 From: Michael Robinson <68482867+merobi-hub@users.noreply.github.com> Date: Wed, 2 Aug 2023 15:10:34 -0400 Subject: [PATCH 4/6] update changelog for 0.38.0 (#2561) Signed-off-by: Michael Robinson --- CHANGELOG.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d5d0228a6..b128d1e7b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,25 @@ # Changelog -## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.37.0...HEAD) +## [Unreleased](https://github.com/MarquezProject/marquez/compare/0.38.0...HEAD) + +## [0.38.0](https://github.com/MarquezProject/marquez/compare/0.37.0...0.38.0) - 2023-08-02 +### Added +* API: add db retention support [`#2486`](https://github.com/MarquezProject/marquez/pull/2486) [@wslulciuc](https://github.com/wslulciuc) + *Adds migration, a `dbRetention` config in `marquez.yml` for enabling a retention policy, and a `db-retention` command for executing a policy.* +* API: add runs state indices [`#2535`](https://github.com/MarquezProject/marquez/pull/2535) [@phixme](https://github.com/phixMe) + *Adds four indices to help run retention faster.* +* API: define `DbRetentionJob(Jdbi, DbRetentionConfig)` [`#2549`](https://github.com/MarquezProject/marquez/pull/2549) [@wslulciuc](https://github.com/wslulciuc) + *Adds `@Positive` to `DbRetentionConfig` instance variables for validating `DbRetentionConfig` properties internally within the class.* +* API: add log for when retention job starts [`#2551`](https://github.com/MarquezProject/marquez/pull/2551) [@wslulciuc](https://github.com/wslulciuc) + *Adds logging of `DbRetentionJob`.* + +### Fixed +* API: fix slow dataset query updates [`#2534`](https://github.com/MarquezProject/marquez/pull/2534) [@phixme](https://github.com/phixMe) + *Scopes down nested facet queries to be the same scope as the outer query.* +* Client/Python: increase namespace length to 1024 characters [`#2554`](https://github.com/MarquezProject/marquez/pull/2554) [@hloomupgrade](https://github.com/hloombaupgrade) + *Changes the namespace length constraint to sync up with the Java client's.* +* Web: remove pagination in case of no content [`#2559`](https://github.com/MarquezProject/marquez/pull/2559) [@Nisarg-Chokshi](https://github.com/Nisarg-Chokshi) + *Updates `Dataset` & `Event` route rendering to remove pagination in the case of no content.* ## [0.37.0](https://github.com/MarquezProject/marquez/compare/0.36.0...0.37.0) - 2023-07-17 ### Added From 3f68664cb0a341e461935de876249058b2b14a0c Mon Sep 17 00:00:00 2001 From: Michael Robinson Date: Wed, 2 Aug 2023 15:11:44 -0400 Subject: [PATCH 5/6] Prepare for release 0.38.0 Signed-off-by: Michael Robinson --- .circleci/db-migration.sh | 2 +- .env.example | 2 +- chart/Chart.yaml | 2 +- chart/values.yaml | 4 ++-- clients/java/README.md | 4 ++-- docker/up.sh | 4 ++-- docs/openapi.html | 4 ++-- gradle.properties | 2 +- spec/openapi.yml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/db-migration.sh b/.circleci/db-migration.sh index 1ab2fcb868..a15eaec1af 100755 --- a/.circleci/db-migration.sh +++ b/.circleci/db-migration.sh @@ -13,7 +13,7 @@ # Version of PostgreSQL readonly POSTGRES_VERSION="12.1" # Version of Marquez -readonly MARQUEZ_VERSION=0.37.0 +readonly MARQUEZ_VERSION=0.38.0 # Build version of Marquez readonly MARQUEZ_BUILD_VERSION="$(git log --pretty=format:'%h' -n 1)" # SHA1 diff --git a/.env.example b/.env.example index 2aae51adfa..e6f4dc8366 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ API_PORT=5000 API_ADMIN_PORT=5001 WEB_PORT=3000 -TAG=0.37.0 +TAG=0.38.0 diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 9bb0cfd8bb..8215a95b21 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -29,4 +29,4 @@ name: marquez sources: - https://github.com/MarquezProject/marquez - https://marquezproject.github.io/marquez/ -version: 0.37.0 +version: 0.38.0 diff --git a/chart/values.yaml b/chart/values.yaml index bd456bd9c7..8cbcf53636 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -17,7 +17,7 @@ marquez: image: registry: docker.io repository: marquezproject/marquez - tag: 0.37.0 + tag: 0.38.0 pullPolicy: IfNotPresent ## Name of the existing secret containing credentials for the Marquez installation. ## When this is specified, it will take precedence over the values configured in the 'db' section. @@ -75,7 +75,7 @@ web: image: registry: docker.io repository: marquezproject/marquez-web - tag: 0.37.0 + tag: 0.38.0 pullPolicy: IfNotPresent ## Marquez website will run on this port ## diff --git a/clients/java/README.md b/clients/java/README.md index 32b58dbf90..71a7744fa5 100644 --- a/clients/java/README.md +++ b/clients/java/README.md @@ -10,14 +10,14 @@ Maven: io.github.marquezproject marquez-java - 0.37.0 + 0.38.0 ``` or Gradle: ```groovy -implementation 'io.github.marquezproject:marquez-java:0.37.0 +implementation 'io.github.marquezproject:marquez-java:0.38.0 ``` ## Usage diff --git a/docker/up.sh b/docker/up.sh index e154d641d7..6d868d9a29 100755 --- a/docker/up.sh +++ b/docker/up.sh @@ -8,9 +8,9 @@ set -e # Version of Marquez -readonly VERSION=0.37.0 +readonly VERSION=0.38.0 # Build version of Marquez -readonly BUILD_VERSION=0.37.0 +readonly BUILD_VERSION=0.38.0 title() { echo -e "\033[1m${1}\033[0m" diff --git a/docs/openapi.html b/docs/openapi.html index 77603291ee..426b7a288d 100644 --- a/docs/openapi.html +++ b/docs/openapi.html @@ -2174,7 +2174,7 @@ 55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864 -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688, -104.0616 -231.873,-231.248 z - " fill="currentColor">

Marquez (0.37.0)

Download OpenAPI specification:Download

License: Apache 2.0

Marquez is an open source metadata service for the collection, aggregation, and visualization of a data ecosystem's metadata.

+ " fill="currentColor">

Marquez (0.38.0)

Download OpenAPI specification:Download

License: Apache 2.0

Marquez is an open source metadata service for the collection, aggregation, and visualization of a data ecosystem's metadata.

Namespaces

Create a namespace

Creates a new namespace object. A namespace enables the contextual grouping of related jobs and datasets. Namespaces must contain only letters (a-z, A-Z), numbers (0-9), underscores (_), dashes (-), colons (:), slashes (/), or dots (.). A namespace is case-insensitive with a maximum length of 1024 characters. Note jobs and datasets will be unique within a namespace, but not across namespaces.

path Parameters
namespace
required
string <= 1024 characters
Example: my-namespace

The name of the namespace.

Request Body schema: application/json
ownerName
required
string

The owner of the namespace.

@@ -2388,7 +2388,7 @@

Response samples

Content type
application/json
{
  • "totalCount": 1,
  • "results": [
    ]
}