Skip to content

Commit c651943

Browse files
move job persistence code out of airbyte-scheduler (#16831)
* wip for moving scheduler-persistence to airbyte-persistence * move main/resources * move settings include to match existing includes * fix incorrect import paths * fix import order
1 parent 1d7e216 commit c651943

File tree

153 files changed

+372
-631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+372
-631
lines changed

airbyte-bootloader/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
implementation project(':airbyte-db:db-lib')
1010
implementation project(":airbyte-json-validation")
1111
implementation project(':airbyte-protocol:protocol-models')
12-
implementation project(':airbyte-scheduler:scheduler-persistence')
12+
implementation project(':airbyte-persistence:job-persistence')
1313

1414
implementation 'io.temporal:temporal-sdk:1.8.1'
1515
implementation libs.flyway.core

airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import io.airbyte.db.instance.DatabaseMigrator;
2929
import io.airbyte.db.instance.configs.ConfigsDatabaseMigrator;
3030
import io.airbyte.db.instance.jobs.JobsDatabaseMigrator;
31-
import io.airbyte.scheduler.persistence.DefaultJobPersistence;
32-
import io.airbyte.scheduler.persistence.JobPersistence;
31+
import io.airbyte.persistence.job.DefaultJobPersistence;
32+
import io.airbyte.persistence.job.JobPersistence;
3333
import io.airbyte.validation.json.JsonValidationException;
3434
import java.io.IOException;
3535
import java.util.Optional;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/SecretMigrator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.airbyte.config.persistence.split_secrets.SecretCoordinate;
2020
import io.airbyte.config.persistence.split_secrets.SecretPersistence;
2121
import io.airbyte.config.persistence.split_secrets.SecretsHelpers;
22-
import io.airbyte.scheduler.persistence.JobPersistence;
22+
import io.airbyte.persistence.job.JobPersistence;
2323
import io.airbyte.validation.json.JsonValidationException;
2424
import java.io.IOException;
2525
import java.util.List;

airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import io.airbyte.db.instance.configs.ConfigsDatabaseTestProvider;
3636
import io.airbyte.db.instance.jobs.JobsDatabaseMigrator;
3737
import io.airbyte.db.instance.jobs.JobsDatabaseTestProvider;
38-
import io.airbyte.scheduler.persistence.DefaultJobPersistence;
38+
import io.airbyte.persistence.job.DefaultJobPersistence;
3939
import java.util.Optional;
4040
import java.util.UUID;
4141
import java.util.concurrent.atomic.AtomicBoolean;

airbyte-bootloader/src/test/java/io/airbyte/bootloader/SecretMigratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import io.airbyte.config.persistence.ConfigPersistence;
1717
import io.airbyte.config.persistence.split_secrets.SecretCoordinate;
1818
import io.airbyte.config.persistence.split_secrets.SecretPersistence;
19+
import io.airbyte.persistence.job.JobPersistence;
1920
import io.airbyte.protocol.models.ConnectorSpecification;
20-
import io.airbyte.scheduler.persistence.JobPersistence;
2121
import io.airbyte.validation.json.JsonValidationException;
2222
import java.io.IOException;
2323
import java.util.HashMap;

airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ContainerOrchestratorApp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.airbyte.config.Configs;
1212
import io.airbyte.config.EnvConfigs;
1313
import io.airbyte.config.helpers.LogClientSingleton;
14-
import io.airbyte.scheduler.models.JobRunConfig;
14+
import io.airbyte.persistence.job.models.JobRunConfig;
1515
import io.airbyte.workers.WorkerConfigs;
1616
import io.airbyte.workers.WorkerUtils;
1717
import io.airbyte.workers.process.AsyncKubePodStatus;

airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/DbtJobOrchestrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import io.airbyte.config.Configs;
88
import io.airbyte.config.OperatorDbtInput;
9-
import io.airbyte.scheduler.models.IntegrationLauncherConfig;
10-
import io.airbyte.scheduler.models.JobRunConfig;
9+
import io.airbyte.persistence.job.models.IntegrationLauncherConfig;
10+
import io.airbyte.persistence.job.models.JobRunConfig;
1111
import io.airbyte.workers.WorkerConfigs;
1212
import io.airbyte.workers.WorkerUtils;
1313
import io.airbyte.workers.general.DbtTransformationRunner;

airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/JobOrchestrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package io.airbyte.container_orchestrator;
66

77
import io.airbyte.commons.json.Jsons;
8-
import io.airbyte.scheduler.models.JobRunConfig;
8+
import io.airbyte.persistence.job.models.JobRunConfig;
99
import io.airbyte.workers.process.AsyncOrchestratorPodProcess;
1010
import io.airbyte.workers.process.KubePodInfo;
1111
import io.airbyte.workers.process.KubePodProcess;
@@ -70,7 +70,7 @@ static KubePodInfo readKubePodInfo() throws IOException {
7070
*/
7171
Optional<String> runJob() throws Exception;
7272

73-
static <T> T readAndDeserializeFile(Path path, Class<T> type) throws IOException {
73+
static <T> T readAndDeserializeFile(final Path path, final Class<T> type) throws IOException {
7474
return Jsons.deserialize(Files.readString(path), type);
7575
}
7676

airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/NormalizationJobOrchestrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.airbyte.config.Configs;
99
import io.airbyte.config.NormalizationInput;
1010
import io.airbyte.config.NormalizationSummary;
11-
import io.airbyte.scheduler.models.IntegrationLauncherConfig;
12-
import io.airbyte.scheduler.models.JobRunConfig;
11+
import io.airbyte.persistence.job.models.IntegrationLauncherConfig;
12+
import io.airbyte.persistence.job.models.JobRunConfig;
1313
import io.airbyte.workers.WorkerConfigs;
1414
import io.airbyte.workers.WorkerUtils;
1515
import io.airbyte.workers.general.DefaultNormalizationWorker;

airbyte-container-orchestrator/src/main/java/io/airbyte/container_orchestrator/ReplicationJobOrchestrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import io.airbyte.metrics.lib.MetricClient;
1313
import io.airbyte.metrics.lib.MetricClientFactory;
1414
import io.airbyte.metrics.lib.MetricEmittingApps;
15-
import io.airbyte.scheduler.models.IntegrationLauncherConfig;
16-
import io.airbyte.scheduler.models.JobRunConfig;
15+
import io.airbyte.persistence.job.models.IntegrationLauncherConfig;
16+
import io.airbyte.persistence.job.models.JobRunConfig;
1717
import io.airbyte.workers.RecordSchemaValidator;
1818
import io.airbyte.workers.WorkerConfigs;
1919
import io.airbyte.workers.WorkerConstants;

0 commit comments

Comments
 (0)