Skip to content

Commit 39b32b3

Browse files
authored
Bulk CDK: Rename stuff to prevent conflicts (#46650)
1 parent c2923bd commit 39b32b3

File tree

119 files changed

+818
-695
lines changed

Some content is hidden

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

119 files changed

+818
-695
lines changed

airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/data/AirbyteType.kt airbyte-cdk/bulk/core/base/src/main/kotlin/io/airbyte/cdk/data/AirbyteSchemaType.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ import io.airbyte.protocol.models.JsonSchemaType
1212
* This maps to the subset of [JsonSchemaType] which is used in practice. Its main reason for
1313
* existing is to provide type-safety and convenient comparisons and string representations.
1414
*/
15-
sealed interface AirbyteType {
15+
sealed interface AirbyteSchemaType {
1616
/** Unwraps the underlying Airbyte protocol type object. */
1717
fun asJsonSchemaType(): JsonSchemaType
1818

1919
/** Convenience method to generate the JSON Schema object. */
2020
fun asJsonSchema(): JsonNode = Jsons.valueToTree(asJsonSchemaType().jsonSchemaTypeMap)
2121
}
2222

23-
data class ArrayAirbyteType(
24-
val item: AirbyteType,
25-
) : AirbyteType {
23+
data class ArrayAirbyteSchemaType(
24+
val item: AirbyteSchemaType,
25+
) : AirbyteSchemaType {
2626
override fun asJsonSchemaType(): JsonSchemaType =
2727
JsonSchemaType.builder(JsonSchemaPrimitiveUtil.JsonSchemaPrimitive.ARRAY)
2828
.withItems(item.asJsonSchemaType())
2929
.build()
3030
}
3131

32-
enum class LeafAirbyteType(
32+
enum class LeafAirbyteSchemaType(
3333
private val jsonSchemaType: JsonSchemaType,
34-
) : AirbyteType {
34+
) : AirbyteSchemaType {
3535
BOOLEAN(JsonSchemaType.BOOLEAN),
3636
STRING(JsonSchemaType.STRING),
3737
BINARY(JsonSchemaType.STRING_BASE_64),

airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/AirbyteStreamFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface AirbyteStreamFactory {
2020
discoveredStream.id.name,
2121
discoveredStream.id.namespace,
2222
discoveredStream.columns.map {
23-
AirbyteField.of(it.id, it.type.airbyteType.asJsonSchemaType())
23+
AirbyteField.of(it.id, it.type.airbyteSchemaType.asJsonSchemaType())
2424
},
2525
)
2626
}

airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/discover/Field.kt

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* Copyright (c) 2024 Airbyte, Inc., all rights reserved. */
22
package io.airbyte.cdk.discover
33

4-
import io.airbyte.cdk.data.AirbyteType
4+
import io.airbyte.cdk.data.AirbyteSchemaType
55
import io.airbyte.cdk.data.IntCodec
66
import io.airbyte.cdk.data.JsonDecoder
77
import io.airbyte.cdk.data.JsonEncoder
88
import io.airbyte.cdk.data.JsonStringCodec
9-
import io.airbyte.cdk.data.LeafAirbyteType
9+
import io.airbyte.cdk.data.LeafAirbyteSchemaType
1010
import io.airbyte.cdk.data.OffsetDateTimeCodec
1111
import java.time.OffsetDateTime
1212

@@ -23,7 +23,7 @@ sealed interface FieldOrMetaField {
2323
*/
2424
interface FieldType {
2525
/** maps to [io.airbyte.protocol.models.Field.type] */
26-
val airbyteType: AirbyteType
26+
val airbyteSchemaType: AirbyteSchemaType
2727
val jsonEncoder: JsonEncoder<*>
2828
}
2929

@@ -73,19 +73,20 @@ enum class CommonMetaField(
7373
}
7474

7575
data object CdcStringMetaFieldType : LosslessFieldType {
76-
override val airbyteType: AirbyteType = LeafAirbyteType.STRING
76+
override val airbyteSchemaType: AirbyteSchemaType = LeafAirbyteSchemaType.STRING
7777
override val jsonEncoder: JsonEncoder<String> = JsonStringCodec
7878
override val jsonDecoder: JsonDecoder<String> = JsonStringCodec
7979
}
8080

8181
data object CdcIntegerMetaFieldType : LosslessFieldType {
82-
override val airbyteType: AirbyteType = LeafAirbyteType.INTEGER
82+
override val airbyteSchemaType: AirbyteSchemaType = LeafAirbyteSchemaType.INTEGER
8383
override val jsonEncoder: JsonEncoder<Int> = IntCodec
8484
override val jsonDecoder: JsonDecoder<Int> = IntCodec
8585
}
8686

8787
data object CdcOffsetDateTimeMetaFieldType : LosslessFieldType {
88-
override val airbyteType: AirbyteType = LeafAirbyteType.TIMESTAMP_WITH_TIMEZONE
88+
override val airbyteSchemaType: AirbyteSchemaType =
89+
LeafAirbyteSchemaType.TIMESTAMP_WITH_TIMEZONE
8990
override val jsonEncoder: JsonEncoder<OffsetDateTime> = OffsetDateTimeCodec
9091
override val jsonDecoder: JsonDecoder<OffsetDateTime> = OffsetDateTimeCodec
9192
}

airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/output/CatalogValidationFailureHandler.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package io.airbyte.cdk.output
33

44
import io.airbyte.cdk.StreamIdentifier
5-
import io.airbyte.cdk.data.AirbyteType
5+
import io.airbyte.cdk.data.AirbyteSchemaType
66
import io.github.oshai.kotlinlogging.KotlinLogging
77
import io.micronaut.context.annotation.DefaultImplementation
88
import jakarta.inject.Singleton
@@ -43,8 +43,8 @@ data class FieldNotFound(
4343
data class FieldTypeMismatch(
4444
override val streamID: StreamIdentifier,
4545
val fieldName: String,
46-
val expected: AirbyteType,
47-
val actual: AirbyteType,
46+
val expected: AirbyteSchemaType,
47+
val actual: AirbyteSchemaType,
4848
) : CatalogValidationFailure
4949

5050
data class InvalidPrimaryKey(

airbyte-cdk/bulk/core/extract/src/main/kotlin/io/airbyte/cdk/read/StateManagerFactory.kt

+24-24
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import io.airbyte.cdk.command.GlobalInputState
1010
import io.airbyte.cdk.command.InputState
1111
import io.airbyte.cdk.command.SourceConfiguration
1212
import io.airbyte.cdk.command.StreamInputState
13-
import io.airbyte.cdk.data.AirbyteType
14-
import io.airbyte.cdk.data.ArrayAirbyteType
15-
import io.airbyte.cdk.data.LeafAirbyteType
13+
import io.airbyte.cdk.data.AirbyteSchemaType
14+
import io.airbyte.cdk.data.ArrayAirbyteSchemaType
15+
import io.airbyte.cdk.data.LeafAirbyteSchemaType
1616
import io.airbyte.cdk.discover.CommonMetaField
1717
import io.airbyte.cdk.discover.Field
1818
import io.airbyte.cdk.discover.FieldOrMetaField
@@ -132,7 +132,7 @@ class StateManagerFactory(
132132
}
133133
}
134134

135-
val expectedSchema: Map<String, AirbyteType> =
135+
val expectedSchema: Map<String, AirbyteSchemaType> =
136136
jsonSchemaProperties.properties().associate { (id: String, schema: JsonNode) ->
137137
id to airbyteTypeFromJsonSchema(schema)
138138
}
@@ -150,15 +150,15 @@ class StateManagerFactory(
150150
handler.accept(FieldNotFound(streamID, id))
151151
return null
152152
}
153-
val expectedAirbyteType: AirbyteType = expectedSchema[id] ?: return null
154-
val actualAirbyteType: AirbyteType = actualColumn.type.airbyteType
155-
if (expectedAirbyteType != actualAirbyteType) {
153+
val expectedAirbyteSchemaType: AirbyteSchemaType = expectedSchema[id] ?: return null
154+
val actualAirbyteSchemaType: AirbyteSchemaType = actualColumn.type.airbyteSchemaType
155+
if (expectedAirbyteSchemaType != actualAirbyteSchemaType) {
156156
handler.accept(
157157
FieldTypeMismatch(
158158
streamID,
159159
id,
160-
expectedAirbyteType,
161-
actualAirbyteType,
160+
expectedAirbyteSchemaType,
161+
actualAirbyteSchemaType,
162162
),
163163
)
164164
return null
@@ -229,44 +229,44 @@ class StateManagerFactory(
229229
}
230230

231231
/**
232-
* Recursively re-generates the original [AirbyteType] from a catalog stream field's JSON
232+
* Recursively re-generates the original [AirbyteSchemaType] from a catalog stream field's JSON
233233
* schema.
234234
*/
235-
private fun airbyteTypeFromJsonSchema(jsonSchema: JsonNode): AirbyteType {
235+
private fun airbyteTypeFromJsonSchema(jsonSchema: JsonNode): AirbyteSchemaType {
236236
fun value(key: String): String = jsonSchema[key]?.asText() ?: ""
237237
return when (value("type")) {
238-
"array" -> ArrayAirbyteType(airbyteTypeFromJsonSchema(jsonSchema["items"]))
239-
"null" -> LeafAirbyteType.NULL
240-
"boolean" -> LeafAirbyteType.BOOLEAN
238+
"array" -> ArrayAirbyteSchemaType(airbyteTypeFromJsonSchema(jsonSchema["items"]))
239+
"null" -> LeafAirbyteSchemaType.NULL
240+
"boolean" -> LeafAirbyteSchemaType.BOOLEAN
241241
"number" ->
242242
when (value("airbyte_type")) {
243243
"integer",
244-
"big_integer", -> LeafAirbyteType.INTEGER
245-
else -> LeafAirbyteType.NUMBER
244+
"big_integer", -> LeafAirbyteSchemaType.INTEGER
245+
else -> LeafAirbyteSchemaType.NUMBER
246246
}
247247
"string" ->
248248
when (value("format")) {
249-
"date" -> LeafAirbyteType.DATE
249+
"date" -> LeafAirbyteSchemaType.DATE
250250
"date-time" ->
251251
if (value("airbyte_type") == "timestamp_with_timezone") {
252-
LeafAirbyteType.TIMESTAMP_WITH_TIMEZONE
252+
LeafAirbyteSchemaType.TIMESTAMP_WITH_TIMEZONE
253253
} else {
254-
LeafAirbyteType.TIMESTAMP_WITHOUT_TIMEZONE
254+
LeafAirbyteSchemaType.TIMESTAMP_WITHOUT_TIMEZONE
255255
}
256256
"time" ->
257257
if (value("airbyte_type") == "time_with_timezone") {
258-
LeafAirbyteType.TIME_WITH_TIMEZONE
258+
LeafAirbyteSchemaType.TIME_WITH_TIMEZONE
259259
} else {
260-
LeafAirbyteType.TIME_WITHOUT_TIMEZONE
260+
LeafAirbyteSchemaType.TIME_WITHOUT_TIMEZONE
261261
}
262262
else ->
263263
if (value("contentEncoding") == "base64") {
264-
LeafAirbyteType.BINARY
264+
LeafAirbyteSchemaType.BINARY
265265
} else {
266-
LeafAirbyteType.STRING
266+
LeafAirbyteSchemaType.STRING
267267
}
268268
}
269-
else -> LeafAirbyteType.JSONB
269+
else -> LeafAirbyteSchemaType.JSONB
270270
}
271271
}
272272
}

airbyte-cdk/bulk/core/extract/src/testFixtures/kotlin/io/airbyte/cdk/discover/IntFieldType.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package io.airbyte.cdk.discover
66

7-
import io.airbyte.cdk.data.AirbyteType
7+
import io.airbyte.cdk.data.AirbyteSchemaType
88
import io.airbyte.cdk.data.IntCodec
99
import io.airbyte.cdk.data.JsonEncoder
10-
import io.airbyte.cdk.data.LeafAirbyteType
10+
import io.airbyte.cdk.data.LeafAirbyteSchemaType
1111

1212
data object IntFieldType : FieldType {
13-
override val airbyteType: AirbyteType = LeafAirbyteType.INTEGER
13+
override val airbyteSchemaType: AirbyteSchemaType = LeafAirbyteSchemaType.INTEGER
1414
override val jsonEncoder: JsonEncoder<*> = IntCodec
1515
}

airbyte-cdk/bulk/core/extract/src/testFixtures/kotlin/io/airbyte/cdk/discover/OffsetDateTimeFieldType.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44

55
package io.airbyte.cdk.discover
66

7-
import io.airbyte.cdk.data.AirbyteType
7+
import io.airbyte.cdk.data.AirbyteSchemaType
88
import io.airbyte.cdk.data.JsonEncoder
9-
import io.airbyte.cdk.data.LeafAirbyteType
9+
import io.airbyte.cdk.data.LeafAirbyteSchemaType
1010
import io.airbyte.cdk.data.OffsetDateTimeCodec
1111

1212
data object OffsetDateTimeFieldType : FieldType {
13-
override val airbyteType: AirbyteType = LeafAirbyteType.TIMESTAMP_WITH_TIMEZONE
13+
override val airbyteSchemaType: AirbyteSchemaType =
14+
LeafAirbyteSchemaType.TIMESTAMP_WITH_TIMEZONE
1415
override val jsonEncoder: JsonEncoder<*> = OffsetDateTimeCodec
1516
}

airbyte-cdk/bulk/core/extract/src/testFixtures/kotlin/io/airbyte/cdk/discover/StringFieldType.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
package io.airbyte.cdk.discover
66

7-
import io.airbyte.cdk.data.AirbyteType
7+
import io.airbyte.cdk.data.AirbyteSchemaType
88
import io.airbyte.cdk.data.JsonEncoder
9-
import io.airbyte.cdk.data.LeafAirbyteType
9+
import io.airbyte.cdk.data.LeafAirbyteSchemaType
1010
import io.airbyte.cdk.data.TextCodec
1111

1212
data object StringFieldType : FieldType {
13-
override val airbyteType: AirbyteType = LeafAirbyteType.STRING
13+
override val airbyteSchemaType: AirbyteSchemaType = LeafAirbyteSchemaType.STRING
1414
override val jsonEncoder: JsonEncoder<*> = TextCodec
1515
}

airbyte-cdk/bulk/core/extract/src/testFixtures/kotlin/io/airbyte/cdk/discover/TestAirbyteStreamFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TestAirbyteStreamFactory : AirbyteStreamFactory {
2121
supportedSyncModes = listOf(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL)
2222
(jsonSchema["properties"] as ObjectNode).apply {
2323
for (metaField in CommonMetaField.entries) {
24-
set<ObjectNode>(metaField.id, metaField.type.airbyteType.asJsonSchema())
24+
set<ObjectNode>(metaField.id, metaField.type.airbyteSchemaType.asJsonSchema())
2525
}
2626
}
2727
defaultCursorField = listOf(CommonMetaField.CDC_LSN.id)
+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.mock_integration_test
5+
package io.airbyte.cdk.load.mock_integration_test
66

7-
import io.airbyte.cdk.test.util.NoopDestinationCleaner
8-
import io.airbyte.cdk.test.util.NoopExpectedRecordMapper
9-
import io.airbyte.cdk.test.util.NoopNameMapper
10-
import io.airbyte.cdk.test.write.BasicFunctionalityIntegrationTest
7+
import io.airbyte.cdk.load.test.util.NoopDestinationCleaner
8+
import io.airbyte.cdk.load.test.util.NoopExpectedRecordMapper
9+
import io.airbyte.cdk.load.test.util.NoopNameMapper
10+
import io.airbyte.cdk.load.write.BasicFunctionalityIntegrationTest
1111

1212
class MockBasicFunctionalityIntegrationTest :
1313
BasicFunctionalityIntegrationTest(

airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/mock_integration_test/MockDestinationBackend.kt airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/load/mock_integration_test/MockDestinationBackend.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.mock_integration_test
5+
package io.airbyte.cdk.load.mock_integration_test
66

7-
import io.airbyte.cdk.test.util.DestinationDataDumper
8-
import io.airbyte.cdk.test.util.OutputRecord
7+
import io.airbyte.cdk.load.test.util.DestinationDataDumper
8+
import io.airbyte.cdk.load.test.util.OutputRecord
99
import java.util.concurrent.ConcurrentHashMap
1010

1111
object MockDestinationBackend {

airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/mock_integration_test/MockDestinationChecker.kt airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/load/mock_integration_test/MockDestinationChecker.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.mock_integration_test
5+
package io.airbyte.cdk.load.mock_integration_test
66

7-
import io.airbyte.cdk.check.DestinationChecker
7+
import io.airbyte.cdk.load.check.DestinationChecker
88
import javax.inject.Singleton
99

1010
@Singleton

airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/mock_integration_test/MockDestinationConfiguration.kt airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/load/mock_integration_test/MockDestinationConfiguration.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.mock_integration_test
5+
package io.airbyte.cdk.load.mock_integration_test
66

77
import io.airbyte.cdk.command.ConfigurationSpecification
8-
import io.airbyte.cdk.command.DestinationConfiguration
9-
import io.airbyte.cdk.command.DestinationConfigurationFactory
8+
import io.airbyte.cdk.load.command.DestinationConfiguration
9+
import io.airbyte.cdk.load.command.DestinationConfigurationFactory
1010
import io.micronaut.context.annotation.Factory
1111
import jakarta.inject.Singleton
1212

airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/mock_integration_test/MockDestinationWriter.kt airbyte-cdk/bulk/core/load/src/integrationTest/kotlin/io/airbyte/cdk/load/mock_integration_test/MockDestinationWriter.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.mock_integration_test
5+
package io.airbyte.cdk.load.mock_integration_test
66

7-
import io.airbyte.cdk.command.DestinationStream
8-
import io.airbyte.cdk.data.ObjectValue
9-
import io.airbyte.cdk.message.Batch
10-
import io.airbyte.cdk.message.DestinationRecord
11-
import io.airbyte.cdk.message.SimpleBatch
12-
import io.airbyte.cdk.test.util.OutputRecord
13-
import io.airbyte.cdk.write.DestinationWriter
14-
import io.airbyte.cdk.write.StreamLoader
7+
import io.airbyte.cdk.load.command.DestinationStream
8+
import io.airbyte.cdk.load.data.ObjectValue
9+
import io.airbyte.cdk.load.message.Batch
10+
import io.airbyte.cdk.load.message.DestinationRecord
11+
import io.airbyte.cdk.load.message.SimpleBatch
12+
import io.airbyte.cdk.load.test.util.OutputRecord
13+
import io.airbyte.cdk.load.write.DestinationWriter
14+
import io.airbyte.cdk.load.write.StreamLoader
1515
import java.time.Instant
1616
import java.util.UUID
1717
import javax.inject.Singleton

airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/check/CheckOperation.kt airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/load/check/CheckOperation.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.check
5+
package io.airbyte.cdk.load.check
66

77
import io.airbyte.cdk.Operation
88
import io.airbyte.cdk.command.ConfigurationSpecification
99
import io.airbyte.cdk.command.ConfigurationSpecificationSupplier
10-
import io.airbyte.cdk.command.DestinationConfiguration
11-
import io.airbyte.cdk.command.DestinationConfigurationFactory
10+
import io.airbyte.cdk.load.command.DestinationConfiguration
11+
import io.airbyte.cdk.load.command.DestinationConfigurationFactory
1212
import io.airbyte.cdk.output.ExceptionHandler
1313
import io.airbyte.cdk.output.OutputConsumer
1414
import io.airbyte.protocol.models.v0.AirbyteConnectionStatus

airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/check/DestinationChecker.kt airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/load/check/DestinationChecker.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.check
5+
package io.airbyte.cdk.load.check
66

7-
import io.airbyte.cdk.command.DestinationConfiguration
7+
import io.airbyte.cdk.load.command.DestinationConfiguration
88

99
/**
1010
* A check operation that is run before the destination is used.

airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/command/DestinationCatalog.kt airbyte-cdk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/load/command/DestinationCatalog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2024 Airbyte, Inc., all rights reserved.
33
*/
44

5-
package io.airbyte.cdk.command
5+
package io.airbyte.cdk.load.command
66

77
import io.airbyte.protocol.models.v0.ConfiguredAirbyteCatalog
88
import io.micronaut.context.annotation.Factory

0 commit comments

Comments
 (0)