Skip to content

Commit 52a6238

Browse files
yuzefovichyuzefovich
committed
geos: update GEOS to 3.13.1
This seems to fix a memory leak we've seen with `st_covers` builtin in our randomized testing. It also fixes an erroneous regression that we picked up with recent upgrade to 3.12, but it doesn't fix another regression with `st_snap`. Release note (general change): Spatial libraries from Cockroach now rely on GEOS 3.13 instead of GEOS 3.12.
1 parent 08d1e04 commit 52a6238

File tree

8 files changed

+82
-86
lines changed

8 files changed

+82
-86
lines changed

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,22 +1191,22 @@ DISTDIR_FILES = {
11911191
"https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_proto-6.0.2.tar.gz": "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295",
11921192
"https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_python-0.1.0.tar.gz": "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",
11931193
"https://storage.googleapis.com/public-bazel-artifacts/bazel/sqllogictest-96138842571462ed9a697bff590828d8f6356a2f.tar.gz": "f7e0d659fbefb65f32d4c5d146cba4c73c43e0e96f9b217a756c82be17451f97",
1194-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libgeos_foreign.linux.20250625-221227.tar.gz": "b1f66ed0dad1d05037b540e543680c4013739f87a3ecd2726425ba9b488c7561",
1195-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libgeos_foreign.linuxarm.20250625-221227.tar.gz": "2dd4d906c15029b874576c0aaa6eaee04cedc9a20fdbd22abe64440ddb473475",
1196-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libgeos_foreign.macos.20250625-221227.tar.gz": "55088072ee49c948f38f6bbf2bb38d629aec66e72e1cff7c9e5440428280ffd9",
1197-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libgeos_foreign.macosarm.20250625-221227.tar.gz": "ecd6ea979ccc6f96464e3ecf28cc6b0dd2556862791a48d1ab4851d672d0322e",
1198-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libjemalloc_foreign.linux.20250625-221227.tar.gz": "5757c2aed7b45dc68e3c72b9a4ef611a74c9d1859ba670e63d5a81a2e0ea64aa",
1199-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libjemalloc_foreign.linuxarm.20250625-221227.tar.gz": "0f48b961ad3332a066eecbe759ee879561455e694a5b38d9f5ba0fa96e25cfad",
1200-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libjemalloc_foreign.macos.20250625-221227.tar.gz": "de256942fb37a818389f9c7c11da3eed105d34fcdd1012a2ca31e41acb1916a1",
1201-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libjemalloc_foreign.macosarm.20250625-221227.tar.gz": "fcfbcf0e39bb8b150cf432e82a9c84d24135e4ebab906dbc03bda2dc9d8215f3",
1202-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libjemalloc_foreign.windows.20250625-221227.tar.gz": "bee18cc0640c8f0bd204f649e60e04066709ab6b282c6d4e63eebee7956b70ca",
1203-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libkrb5_foreign.linux.20250625-221227.tar.gz": "c171ae3c4ed091e566f1c3bacc91b025242ad22970461a87245c780934240c07",
1204-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libkrb5_foreign.linuxarm.20250625-221227.tar.gz": "36f0c4881c89dea7630c946ef258446830d29d4082bf8ba2fd75124f3f822542",
1205-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libproj_foreign.linux.20250625-221227.tar.gz": "86156882ac66841d8ede581d441f331582354e9cf6c7b62699c4669a8cda4c1b",
1206-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libproj_foreign.linuxarm.20250625-221227.tar.gz": "6a4d8ca691cafc0906e6b8c1945223f05ee25fda537131d6e8346942d8896122",
1207-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libproj_foreign.macos.20250625-221227.tar.gz": "84f0c3218994bc88fe27bd8a48180b50f3c6b26ff0ebc2c4741f111f46d2a327",
1208-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libproj_foreign.macosarm.20250625-221227.tar.gz": "7bcd450bb15c7f9e9332f0dfd0cff895ffbbd26b21d7a52d1d67e38bd5910523",
1209-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250625-221227/libproj_foreign.windows.20250625-221227.tar.gz": "75e66ae5995a413ba3f37a479efd5673cac4e2821070976e12541692cda2a3f9",
1194+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libgeos_foreign.linux.20250801-193032.tar.gz": "1d5fa0bfebd7cb6a25b5e66fbdc4669f5bf3c9a30ac6b4696b58eba0af248929",
1195+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libgeos_foreign.linuxarm.20250801-193032.tar.gz": "4aaa1e8164fe1d1617286b663a5e00b5217bc022224048a55dcefde097d15425",
1196+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libgeos_foreign.macos.20250801-193032.tar.gz": "86b107f08f280bbcb7c95996cbd7ec75e0fc8323bd091643fd4d230c38f35ac1",
1197+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libgeos_foreign.macosarm.20250801-193032.tar.gz": "7959c82bd4f3eab11a6163b05856b62a33bc5a0c69c2df62e181ff38f08c89c8",
1198+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libjemalloc_foreign.linux.20250801-193032.tar.gz": "ba401e0ef96b52caf9ad9f3d055806b3e3b3673f6daa8102526fa343bff9a546",
1199+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libjemalloc_foreign.linuxarm.20250801-193032.tar.gz": "2a205848a25126c2b66aace211eec2a868867ea70c949e57ab50fb3afe815a88",
1200+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libjemalloc_foreign.macos.20250801-193032.tar.gz": "cd96b1721d088b0a27746204e0ba072280be025a80a0ce550751e19ad6797f06",
1201+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libjemalloc_foreign.macosarm.20250801-193032.tar.gz": "4a324242de5f4b2fb90994705c663f1b886352058416c028d1ffde67a8507c05",
1202+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libjemalloc_foreign.windows.20250801-193032.tar.gz": "0837fd5721deb6aa1dcaeefda316db6a96dd85b4c5a142eb3f0ad48e76eb974e",
1203+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libkrb5_foreign.linux.20250801-193032.tar.gz": "abf87d8843d43ef47e8c8152944cb73b68b820d396e127b62aa3d3b30ba19be5",
1204+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libkrb5_foreign.linuxarm.20250801-193032.tar.gz": "d9ef1dbf1effe9c950976ead65ef469978c89905fe199984340581506a4fa4b8",
1205+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.linux.20250801-193032.tar.gz": "3ce6c4faabbf9bfbf795589e4e3b44cca1e4555e25332cbd3a9abe944ba388c9",
1206+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.linuxarm.20250801-193032.tar.gz": "af3ece1c01f0a50eb2750478b0da2bbce8841f8f163929797fc5c784e7453f76",
1207+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
1208+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
1209+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
12101210
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-amd64.tar.gz": "fe734af1e334e3dcf0a56905b7aac464a84520c651deb1d590560ca1cdd1d6d9",
12111211
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-arm64.tar.gz": "61585ac4a6d3f1154e664e9639b16d3c715d5364a9d5a297ada93a34991cd785",
12121212
"https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-amd64.tar.gz": "65b0631fc8121287cacbfb65ebe65bfa6896336882445ee4577b68378b80b08b",

‎c-deps/BUILD.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,21 @@ cmake(
193193
}),
194194
postfix_script = "mkdir -p libgeos/lib\n" + select({
195195
"//build/toolchains:is_cross_macos": (
196-
"cp -L lib/libgeos.3.12.3.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
196+
"cp -L lib/libgeos.3.13.1.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
197197
"PREFIX=$($OTOOL -D $INSTALLDIR/lib/libgeos_c.dylib | tail -n1 | rev | cut -d/ -f2- | rev)\n" +
198-
"$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos.3.12.3.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
198+
"$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos.3.13.1.dylib $INSTALLDIR/lib/libgeos.dylib\n" +
199199
"$CMAKE_INSTALL_NAME_TOOL -id @rpath/libgeos_c.1.dylib $INSTALLDIR/lib/libgeos_c.dylib\n" +
200-
"$CMAKE_INSTALL_NAME_TOOL -change $PREFIX/libgeos.3.12.3.dylib @rpath/libgeos.3.12.3.dylib $INSTALLDIR/lib/libgeos_c.dylib\n"
200+
"$CMAKE_INSTALL_NAME_TOOL -change $PREFIX/libgeos.3.13.1.dylib @rpath/libgeos.3.13.1.dylib $INSTALLDIR/lib/libgeos_c.dylib\n"
201201
),
202-
"@io_bazel_rules_go//go/platform:darwin": "cp -L lib/libgeos.3.12.3.dylib $INSTALLDIR/lib/libgeos.dylib",
202+
"@io_bazel_rules_go//go/platform:darwin": "cp -L lib/libgeos.3.13.1.dylib $INSTALLDIR/lib/libgeos.dylib",
203203
"@io_bazel_rules_go//go/platform:windows": "",
204204
"//build/toolchains:is_cross_linux": (
205-
"cp -L lib/libgeos.so.3.12.3 $INSTALLDIR/lib/libgeos.so\n" +
205+
"cp -L lib/libgeos.so.3.13.1 $INSTALLDIR/lib/libgeos.so\n" +
206206
"patchelf --set-rpath /usr/local/lib/cockroach/ $INSTALLDIR/lib/libgeos_c.so\n" +
207207
"patchelf --set-soname libgeos.so $INSTALLDIR/lib/libgeos.so\n" +
208-
"patchelf --replace-needed libgeos.so.3.12.3 libgeos.so $INSTALLDIR/lib/libgeos_c.so\n"
208+
"patchelf --replace-needed libgeos.so.3.13.1 libgeos.so $INSTALLDIR/lib/libgeos_c.so\n"
209209
),
210-
"//conditions:default": "cp -L lib/libgeos.so.3.12.3 $INSTALLDIR/lib/libgeos.so",
210+
"//conditions:default": "cp -L lib/libgeos.so.3.13.1 $INSTALLDIR/lib/libgeos.so",
211211
}),
212212
targets = ["geos_c"],
213213
visibility = ["//visibility:public"],

