-
Notifications
You must be signed in to change notification settings - Fork 323
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into add-column-level-lineage
- Loading branch information
Showing
42 changed files
with
949 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| *.md | ||
| .* | ||
| Dockerfile | ||
| build | ||
| api/build | ||
| docs | ||
| web/node_modules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| API_PORT=5000 | ||
| API_ADMIN_PORT=5001 | ||
| WEB_PORT=3000 | ||
| TAG=0.19.0 | ||
| TAG=0.26.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| --- | ||
| name: Check for Headers in Source Code | ||
|
|
||
| on: | ||
| push: | ||
| branches: ['renovate/**'] | ||
| pull_request: | ||
| branches: [main] | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Check for Headers | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.9' | ||
|
|
||
| - id: files | ||
| uses: jitterbit/get-changed-files@v1 | ||
| with: | ||
| format: 'json' | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Check for headers | ||
| run: | | ||
| ok=1 | ||
| readarray -t files <<<"$(jq -r '.[]' <<<'${{ steps.files.outputs.all }}')" | ||
| for file in ${files[@]}; do | ||
| if [[ ($file == *".java") ]]; then | ||
| if ! grep -q Copyright "$file"; then | ||
| ok=0 | ||
| echo "Copyright header not found in $file" | ||
| fi | ||
| fi | ||
| done | ||
| if [[ $ok == 0 ]]; then | ||
| exit 1 | ||
| else | ||
| GREEN="\e[32m" | ||
| echo -e "${GREEN}All changed & added files have been scanned. Result: no headers are missing.${ENDCOLOR}" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2018-2022 contributors to the Marquez project | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package marquez.db; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
| import marquez.db.mappers.DatasetSymlinksRowMapper; | ||
| import marquez.db.models.DatasetSymlinkRow; | ||
| import org.jdbi.v3.sqlobject.config.RegisterRowMapper; | ||
| import org.jdbi.v3.sqlobject.statement.SqlQuery; | ||
| import org.jdbi.v3.sqlobject.statement.SqlUpdate; | ||
|
|
||
| @RegisterRowMapper(DatasetSymlinksRowMapper.class) | ||
| public interface DatasetSymlinkDao extends BaseDao { | ||
|
|
||
| default DatasetSymlinkRow upsertDatasetSymlinkRow( | ||
| UUID uuid, String name, UUID namespaceUuid, boolean isPrimary, String type, Instant now) { | ||
| doUpsertDatasetSymlinkRow(uuid, name, namespaceUuid, isPrimary, type, now); | ||
| return findDatasetSymlinkByNamespaceUuidAndName(namespaceUuid, name).orElseThrow(); | ||
| } | ||
|
|
||
| @SqlQuery("SELECT * FROM dataset_symlinks WHERE namespace_uuid = :namespaceUuid and name = :name") | ||
| Optional<DatasetSymlinkRow> findDatasetSymlinkByNamespaceUuidAndName( | ||
| UUID namespaceUuid, String name); | ||
|
|
||
| @SqlUpdate( | ||
| """ | ||
| INSERT INTO dataset_symlinks ( | ||
| dataset_uuid, | ||
| name, | ||
| namespace_uuid, | ||
| is_primary, | ||
| type, | ||
| created_at, | ||
| updated_at | ||
| ) VALUES ( | ||
| :uuid, | ||
| :name, | ||
| :namespaceUuid, | ||
| :isPrimary, | ||
| :type, | ||
| :now, | ||
| :now) | ||
| ON CONFLICT (name, namespace_uuid) DO NOTHING""") | ||
| void doUpsertDatasetSymlinkRow( | ||
| UUID uuid, String name, UUID namespaceUuid, boolean isPrimary, String type, Instant now); | ||
| } |
Oops, something went wrong.