-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
273 patch partitioningspartidparents #302
Open
ABLL526
wants to merge
7
commits into
master
Choose a base branch
from
273-patch-partitioningspartidparents
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
45e7578
Feature 273 First Commit
ABLL526 65ba7c9
Merge branch 'master' into 273-patch-partitioningspartidparents
ABLL526 97c4581
Updated Commit
ABLL526 e89a330
Added the patch parents functionality.
ABLL526 262d426
Added the patch parents functionality.
ABLL526 c8fe915
Added the get ancestors functionality.
ABLL526 1a27004
Added the get ancestors and patch parents functionality.
ABLL526 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
* @benedeki @lsulak @TebaleloS @Zejnilovic @dk1844 @salamonpavel | ||
* @benedeki @lsulak @TebaleloS @Zejnilovic @dk1844 @salamonpavel @ABLL526 |
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 |
---|---|---|
|
@@ -32,3 +32,10 @@ to remove them or | |
sbt flywayBaseline | ||
``` | ||
to set the current state as the baseline. | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This exact information is already in the readme file. Remove it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @salamonpavel will remove the file from the PR. |
||
```zsh | ||
docker kill atum_db | ||
docker rm atum_db | ||
docker run --name=atum_db -e POSTGRES_PASSWORD=postgres -e POSTGRES_DB=atum_db -p 5432:5432 -d postgres:16 | ||
sbt flywayMigrate | ||
``` |
121 changes: 121 additions & 0 deletions
121
database/src/main/postgres/runs/V0.3.0.1__get_ancestors.sql
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,121 @@ | ||
/* | ||
* Copyright 2021 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE OR REPLACE FUNCTION runs.get_ancestors( | ||
ABLL526 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
IN i_id_partitioning BIGINT, | ||
IN i_limit INT DEFAULT 5, | ||
IN i_offset BIGINT DEFAULT 0, | ||
ABLL526 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
OUT status INTEGER, | ||
OUT status_text TEXT, | ||
OUT ancestorid BIGINT, | ||
OUT partitioning JSONB, | ||
OUT author TEXT, | ||
OUT has_more BOOLEAN | ||
) RETURNS SETOF record AS | ||
$$ | ||
------------------------------------------------------------------------------- | ||
-- | ||
-- Function: runs.get_ancestors(3) | ||
-- Returns Ancestors' partition ID for the given id | ||
-- | ||
-- Parameters: | ||
-- i_id_partitioning - id that we asking the Ancestors for | ||
-- i_limit - (optional) maximum number of partitionings to return, default is 5 | ||
-- i_offset - (optional) offset to use for pagination, default is 0 | ||
-- | ||
-- Returns: | ||
-- status - Status code | ||
-- status_text - Status message | ||
-- ancestorid - ID of Ancestor partition | ||
-- partitioning - partitioning data of ancestor | ||
-- author - author of the Ancestor partitioning | ||
-- has_more - Flag indicating if there are more partitionings available | ||
|
||
-- Status codes: | ||
-- 11 - OK | ||
-- 41 - Partitioning not found | ||
-- 42 - Ancestor Partitioning not found | ||
-- | ||
------------------------------------------------------------------------------- | ||
DECLARE | ||
partitionCreateAt TIMESTAMP; | ||
_has_more BOOLEAN; | ||
|
||
BEGIN | ||
-- Check if the partitioning exists | ||
PERFORM 1 FROM runs.partitionings WHERE id_partitioning = i_id_partitioning; | ||
IF NOT FOUND THEN | ||
status := 41; | ||
status_text := 'Partitioning not found'; | ||
RETURN NEXT; | ||
RETURN; | ||
END IF; | ||
|
||
-- Get the creation timestamp of the partitioning | ||
SELECT created_at | ||
FROM runs.partitionings | ||
WHERE id_partitioning = i_id_partitioning | ||
INTO partitionCreateAt; | ||
|
||
-- Check if there are more partitionings than the limit | ||
SELECT count(*) > i_limit | ||
FROM flows.partitioning_to_flow PTF | ||
WHERE PTF.fk_flow IN ( | ||
SELECT fk_flow | ||
FROM flows.partitioning_to_flow | ||
WHERE fk_partitioning = i_id_partitioning | ||
) | ||
LIMIT i_limit + 1 OFFSET i_offset | ||
INTO _has_more; | ||
|
||
-- Return the ancestors | ||
RETURN QUERY | ||
SELECT | ||
11 AS status, | ||
'OK' AS status_text, | ||
P.id_partitioning AS ancestorid, | ||
P.partitioning AS partitioning, | ||
P.created_by AS author, | ||
_has_more AS has_more | ||
FROM | ||
runs.partitionings P | ||
INNER JOIN flows.partitioning_to_flow PF ON PF.fk_partitioning = P.id_partitioning | ||
INNER JOIN flows.partitioning_to_flow PF2 ON PF2.fk_flow = PF.fk_flow | ||
WHERE | ||
PF2.fk_partitioning = i_id_partitioning | ||
AND | ||
P.created_at < partitionCreateAt | ||
GROUP BY P.id_partitioning | ||
ORDER BY P.id_partitioning, P.created_at DESC | ||
LIMIT i_limit | ||
OFFSET i_offset; | ||
|
||
IF FOUND THEN | ||
status := 11; | ||
status_text := 'OK'; | ||
ELSE | ||
status := 42; | ||
status_text := 'Ancestor Partitioning not found'; | ||
END IF; | ||
RETURN NEXT; | ||
RETURN; | ||
|
||
END; | ||
$$ | ||
LANGUAGE plpgsql VOLATILE SECURITY DEFINER; | ||
|
||
ALTER FUNCTION runs.get_ancestors(BIGINT, INT, BIGINT) OWNER TO atum_owner; | ||
GRANT EXECUTE ON FUNCTION runs.get_ancestors(BIGINT, INT, BIGINT) TO atum_user; |
112 changes: 112 additions & 0 deletions
112
database/src/main/postgres/runs/V0.3.0.2__add_parent.sql
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,112 @@ | ||
/* | ||
* Copyright 2021 ABSA Group Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
CREATE OR REPLACE FUNCTION runs.add_parent( | ||
IN i_id_partitioning BIGINT, | ||
IN i_id_parent_partitioning BIGINT, | ||
IN i_by_user TEXT, | ||
IN i_copy_measurements BOOLEAN DEFAULT true, | ||
IN i_copy_additional_data BOOLEAN DEFAULT true, | ||
OUT status INTEGER, | ||
OUT status_text TEXT | ||
) RETURNS record AS | ||
$$ | ||
------------------------------------------------------------------------------- | ||
-- | ||
-- Function: runs.add_parent(5) | ||
-- Add the Parent Partition for a given partition ID and copies measurements and additional data from parent. | ||
-- | ||
-- Parameters: | ||
-- i_id_partitioning - id of the partition to be changed | ||
-- i_id_parent_partitioning - id of the new parent of the partition, | ||
-- i_by_user - user behind the change | ||
-- i_copy_measurements - copies measurements | ||
-- i_copy_additional_data - copies additional data | ||
-- | ||
-- Returns: | ||
-- status - Status code | ||
-- status_text - Status message | ||
-- | ||
-- Status codes: | ||
-- 11 - OK | ||
-- 41 - Child Partitioning not found | ||
-- 42 - Parent Partitioning not found | ||
-- | ||
------------------------------------------------------------------------------- | ||
DECLARE | ||
Additional_Data HSTORE; | ||
|
||
BEGIN | ||
|
||
PERFORM 1 FROM runs.partitionings WHERE id_partitioning = i_id_partitioning; | ||
IF NOT FOUND THEN | ||
status := 41; | ||
status_text := 'Child Partitioning not found'; | ||
RETURN; | ||
END IF; | ||
|
||
PERFORM 1 FROM runs.partitionings WHERE id_partitioning = i_id_parent_partitioning; | ||
IF NOT FOUND THEN | ||
status := 42; | ||
status_text := 'Parent Partitioning not found'; | ||
RETURN; | ||
END IF; | ||
|
||
-- SELECT F.id_flow as mainFlow | ||
-- FROM runs.get_partitioning_main_flow(i_partitioning_id) AS F | ||
-- INTO mainFlow; | ||
|
||
-- flow_id := array( | ||
-- SELECT fk_flow AS flow_id | ||
-- FROM flows.partitioning_to_flow | ||
-- WHERE fk_partitioning = i_partitioning_id | ||
-- AND fk_flow != mainFlow | ||
-- ); | ||
|
||
-- FOREACH var IN ARRAY flow_id LOOP | ||
-- DELETE FROM flows.partitioning_to_flow AS PTF | ||
-- WHERE PTF.fk_partitioning = i_partitioning_id | ||
-- AND PTF.fk_flow = var; | ||
-- END LOOP; | ||
|
||
IF i_copy_additional_data THEN | ||
SELECT | ||
hstore(array_agg(PAD.ad_name), array_agg(PAD.ad_value)) AS Additional_Data | ||
FROM | ||
runs.get_partitioning_additional_data(i_id_parent_partitioning) AS PAD | ||
INTO | ||
Additional_Data; | ||
PERFORM 1 FROM runs.create_or_update_additional_data(i_id_partitioning, Additional_Data, i_by_user); | ||
END IF; | ||
|
||
IF i_copy_measurements THEN | ||
INSERT INTO runs.measure_definitions (fk_partitioning, measure_name, measured_columns, created_by) | ||
SELECT i_id_partitioning, PMI.measure_name, PMI.measured_columns, i_by_user | ||
FROM | ||
runs.get_partitioning_measures_by_id(i_id_parent_partitioning) AS PMI; | ||
END IF; | ||
|
||
PERFORM 1 FROM flows._add_to_parent_flows(i_id_parent_partitioning, i_id_partitioning, i_by_user); | ||
status := 11; | ||
status_text := 'Parent Updated'; | ||
RETURN; | ||
|
||
END; | ||
$$ | ||
LANGUAGE plpgsql VOLATILE SECURITY DEFINER; | ||
|
||
ALTER FUNCTION runs.add_parent(BIGINT, BIGINT, TEXT, BOOLEAN, BOOLEAN) OWNER TO atum_owner; | ||
GRANT EXECUTE ON FUNCTION runs.add_parent(BIGINT, BIGINT, TEXT, BOOLEAN, BOOLEAN) TO atum_user; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be ignored.
For my use.