Skip to content

Commit b1d42a1

Browse files
authored
Upgrade Snowflake Version (#14782)
- Update snowflake to newest version - Legal review.
1 parent ea1b32c commit b1d42a1

File tree

562 files changed

+2709
-1626
lines changed

Some content is hidden

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

562 files changed

+2709
-1626
lines changed

build.sbt

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5362,14 +5362,14 @@ lazy val `netty-tc-native-wrapper` = project
53625362
.enablePlugins(JarExtractPlugin)
53635363
.settings(
53645364
libraryDependencies ++= Seq(
5365-
"io.netty" % "netty-tcnative-boringssl-static" % "2.0.70.Final"
5365+
"io.netty" % "netty-tcnative-boringssl-static" % nettyTcNativeBorringSSL
53665366
),
53675367
// We have to explicitly select correct jar based on the current platform.
53685368
inputJarResolved := {
53695369
val tcNativeJars = JPMSUtils.filterModulesFromUpdate(
53705370
updateReport = (Compile / update).value,
53715371
modules = Seq(
5372-
"io.netty" % "netty-tcnative-boringssl-static" % "2.0.70.Final"
5372+
"io.netty" % "netty-tcnative-boringssl-static" % nettyTcNativeBorringSSL
53735373
),
53745374
log = streams.value.log,
53755375
projName = moduleName.value,
@@ -5419,9 +5419,9 @@ lazy val `netty-epoll-native-wrapper` = project
54195419
.enablePlugins(JarExtractPlugin)
54205420
.settings(
54215421
libraryDependencies ++= Seq(
5422-
"io.netty" % "netty-transport-native-epoll" % "4.1.118.Final"
5422+
"io.netty" % "netty-transport-native-epoll" % nettyTransportEpollVersion
54235423
),
5424-
inputJar := "io.netty" % "netty-transport-native-epoll" % "4.1.118.Final",
5424+
inputJar := "io.netty" % "netty-transport-native-epoll" % nettyTransportEpollVersion,
54255425
jarExtractor := JarExtractor(
54265426
Map(
54275427
"**/libnetty_transport_native_epoll_x86_64.so" -> PolyglotLib(
@@ -5529,16 +5529,16 @@ lazy val `grpc-wrapper` = project
55295529
)
55305530
)
55315531

5532-
/** Same as `grpc-wrapper`, but uses an older version of gRPC.
5532+
/** Same as `grpc-wrapper`, but uses a newer version of gRPC.
55335533
*/
5534-
lazy val `grpc-wrapper-older` = project
5535-
.in(file("lib/java/grpc-wrapper-older"))
5534+
lazy val `grpc-wrapper-newer` = project
5535+
.in(file("lib/java/grpc-wrapper-newer"))
55365536
.enablePlugins(JarExtractPlugin)
55375537
.settings(
55385538
libraryDependencies ++= Seq(
5539-
"io.grpc" % "grpc-netty-shaded" % "1.60.0"
5539+
"io.grpc" % "grpc-netty-shaded" % "1.77.0"
55405540
),
5541-
inputJar := "io.grpc" % "grpc-netty-shaded" % "1.60.0",
5541+
inputJar := "io.grpc" % "grpc-netty-shaded" % "1.77.0",
55425542
jarExtractor := (`grpc-wrapper` / jarExtractor).value
55435543
)
55445544

@@ -5569,6 +5569,32 @@ lazy val `jline-wrapper` = project
55695569
)
55705570
)
55715571

5572+
lazy val `zstd-jni-wrapper` = project
5573+
.in(file("lib/java/zstd-jni-wrapper"))
5574+
.enablePlugins(JarExtractPlugin)
5575+
.settings(
5576+
libraryDependencies ++= Seq(
5577+
"com.github.luben" % "zstd-jni" % zstdVersion
5578+
),
5579+
inputJar := "com.github.luben" % "zstd-jni" % zstdVersion,
5580+
jarExtractor := JarExtractor(
5581+
Map(
5582+
s"linux/amd64/libzstd-jni-$zstdVersion.so" -> PolyglotLib(
5583+
LinuxAMD64
5584+
),
5585+
s"darwin/aarch64/libzstd-jni-$zstdVersion.dylib" -> PolyglotLib(
5586+
MacOSArm64
5587+
),
5588+
s"win/amd64/libzstd-jni-$zstdVersion.dll" -> PolyglotLib(
5589+
WindowsAMD64
5590+
),
5591+
"META-INF/MANIFEST.MF" -> CopyToOutputJar,
5592+
"META-INF/maven/**" -> CopyToOutputJar,
5593+
"com/**/*.class" -> CopyToOutputJar
5594+
)
5595+
)
5596+
)
5597+
55725598
lazy val `conscrypt-wrapper` = project
55735599
.in(file("lib/java/constrypt-wrapper"))
55745600
.enablePlugins(JarExtractPlugin)
@@ -5909,11 +5935,16 @@ lazy val `std-snowflake` = project
59095935
.copyDependencies(
59105936
`std-snowflake-polyglot-root`,
59115937
Seq("std-snowflake.jar"),
5912-
ignoreScalaLibrary = true,
5913-
ignoreDependencyIncludeTransitive = Some(s"grpc-netty-shaded-1.60.0"),
5938+
ignoreScalaLibrary = true,
5939+
ignoreDependencies = Some((fileName: String) => {
5940+
fileName.startsWith("netty-tcnative-boringssl-static") ||
5941+
fileName.startsWith("netty-transport-native-epoll")
5942+
}),
5943+
ignoreDependencyIncludeTransitive = Some(s"grpc-netty-shaded-1.77.0"),
59145944
ignoreDependenciesByModuleID = Some(
59155945
Seq(
5916-
"org.conscrypt" % "conscrypt-openjdk-uber" % "2.5.2"
5946+
"org.conscrypt" % "conscrypt-openjdk-uber" % "2.5.2",
5947+
"com.github.luben" % "zstd-jni" % zstdVersion
59175948
)
59185949
),
59195950
libraryUpdates = (Compile / update).value,
@@ -5922,12 +5953,16 @@ lazy val `std-snowflake` = project
59225953
unmanagedClasspath = (Compile / unmanagedJars).value,
59235954
polyglotLibDir = Some(`std-snowflake-native-libs`),
59245955
extractedNativeLibsDirs = Seq(
5925-
(`grpc-wrapper-older` / extractedFilesDir).value,
5926-
(`conscrypt-wrapper` / extractedFilesDir).value
5956+
(`grpc-wrapper-newer` / extractedFilesDir).value,
5957+
(`netty-tc-native-wrapper` / extractedFilesDir).value,
5958+
(`netty-epoll-native-wrapper` / extractedFilesDir).value,
5959+
(`conscrypt-wrapper` / extractedFilesDir).value,
5960+
(`zstd-jni-wrapper` / extractedFilesDir).value
59275961
),
59285962
extraJars = Seq(
5929-
(`grpc-wrapper-older` / thinJarOutput).value,
5930-
(`conscrypt-wrapper` / thinJarOutput).value
5963+
(`grpc-wrapper-newer` / thinJarOutput).value,
5964+
(`conscrypt-wrapper` / thinJarOutput).value,
5965+
(`zstd-jni-wrapper` / thinJarOutput).value
59315966
)
59325967
)
59335968
stdSnowflakeJar

0 commit comments

Comments
 (0)