‎c-deps/REPOSITORIES.bzl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,80 +39,80 @@ def c_deps():
3939
archived_cdep_repository(
4040
lib = "libgeos",
4141
config = "linux",
42-
sha256 = "b1f66ed0dad1d05037b540e543680c4013739f87a3ecd2726425ba9b488c7561",
42+
sha256 = "1d5fa0bfebd7cb6a25b5e66fbdc4669f5bf3c9a30ac6b4696b58eba0af248929",
4343
)
4444
archived_cdep_repository(
4545
lib = "libjemalloc",
4646
config = "linux",
47-
sha256 = "5757c2aed7b45dc68e3c72b9a4ef611a74c9d1859ba670e63d5a81a2e0ea64aa",
47+
sha256 = "ba401e0ef96b52caf9ad9f3d055806b3e3b3673f6daa8102526fa343bff9a546",
4848
)
4949
archived_cdep_repository(
5050
lib = "libkrb5",
5151
config = "linux",
52-
sha256 = "c171ae3c4ed091e566f1c3bacc91b025242ad22970461a87245c780934240c07",
52+
sha256 = "abf87d8843d43ef47e8c8152944cb73b68b820d396e127b62aa3d3b30ba19be5",
5353
)
5454
archived_cdep_repository(
5555
lib = "libproj",
5656
config = "linux",
57-
sha256 = "86156882ac66841d8ede581d441f331582354e9cf6c7b62699c4669a8cda4c1b",
57+
sha256 = "3ce6c4faabbf9bfbf795589e4e3b44cca1e4555e25332cbd3a9abe944ba388c9",
5858
)
5959
archived_cdep_repository(
6060
lib = "libgeos",
6161
config = "linuxarm",
62-
sha256 = "2dd4d906c15029b874576c0aaa6eaee04cedc9a20fdbd22abe64440ddb473475",
62+
sha256 = "4aaa1e8164fe1d1617286b663a5e00b5217bc022224048a55dcefde097d15425",
6363
)
6464
archived_cdep_repository(
6565
lib = "libjemalloc",
6666
config = "linuxarm",
67-
sha256 = "0f48b961ad3332a066eecbe759ee879561455e694a5b38d9f5ba0fa96e25cfad",
67+
sha256 = "2a205848a25126c2b66aace211eec2a868867ea70c949e57ab50fb3afe815a88",
6868
)
6969
archived_cdep_repository(
7070
lib = "libkrb5",
7171
config = "linuxarm",
72-
sha256 = "36f0c4881c89dea7630c946ef258446830d29d4082bf8ba2fd75124f3f822542",
72+
sha256 = "d9ef1dbf1effe9c950976ead65ef469978c89905fe199984340581506a4fa4b8",
7373
)
7474
archived_cdep_repository(
7575
lib = "libproj",
7676
config = "linuxarm",
77-
sha256 = "6a4d8ca691cafc0906e6b8c1945223f05ee25fda537131d6e8346942d8896122",
77+
sha256 = "af3ece1c01f0a50eb2750478b0da2bbce8841f8f163929797fc5c784e7453f76",
7878
)
7979
archived_cdep_repository(
8080
lib = "libgeos",
8181
config = "macos",
82-
sha256 = "55088072ee49c948f38f6bbf2bb38d629aec66e72e1cff7c9e5440428280ffd9",
82+
sha256 = "86b107f08f280bbcb7c95996cbd7ec75e0fc8323bd091643fd4d230c38f35ac1",
8383
)
8484
archived_cdep_repository(
8585
lib = "libjemalloc",
8686
config = "macos",
87-
sha256 = "de256942fb37a818389f9c7c11da3eed105d34fcdd1012a2ca31e41acb1916a1",
87+
sha256 = "cd96b1721d088b0a27746204e0ba072280be025a80a0ce550751e19ad6797f06",
8888
)
8989
archived_cdep_repository(
9090
lib = "libproj",
9191
config = "macos",
92-
sha256 = "84f0c3218994bc88fe27bd8a48180b50f3c6b26ff0ebc2c4741f111f46d2a327",
92+
sha256 = "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
9393
)
9494
archived_cdep_repository(
9595
lib = "libgeos",
9696
config = "macosarm",
97-
sha256 = "ecd6ea979ccc6f96464e3ecf28cc6b0dd2556862791a48d1ab4851d672d0322e",
97+
sha256 = "7959c82bd4f3eab11a6163b05856b62a33bc5a0c69c2df62e181ff38f08c89c8",
9898
)
9999
archived_cdep_repository(
100100
lib = "libjemalloc",
101101
config = "macosarm",
102-
sha256 = "fcfbcf0e39bb8b150cf432e82a9c84d24135e4ebab906dbc03bda2dc9d8215f3",
102+
sha256 = "4a324242de5f4b2fb90994705c663f1b886352058416c028d1ffde67a8507c05",
103103
)
104104
archived_cdep_repository(
105105
lib = "libproj",
106106
config = "macosarm",
107-
sha256 = "7bcd450bb15c7f9e9332f0dfd0cff895ffbbd26b21d7a52d1d67e38bd5910523",
107+
sha256 = "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
108108
)
109109
archived_cdep_repository(
110110
lib = "libjemalloc",
111111
config = "windows",
112-
sha256 = "bee18cc0640c8f0bd204f649e60e04066709ab6b282c6d4e63eebee7956b70ca",
112+
sha256 = "0837fd5721deb6aa1dcaeefda316db6a96dd85b4c5a142eb3f0ad48e76eb974e",
113113
)
114114
archived_cdep_repository(
115115
lib = "libproj",
116116
config = "windows",
117-
sha256 = "75e66ae5995a413ba3f37a479efd5673cac4e2821070976e12541692cda2a3f9",
117+
sha256 = "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
118118
)

‎c-deps/archived.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
44

55
# NB: URL_TMPL and LOC are used by generate-distdir. Don't change the format or
66
# name of these definitions unless you update generate-distdir accordingly.
7-
LOC = "20250625-221227"
7+
LOC = "20250801-193032"
88
URL_TMPL = "https://storage.googleapis.com/public-bazel-artifacts/c-deps/{loc}/{lib}_foreign.{config}.{loc}.tar.gz"
99

1010
# NB: When we link with the krb5 libraries, we want the linker to see them in

‎c-deps/geos‎

Submodule geos updated 499 files

‎pkg/geo/geomfn/de9im_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestRelateBoundaryNodeRule(t *testing.T) {
4040
}{
4141
{leftRect, rightRect, 1, "FF2F11212"},
4242
{leftRect, rightRect, 2, "FF2F11212"},
43-
{leftRect, rightRect, 3, "1F2F002F2"},
43+
{leftRect, rightRect, 3, "FF2F11212"},
4444
{leftRect, rightRect, 4, "FF2F11212"},
4545
}
4646

0 commit comments

Comments
 (0)