-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into teradata-profiling-fix
- Loading branch information
Showing
74 changed files
with
1,478 additions
and
435 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
30 changes: 30 additions & 0 deletions
30
...n/java/com/linkedin/datahub/upgrade/config/restoreindices/ReindexDashboardInfoConfig.java
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,30 @@ | ||
| package com.linkedin.datahub.upgrade.config.restoreindices; | ||
|
|
||
| import com.linkedin.datahub.upgrade.config.SystemUpdateCondition; | ||
| import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade; | ||
| import com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo.ReindexDashboardInfo; | ||
| import com.linkedin.metadata.entity.AspectDao; | ||
| import com.linkedin.metadata.entity.EntityService; | ||
| import io.datahubproject.metadata.context.OperationContext; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Conditional; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| @Configuration | ||
| @Conditional(SystemUpdateCondition.NonBlockingSystemUpdateCondition.class) | ||
| public class ReindexDashboardInfoConfig { | ||
|
|
||
| @Bean | ||
| public NonBlockingSystemUpgrade reindexDashboardInfo( | ||
| final OperationContext opContext, | ||
| final EntityService<?> entityService, | ||
| final AspectDao aspectDao, | ||
| @Value("${systemUpdate.dashboardInfo.enabled}") final boolean enabled, | ||
| @Value("${systemUpdate.dashboardInfo.batchSize}") final Integer batchSize, | ||
| @Value("${systemUpdate.dashboardInfo.delayMs}") final Integer delayMs, | ||
| @Value("${systemUpdate.dashboardInfo.limit}") final Integer limit) { | ||
| return new ReindexDashboardInfo( | ||
| opContext, entityService, aspectDao, enabled, batchSize, delayMs, limit); | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
...om/linkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfo.java
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,49 @@ | ||
| package com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.linkedin.datahub.upgrade.UpgradeStep; | ||
| import com.linkedin.datahub.upgrade.system.NonBlockingSystemUpgrade; | ||
| import com.linkedin.metadata.entity.AspectDao; | ||
| import com.linkedin.metadata.entity.EntityService; | ||
| import io.datahubproject.metadata.context.OperationContext; | ||
| import java.util.List; | ||
| import javax.annotation.Nonnull; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| /** | ||
| * A job that reindexes all dashboard info aspects as part of reindexing dashboards relationship. | ||
| * This is required to fix the dashboards relationships for dashboards | ||
| */ | ||
| @Slf4j | ||
| public class ReindexDashboardInfo implements NonBlockingSystemUpgrade { | ||
|
|
||
| private final List<UpgradeStep> _steps; | ||
|
|
||
| public ReindexDashboardInfo( | ||
| @Nonnull OperationContext opContext, | ||
| EntityService<?> entityService, | ||
| AspectDao aspectDao, | ||
| boolean enabled, | ||
| Integer batchSize, | ||
| Integer batchDelayMs, | ||
| Integer limit) { | ||
| if (enabled) { | ||
| _steps = | ||
| ImmutableList.of( | ||
| new ReindexDashboardInfoStep( | ||
| opContext, entityService, aspectDao, batchSize, batchDelayMs, limit)); | ||
| } else { | ||
| _steps = ImmutableList.of(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String id() { | ||
| return this.getClass().getName(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<UpgradeStep> steps() { | ||
| return _steps; | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
...inkedin/datahub/upgrade/system/restoreindices/dashboardinfo/ReindexDashboardInfoStep.java
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,42 @@ | ||
| package com.linkedin.datahub.upgrade.system.restoreindices.dashboardinfo; | ||
|
|
||
| import static com.linkedin.metadata.Constants.*; | ||
|
|
||
| import com.linkedin.datahub.upgrade.system.AbstractMCLStep; | ||
| import com.linkedin.metadata.entity.AspectDao; | ||
| import com.linkedin.metadata.entity.EntityService; | ||
| import io.datahubproject.metadata.context.OperationContext; | ||
| import javax.annotation.Nonnull; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| @Slf4j | ||
| public class ReindexDashboardInfoStep extends AbstractMCLStep { | ||
|
|
||
| public ReindexDashboardInfoStep( | ||
| OperationContext opContext, | ||
| EntityService<?> entityService, | ||
| AspectDao aspectDao, | ||
| Integer batchSize, | ||
| Integer batchDelayMs, | ||
| Integer limit) { | ||
| super(opContext, entityService, aspectDao, batchSize, batchDelayMs, limit); | ||
| } | ||
|
|
||
| @Override | ||
| public String id() { | ||
| return "dashboard-info-v1"; | ||
| } | ||
|
|
||
| @Nonnull | ||
| @Override | ||
| protected String getAspectName() { | ||
| return DASHBOARD_INFO_ASPECT_NAME; | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| protected String getUrnLike() { | ||
| return "urn:li:" + DASHBOARD_ENTITY_NAME + ":%"; | ||
| } | ||
| } |
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
Oops, something went wrong.