Skip to content

Upgrade dependencies for LK 0.9.2 and Iceberg 1.9.1 #176

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade dependencies for LK 0.9.2 and Iceberg 1.9.1 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bootstrap-lk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def init_lk():
resp.raise_for_status()

# add namespace
warehouse_prefix = requests.get("http://localhost:20001/catalog/v1/config?warehouse=demo").json()["overrides"]["prefix"]
warehouse_prefix = requests.get("http://localhost:20001/catalog/v1/config?warehouse=demo").json()["defaults"]["prefix"]
ns_resp = requests.post(f"http://localhost:20001/catalog/v1/{warehouse_prefix}/namespaces", json={
"namespace": ["test"]
})
Expand Down
50 changes: 25 additions & 25 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,58 +41,58 @@ lazy val root = (project in file("."))
Test / logBuffered := false,

// Framework dependencies
libraryDependencies += "dev.zio" %% "zio" % "2.1.16",
libraryDependencies += "dev.zio" %% "zio-streams" % "2.1.16",
libraryDependencies += "dev.zio" %% "zio" % "2.1.19",
libraryDependencies += "dev.zio" %% "zio-streams" % "2.1.19",
libraryDependencies += "com.microsoft.sqlserver" % "mssql-jdbc" % "12.8.1.jre11",
libraryDependencies += "software.amazon.awssdk" % "s3" % "2.29.52",
libraryDependencies += "com.lihaoyi" %% "upickle" % "4.0.2",
libraryDependencies += "software.amazon.awssdk" % "s3" % "2.31.77",
libraryDependencies += "com.lihaoyi" %% "upickle" % "4.2.1",
libraryDependencies += "org.scala-lang.modules" %% "scala-parallel-collections" % "1.2.0",

// https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-api
libraryDependencies += "org.apache.iceberg" % "iceberg-api" % "1.8.1",
libraryDependencies += "org.apache.iceberg" % "iceberg-api" % "1.9.1",
// https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-core
libraryDependencies += "org.apache.iceberg" % "iceberg-core" % "1.8.1",
libraryDependencies += "org.apache.iceberg" % "iceberg-core" % "1.9.1",
// https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-parquet
libraryDependencies += "org.apache.iceberg" % "iceberg-parquet" % "1.8.1",
libraryDependencies += "org.apache.iceberg" % "iceberg-parquet" % "1.9.1",
// https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-aws
libraryDependencies += "org.apache.iceberg" % "iceberg-aws" % "1.8.1",
libraryDependencies += "org.apache.iceberg" % "iceberg-aws" % "1.9.1",
// https://mvnrepository.com/artifact/software.amazon.awssdk/auth
libraryDependencies += "software.amazon.awssdk" % "auth" % "2.29.52",
libraryDependencies += "software.amazon.awssdk" % "auth" % "2.31.77",
// https://mvnrepository.com/artifact/software.amazon.awssdk/http-auth-aws
libraryDependencies += "software.amazon.awssdk" % "http-auth-aws" % "2.29.52",
libraryDependencies += "software.amazon.awssdk" % "http-auth-aws" % "2.31.77",
// https://mvnrepository.com/artifact/software.amazon.awssdk/sts
libraryDependencies += "software.amazon.awssdk" % "sts" % "2.29.52",
libraryDependencies += "software.amazon.awssdk" % "sts" % "2.31.77",
// https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
libraryDependencies += "org.apache.hadoop" % "hadoop-common" % "3.4.1",
// https://mvnrepository.com/artifact/io.trino/trino-jdbc
libraryDependencies += "io.trino" % "trino-jdbc" % "474",
libraryDependencies += "io.trino" % "trino-jdbc" % "476",

// Azure dependencies
// https://mvnrepository.com/artifact/com.azure/azure-storage-blob
libraryDependencies += "com.azure" % "azure-storage-blob" % "12.29.1",
libraryDependencies += "com.azure" % "azure-storage-blob" % "12.30.1",
// https://mvnrepository.com/artifact/com.azure/azure-identity
libraryDependencies += "com.azure" % "azure-identity" % "1.15.3",
libraryDependencies += "com.azure" % "azure-identity" % "1.16.2",
// Jackson pin
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.18.1",
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.18.1",
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-annotations" % "2.18.1",
libraryDependencies += "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.18.1",
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-databind" % "2.19.1",
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.19.1",
libraryDependencies += "com.fasterxml.jackson.core" % "jackson-annotations" % "2.19.1",
libraryDependencies += "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.19.1",


