fix: CitusDB for analytics tables Merge with 2.42/master (#14945) [DHIS2-15548] #17099
Conversation
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
larshelge
reviewed
Apr 9, 2024
...is-services/dhis-service-analytics/src/main/java/org/hisp/dhis/db/sql/PostgreSqlBuilder.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 9, 2024
...is-services/dhis-service-analytics/src/main/java/org/hisp/dhis/db/sql/PostgreSqlBuilder.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 9, 2024
...-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 9, 2024
...vice-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 9, 2024
...dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/model/AnalyticsTable.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 9, 2024
...dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/model/AnalyticsTable.java
Outdated
Show resolved
Hide resolved
larshelge
changed the title
gnespolino
approved these changes
Apr 10, 2024
larshelge
reviewed
Apr 10, 2024
...-service-analytics/src/test/java/org/hisp/dhis/analytics/table/model/AnalyticsTableTest.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 10, 2024
...dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/CitusSettings.java
Outdated
Show resolved
Hide resolved
larshelge
reviewed
Apr 10, 2024
...dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/CitusSettings.java
Outdated
Show resolved
Hide resolved
|
Thanks for fixing all of the comments 👍 |
…15548_2.42 # Conflicts: # dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AnalyticsTableType.java
fix: disabling distribution for event and enrollment [DHIS2-15548]
|
# Conflicts: # dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AnalyticsTableType.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelper.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/trackedentity/query/context/sql/SqlQueryBuilders.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/trackedentity/query/context/querybuilder/SqlQueryHelperTest.java
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
* feat: skip citus dynamically [DHIS2-18134] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * feat: peer review [DHIS2-18134] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * feat: small fix [DHIS2-18134] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * feat: formatting [DHIS2-18134] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> * fix: fix integration test [DHIS2-18134] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com> --------- Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
# Conflicts: # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableUpdateParams.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/scheduling/AnalyticsTableJob.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/setting/AnalyticsTableSettings.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManagerTest.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/setting/AnalyticsTableSettingsTest.java
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
# Conflicts: # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManagerTest.java
[DHIS2-15548] perf: gatling tests results [DHIS2-15548]
# Conflicts: # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcValidationResultTableManager.java # dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/model/AnalyticsTable.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/AnalyticsTableServiceTest.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManagerTest.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/model/AnalyticsTablePartitionTest.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/model/AnalyticsTableTest.java # dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/util/AnalyticsIndexHelperTest.java # dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java
[DHIS2-15548] Signed-off-by: Giuseppe Nespolino <g.nespolino@gmail.com>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
DO NOT MERGE YET. We need to test it before the merge.
This branch will probably become its own "test" patch version of DHIS2.
Merging the master branch into the original PR (#14945).