Skip to content

fix(clickhouse-dest): feature complete for speed mode #66562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

fix(clickhouse-dest): feature complete for speed mode #66562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ef74bb4
fix: use null instead of BigDecimal.ZERO + look up for individual str…
subodh1810 Sep 22, 2025
21ef958
increment cdk version
subodh1810 Sep 22, 2025
602b0d0
fix test
subodh1810 Sep 22, 2025
9ea30a4
fix(clickhouse-dest): feature complete for speed mode
subodh1810 Sep 22, 2025
03daac5
fallback to airbyte_extracted_at if cursor column is not a valid type
subodh1810 Sep 22, 2025
15855c3
make the set as a constant
subodh1810 Sep 22, 2025
87ef1fd
add changelog
subodh1810 Sep 22, 2025
009854d
Merge branch 'master' into cdk-fixes-22nd-sept
subodh1810 Sep 22, 2025
4221526
Merge branch 'cdk-fixes-22nd-sept' into clickhouse-speed-mode-complete
subodh1810 Sep 22, 2025
0fb1773
Merge branch 'master' into clickhouse-speed-mode-complete
subodh1810 Sep 23, 2025
e937132
see if parallel execution works
subodh1810 Sep 23, 2025
705c71e
nope
subodh1810 Sep 23, 2025
0603be5
see if this works?
subodh1810 Sep 23, 2025
fa34735
oops
subodh1810 Sep 23, 2025
a24abc5
Revert "nope"
subodh1810 Sep 23, 2025
4be3d50
Revert "see if this works?"
subodh1810 Sep 23, 2025
210a68a
Reapply "see if this works?"
subodh1810 Sep 23, 2025
d6c3a69
duh
subodh1810 Sep 23, 2025
6def57f
Revert "Reapply "see if this works?""
subodh1810 Sep 23, 2025
4663270
reset
subodh1810 Sep 23, 2025
4595f54
try?
subodh1810 Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions ...lk/core/load/src/main/kotlin/io/airbyte/cdk/load/dataflow/config/ConnectorInputStreams.kt
View file
Open in desktop

This file was deleted.

10 changes: 7 additions & 3 deletions ...dk/bulk/core/load/src/main/kotlin/io/airbyte/cdk/load/dataflow/config/InputBeanFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ import io.airbyte.cdk.load.message.ProtocolMessageDeserializer
import io.micronaut.context.annotation.Factory
import io.micronaut.context.annotation.Requires
import io.micronaut.context.annotation.Value
import io.micronaut.context.env.Environment
import jakarta.inject.Named
import jakarta.inject.Singleton
import java.io.InputStream
import kotlinx.coroutines.flow.Flow

/**
Expand All @@ -56,21 +58,23 @@ class InputBeanFactory {
}

@Requires(property = "airbyte.destination.core.data-channel.medium", value = "SOCKET")
@Requires(notEnv = [Environment.TEST])
@Named("inputStreams")
@Singleton
fun socketStreams(
sockets: List<ClientSocket>,
) = ConnectorInputStreams(sockets.map(ClientSocket::openInputStream))
): List<InputStream> = sockets.map(ClientSocket::openInputStream)

@Requires(property = "airbyte.destination.core.data-channel.medium", value = "STDIO")
@Requires(notEnv = [Environment.TEST])
@Named("inputStreams")
@Singleton
fun stdInStreams() = ConnectorInputStreams(listOf(System.`in`))
fun stdInStreams(): List<InputStream> = listOf(System.`in`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need ConnectorInputStreams to avoid issues with micronaut injection


@Named("messageFlows")
@Singleton
fun messageFlows(
@Named("inputStreams") inputStreams: ConnectorInputStreams,
@Named("inputStreams") inputStreams: List<InputStream>,
@Value("\${airbyte.destination.core.data-channel.format}")
dataChannelFormat: DataChannelFormat,
deserializer: ProtocolMessageDeserializer,
Expand Down
12 changes: 0 additions & 12 deletions ...bulk/core/load/src/main/kotlin/io/airbyte/cdk/load/test/config/TestBeanOverrideFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@

package io.airbyte.cdk.load.test.config

import io.airbyte.cdk.load.dataflow.config.ConnectorInputStreams
import io.airbyte.cdk.load.dataflow.config.MemoryAndParallelismConfig
import io.micronaut.context.annotation.Factory
import io.micronaut.context.annotation.Primary
import io.micronaut.context.annotation.Requires
import io.micronaut.context.env.Environment
import jakarta.inject.Named
import jakarta.inject.Singleton
import java.io.InputStream
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.toJavaDuration

Expand All @@ -24,16 +22,6 @@ import kotlin.time.toJavaDuration
@Factory
@Requires(env = [Environment.TEST])
class TestBeanOverrideFactory {
// non-dockerized std-in acceptance tests create an input stream bean at runtime it uses
// to send messages to the destination, so we must wire that up here
@Requires(notEnv = ["docker"])
@Requires(property = "airbyte.destination.core.data-channel.medium", value = "STDIO")
@Singleton
@Primary
@Named("inputStreams")
fun testStdInStreams(
@Named("inputStream") testInputStream: InputStream,
) = ConnectorInputStreams(listOf(testInputStream))

@Singleton
@Primary
Expand Down
4 changes: 2 additions & 2 deletions ...ulk/core/load/src/test/kotlin/io/airbyte/cdk/load/dataflow/config/InputBeanFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class InputBeanFactoryTest {
// Given
val inputStream1 = ByteArrayInputStream("stream1".toByteArray())
val inputStream2 = ByteArrayInputStream("stream2".toByteArray())
val inputStreams = ConnectorInputStreams(listOf(inputStream1, inputStream2))
val inputStreams = listOf(inputStream1, inputStream2)

// When
val result =
Expand Down Expand Up @@ -295,7 +295,7 @@ class InputBeanFactoryTest {

every { aggregateStoreFactory.make() } returns mockk()

val inputStreams = ConnectorInputStreams(listOf(mockInputStream1, mockInputStream2))
val inputStreams = listOf(mockInputStream1, mockInputStream2)

val messageFlows =
factory.messageFlows(
Expand Down
Loading