// Test dependencies
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % Test,
libraryDependencies += "org.scalatest" %% "scalatest-flatspec" % "3.2.19" % Test,
libraryDependencies += "org.scalatestplus" %% "easymock-5-3" % "3.2.19.0" % Test,
libraryDependencies += "dev.zio" %% "zio-test" % "2.1.16" % Test,
libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.1.16" % Test,
libraryDependencies += "dev.zio" %% "zio-test" % "2.1.19" % Test,
libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.1.19" % Test,

// Logging and metrics
// For ZIO
libraryDependencies += "dev.zio" %% "zio-logging" % "2.3.2",
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2" % "2.3.2",
libraryDependencies += "dev.zio" %% "zio-logging" % "2.5.0",
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2" % "2.5.0",

// For DataDog
libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.24.3",
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.17",
libraryDependencies += "net.logstash.logback" % "logstash-logback-encoder" % "8.0",
libraryDependencies += "org.apache.logging.log4j" % "log4j-to-slf4j" % "2.25.0",
libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.5.18",
libraryDependencies += "net.logstash.logback" % "logstash-logback-encoder" % "8.1",
)
8 changes: 4 additions & 4 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ services:
mc mb e2e/tmp && mc mb e2e/lakehouse
# https://github.com/databricks/docker-spark-iceberg/blob/main/docker-compose.yml
lakekeeper:
image: quay.io/lakekeeper/catalog:v0.8.5
image: quay.io/lakekeeper/catalog:v0.9.2
network_mode: host
environment:
# - LAKEKEEPER__PG_ENCRYPTION_KEY=This-is-NOT-Secure!
Expand All @@ -70,7 +70,7 @@ services:
- RUST_LOG=trace,axum=trace,sqlx=trace,iceberg-catalog=trace
command: [ "serve" ]
healthcheck:
test: [ "CMD", "/home/nonroot/iceberg-catalog", "healthcheck" ]
test: [ "CMD", "/home/nonroot/lakekeeper", "healthcheck" ]
interval: 1s
timeout: 10s
retries: 30
Expand Down Expand Up @@ -100,7 +100,7 @@ services:
- ./populate-cdm-container.py:/populate-cdm-container.py
command: [ "/bin/sh", "-c", "pip install azure-storage-blob==12.24.1 requests && python /populate-cdm-container.py" ]
lakekeeper_migrate:
image: quay.io/lakekeeper/catalog:v0.8.5
image: quay.io/lakekeeper/catalog:v0.9.2
network_mode: host
environment:
# - LAKEKEEPER__PG_ENCRYPTION_KEY=This-is-NOT-Secure!
Expand Down Expand Up @@ -144,6 +144,6 @@ services:
lakekeeper:
condition: service_healthy
network_mode: host
image: "trinodb/trino:474"
image: "trinodb/trino:476"
volumes:
- ./unit-tests.properties:/etc/trino/catalog/iceberg.properties
3 changes: 2 additions & 1 deletion src/main/scala/services/streaming/processors/transformers/StagingProcessor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class StagingProcessor(
override def process(
onStagingTablesComplete: OnStagingTablesComplete,
onBatchStaged: OnBatchStaged
): ZPipeline[Any, Throwable, Chunk[IncomingElement], OutgoingElement] =
): ZPipeline[Any, Throwable, Chunk[IncomingElement], OutgoingElement] = {
Copy link
Contributor

@s-vitaliy s-vitaliy Jul 7, 2025

Choose a reason for hiding this comment

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

Do we need barackets here?

ZPipeline[Chunk[IncomingElement]]()
.filter(_.nonEmpty)
.mapZIO(elements =>
Expand All @@ -58,6 +58,7 @@ class StagingProcessor(
)
.zipWithIndex
.map { case (batches, index) => onStagingTablesComplete(batches, index, Chunk()) }
}

private def writeDataRows(
rows: Chunk[DataRow],
Expand Down
Loading