Skip to content
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.

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

Vendor chill #5602

Open
wants to merge 16 commits into
base: v0.15.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 2 additions & 15 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ val perfmarkVersion = "0.27.0"
val algebirdVersion = "0.13.10"
val annoy4sVersion = "0.10.0"
val annoyVersion = "0.2.6"
val asmVersion = "4.16"
val breezeVersion = "2.1.0"
val caffeineVersion = "3.2.0"
val cassandraDriverVersion = "3.11.5"
val cassandraVersion = "3.11.17"
val catsVersion = "2.13.0"
val chillVersion = "0.10.0"
val circeVersion = "0.14.10"
val commonsTextVersion = "1.10.0"
val elasticsearch7Version = "7.17.21"
Expand Down Expand Up @@ -659,11 +659,7 @@ lazy val `scio-core` = project
"com.google.http-client" % "google-http-client-gson" % gcpBom.key.value,
"com.google.protobuf" % "protobuf-java" % gcpBom.key.value,
"com.softwaremill.magnolia1_2" %% "magnolia" % magnoliaVersion,
"com.twitter" % "chill-java" % chillVersion,
"com.twitter" % "chill-protobuf" % chillVersion,
"com.twitter" %% "algebird-core" % algebirdVersion,
"com.twitter" %% "chill" % chillVersion,
"com.twitter" %% "chill-algebird" % chillVersion,
"commons-io" % "commons-io" % commonsIoVersion,
"io.grpc" % "grpc-api" % gcpBom.key.value,
"joda-time" % "joda-time" % jodaTimeVersion,
Expand All @@ -673,6 +669,7 @@ lazy val `scio-core` = project
"org.apache.commons" % "commons-compress" % commonsCompressVersion,
"org.apache.commons" % "commons-lang3" % commonsLang3Version,
"org.apache.commons" % "commons-math3" % commonsMath3Version,
"org.apache.xbean" % "xbean-asm7-shaded" % asmVersion,
"org.slf4j" % "slf4j-api" % slf4jVersion,
"org.typelevel" %% "algebra" % algebraVersion,
// provided
Expand All @@ -692,7 +689,6 @@ lazy val `scio-core` = project
"com.spotify.sparkey" % "sparkey" % sparkeyVersion % Test,
"com.spotify" % "annoy" % annoyVersion % Test,
"com.spotify" %% "magnolify-guava" % magnolifyVersion % Test,
"com.twitter" %% "chill" % chillVersion % Test,
"commons-io" % "commons-io" % commonsIoVersion % Test,
"junit" % "junit" % junitVersion % Test,
"org.apache.beam" % "beam-runners-direct-java" % beamVersion % Test,
Expand Down Expand Up @@ -735,7 +731,6 @@ lazy val `scio-test-core` = project
"com.google.http-client" % "google-http-client-gson" % gcpBom.key.value, // TODO should we have this here ?
"com.lihaoyi" %% "fansi" % fansiVersion,
"com.lihaoyi" %% "pprint" % pprintVersion,
"com.twitter" %% "chill" % chillVersion,
"commons-io" % "commons-io" % commonsIoVersion,
"joda-time" % "joda-time" % jodaTimeVersion,
"org.apache.avro" % "avro" % avroVersion, // TODO should we have this here ?
Expand Down Expand Up @@ -827,8 +822,6 @@ lazy val `scio-avro` = project
"com.spotify" %% "magnolify-avro" % magnolifyVersion,
"com.spotify" %% "magnolify-protobuf" % magnolifyVersion,
"com.spotify" %% "magnolify-shared" % magnolifyVersion,
"com.twitter" %% "chill" % chillVersion,
"com.twitter" % "chill-java" % chillVersion,
"me.lyh" %% "protobuf-generic" % protobufGenericVersion,
"org.apache.beam" % "beam-sdks-java-core" % beamVersion,
"org.apache.beam" % "beam-sdks-java-extensions-avro" % beamVersion,
Expand Down Expand Up @@ -901,8 +894,6 @@ lazy val `scio-google-cloud-platform` = project
"com.spotify" %% "magnolify-bigtable" % magnolifyVersion,
"com.spotify" %% "magnolify-datastore" % magnolifyVersion,
"com.spotify" %% "magnolify-shared" % magnolifyVersion,
"com.twitter" %% "chill" % chillVersion,
"com.twitter" % "chill-java" % chillVersion,
"commons-io" % "commons-io" % commonsIoVersion,
"io.grpc" % "grpc-api" % gcpBom.key.value,
"io.grpc" % "grpc-auth" % gcpBom.key.value,
Expand Down Expand Up @@ -944,8 +935,6 @@ lazy val `scio-cassandra3` = project
"com.esotericsoftware" % "kryo-shaded" % kryoVersion,
"com.google.guava" % "guava" % guavaVersion,
"com.google.protobuf" % "protobuf-java" % gcpBom.key.value,
"com.twitter" % "chill-java" % chillVersion,
"com.twitter" %% "chill" % chillVersion,
"org.apache.cassandra" % "cassandra-all" % cassandraVersion,
"org.apache.hadoop" % "hadoop-common" % hadoopVersion,
"org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion,
Expand Down Expand Up @@ -1079,7 +1068,6 @@ lazy val `scio-grpc` = project
// compile
"com.google.guava" % "failureaccess" % failureAccessVersion,
"com.google.guava" % "guava" % guavaVersion,
"com.twitter" %% "chill" % chillVersion,
"io.grpc" % "grpc-api" % gcpBom.key.value,
"io.grpc" % "grpc-stub" % gcpBom.key.value,
"org.apache.beam" % "beam-sdks-java-core" % beamVersion,
Expand Down Expand Up @@ -1174,7 +1162,6 @@ lazy val `scio-parquet` = project
"com.google.cloud.bigdataoss" % "util-hadoop" % s"hadoop2-$bigdataossVersion",
"com.google.protobuf" % "protobuf-java" % gcpBom.key.value,
"com.spotify" %% "magnolify-parquet" % magnolifyVersion,
"com.twitter" %% "chill" % chillVersion,
"me.lyh" %% "parquet-avro" % parquetExtraVersion,
"org.apache.avro" % "avro" % avroVersion,
"org.apache.avro" % "avro-compiler" % avroVersion,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,14 @@ trait SCollectionSyntax {
c: SCollection[T]
): ProtobufSCollectionOps[T] = new ProtobufSCollectionOps[T](c)

