Skip to content

Commit 02cc7cc

Browse files
committed
rename class
1 parent 97dce7a commit 02cc7cc

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.airbyte.cdk.load.orchestration.db
77
import io.airbyte.cdk.load.command.DestinationStream
88
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.TableCatalog
99

10-
interface DestinationInitialStatus
10+
interface DatabaseInitialStatus
1111

1212
/**
1313
* Some destinations can efficiently fetch multiple tables' information in a single query, so this
@@ -23,6 +23,6 @@ interface DestinationInitialStatus
2323
* }
2424
* ```
2525
*/
26-
fun interface DestinationInitialStatusGatherer<InitialStatus : DestinationInitialStatus> {
26+
fun interface DatabaseInitialStatusGatherer<InitialStatus : DatabaseInitialStatus> {
2727
suspend fun gatherInitialStatus(streams: TableCatalog): Map<DestinationStream, InitialStatus>
2828
}
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
package io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping
66

7-
import io.airbyte.cdk.load.orchestration.db.DestinationInitialStatus
7+
import io.airbyte.cdk.load.orchestration.db.DatabaseInitialStatus
88
import java.time.Instant
99

10-
data class TypingDedupingDestinationInitialStatus(
10+
data class TypingDedupingDatabaseInitialStatus(
1111
/** Initial status of the final table, or null if the table doesn't exist yet. */
1212
val finalTableStatus: FinalTableInitialStatus?,
1313
val rawTableStatus: RawTableInitialStatus?,
1414
val tempRawTableStatus: RawTableInitialStatus?,
15-
) : DestinationInitialStatus
15+
) : DatabaseInitialStatus
1616

1717
data class FinalTableInitialStatus(
1818
val isSchemaMismatch: Boolean,

airbyte-cdk/bulk/toolkits/load-db/src/main/kotlin/io/airbyte/cdk/load/orchestration/db/legacy_typing_deduping/TypingDedupingStreamLoader.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private val logger = KotlinLogging.logger {}
1818

1919
class TypingDedupingStreamLoader(
2020
override val stream: DestinationStream,
21-
private val initialStatus: TypingDedupingDestinationInitialStatus,
21+
private val initialStatus: TypingDedupingDatabaseInitialStatus,
2222
private val tableNames: TableNames,
2323
private val columnNameMapping: ColumnNameMapping,
2424
private val rawTableOperations: TypingDedupingRawTableOperations,

airbyte-cdk/bulk/toolkits/load-db/src/main/kotlin/io/airbyte/cdk/load/orchestration/db/legacy_typing_deduping/TypingDedupingWriter.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping
66

77
import io.airbyte.cdk.load.command.DestinationStream
88
import io.airbyte.cdk.load.orchestration.db.DatabaseHandler
9-
import io.airbyte.cdk.load.orchestration.db.DestinationInitialStatusGatherer
9+
import io.airbyte.cdk.load.orchestration.db.DatabaseInitialStatusGatherer
1010
import io.airbyte.cdk.load.write.DestinationWriter
1111
import io.airbyte.cdk.load.write.StreamLoader
1212
import java.util.concurrent.Executors
@@ -16,15 +16,14 @@ import kotlinx.coroutines.runBlocking
1616

1717
class TypingDedupingWriter(
1818
private val names: TableCatalog,
19-
private val stateGatherer:
20-
DestinationInitialStatusGatherer<TypingDedupingDestinationInitialStatus>,
19+
private val stateGatherer: DatabaseInitialStatusGatherer<TypingDedupingDatabaseInitialStatus>,
2120
private val databaseHandler: DatabaseHandler,
2221
private val rawTableOperations: TypingDedupingRawTableOperations,
2322
private val finalTableOperations: TypingDedupingFinalTableOperations,
2423
private val disableTypeDedupe: Boolean,
2524
) : DestinationWriter {
2625
private lateinit var initialStatuses:
27-
Map<DestinationStream, TypingDedupingDestinationInitialStatus>
26+
Map<DestinationStream, TypingDedupingDatabaseInitialStatus>
2827

2928
override suspend fun setup() {
3029
Executors.newFixedThreadPool(4).asCoroutineDispatcher().use { dispatcher ->
@@ -34,7 +33,7 @@ class TypingDedupingWriter(
3433
databaseHandler.createNamespaces(namespaces.toSet())
3534

3635
val initialInitialStatuses:
37-
Map<DestinationStream, TypingDedupingDestinationInitialStatus> =
36+
Map<DestinationStream, TypingDedupingDatabaseInitialStatus> =
3837
stateGatherer.gatherInitialStatus(names)
3938

4039
// TODO migrations - we should probably actually drop all existing migrations as part of
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import io.airbyte.cdk.load.command.Overwrite
2020
import io.airbyte.cdk.load.data.ObjectType
2121
import io.airbyte.cdk.load.message.Meta
2222
import io.airbyte.cdk.load.orchestration.db.ColumnNameMapping
23-
import io.airbyte.cdk.load.orchestration.db.DestinationInitialStatusGatherer
23+
import io.airbyte.cdk.load.orchestration.db.DatabaseInitialStatusGatherer
2424
import io.airbyte.cdk.load.orchestration.db.TableName
2525
import io.airbyte.cdk.load.orchestration.db.TableNames
2626
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.AlterTableReport
2727
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.FinalTableInitialStatus
2828
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.RawTableInitialStatus
2929
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.TableCatalog
30-
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.TypingDedupingDestinationInitialStatus
30+
import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.TypingDedupingDatabaseInitialStatus
3131
import io.airbyte.cdk.util.CollectionUtils.containsAllIgnoreCase
3232
import io.airbyte.cdk.util.CollectionUtils.containsIgnoreCase
3333
import io.airbyte.cdk.util.CollectionUtils.matchingKey
@@ -38,8 +38,8 @@ import java.util.stream.Stream
3838

3939
private val logger = KotlinLogging.logger {}
4040

41-
class BigqueryDestinationInitialStatusGatherer(private val bq: BigQuery) :
42-
DestinationInitialStatusGatherer<TypingDedupingDestinationInitialStatus> {
41+
class BigqueryDatabaseInitialStatusGatherer(private val bq: BigQuery) :
42+
DatabaseInitialStatusGatherer<TypingDedupingDatabaseInitialStatus> {
4343
private fun findExistingTable(finalTableName: TableName): TableDefinition? {
4444
val table = bq.getTable(finalTableName.namespace, finalTableName.name)
4545
return table?.getDefinition()
@@ -116,7 +116,7 @@ class BigqueryDestinationInitialStatusGatherer(private val bq: BigQuery) :
116116

117117
override suspend fun gatherInitialStatus(
118118
streams: TableCatalog,
119-
): Map<DestinationStream, TypingDedupingDestinationInitialStatus> {
119+
): Map<DestinationStream, TypingDedupingDatabaseInitialStatus> {
120120
return streams.mapValues { (stream, names) ->
121121
val (tableNames, columnNameMapping) = names
122122
val finalTable = findExistingTable(tableNames.finalTableName!!)
@@ -143,7 +143,7 @@ class BigqueryDestinationInitialStatusGatherer(private val bq: BigQuery) :
143143
tableNames.rawTableName!!,
144144
TableNames.TMP_TABLE_SUFFIX,
145145
)
146-
TypingDedupingDestinationInitialStatus(
146+
TypingDedupingDatabaseInitialStatus(
147147
finalTableStatus,
148148
rawTableState,
149149
tempRawTableState,

airbyte-integrations/connectors/destination-bigquery/src/main/kotlin/io/airbyte/integrations/destination/bigquery/write/BigqueryWriter.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import io.airbyte.cdk.load.orchestration.db.legacy_typing_deduping.TypingDedupin
1111
import io.airbyte.integrations.destination.bigquery.spec.BigqueryConfiguration
1212
import io.airbyte.integrations.destination.bigquery.typing_deduping.BigQueryDatabaseHandler
1313
import io.airbyte.integrations.destination.bigquery.typing_deduping.BigQuerySqlGenerator
14-
import io.airbyte.integrations.destination.bigquery.typing_deduping.BigqueryDestinationInitialStatusGatherer
14+
import io.airbyte.integrations.destination.bigquery.typing_deduping.BigqueryDatabaseInitialStatusGatherer
1515
import io.micronaut.context.annotation.Factory
1616
import jakarta.inject.Singleton
1717

@@ -26,7 +26,7 @@ class BigqueryWriterFactory(
2626
val destinationHandler = BigQueryDatabaseHandler(bigquery, config.datasetLocation.region)
2727
return TypingDedupingWriter(
2828
names,
29-
BigqueryDestinationInitialStatusGatherer(bigquery),
29+
BigqueryDatabaseInitialStatusGatherer(bigquery),
3030
destinationHandler,
3131
BigqueryRawTableOperations(bigquery),
3232
TypingDedupingFinalTableOperations(

0 commit comments

Comments
 (0)