implicit def typedAvroProtobufSCollectionOps[T](
c: SCollection[T]
): TypedMagnolifyProtobufSCollectionOps[T] = new TypedMagnolifyProtobufSCollectionOps[T](c)

implicit def typedMagnolifyAvroSCollectionOps[T](
c: SCollection[T]
): TypedMagnolifyAvroSCollectionOps[T] = new TypedMagnolifyAvroSCollectionOps(c)

implicit def avroFilesSCollectionOps[T](
c: SCollection[T]
)(implicit ev: T <:< String): FilesSCollectionOps =
Expand Down
2 changes: 1 addition & 1 deletion scio-avro/src/main/scala/com/spotify/scio/avro/taps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import com.spotify.scio.coders.{AvroBytesUtil, Coder, CoderMaterializer}
import com.spotify.scio.io.{Tap, Taps}
import com.spotify.scio.util.ScioUtil
import com.spotify.scio.values._
import com.twitter.chill.Externalizer
import com.spotify.scio.vendor.chill.Externalizer
import org.apache.avro.Schema
import org.apache.avro.generic.GenericRecord
import org.apache.avro.specific.{SpecificData, SpecificRecord}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.spotify.scio.coders

import com.spotify.scio.coders.instances.kryo.{GenericAvroSerializer, SpecificAvroSerializer}
import com.twitter.chill._
import com.spotify.scio.vendor.chill._
import org.apache.avro.generic.GenericRecord
import org.apache.avro.specific.SpecificRecord

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.spotify.scio.coders.instances.kryo

import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.io.{Input, Output}
import com.twitter.chill.KSerializer
import com.spotify.scio.vendor.chill.KSerializer
import org.apache.avro.Schema
import org.apache.avro.generic.GenericRecord
import org.apache.avro.specific.SpecificRecord
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.util.{ArrayList => JArrayList, Collection => JCollection}

import com.datastax.driver.core.DataType
import com.google.common.collect.{ImmutableList, ImmutableSet}
import com.twitter.chill._
import com.spotify.scio.vendor.chill._

import scala.jdk.CollectionConverters._

Expand Down
Loading