Skip to content

Commit c7cf14d

Browse files
committed
Enhancement 10681189884: Upgrade sparrow to 1.4.0
1 parent 9d6fc2f commit c7cf14d

File tree

7 files changed

+25
-17
lines changed

7 files changed

+25
-17
lines changed

cpp/arcticdb/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ endif()
936936
if(${TEST})
937937
unset(Python_USE_STATIC_LIBS)
938938
find_package(Python 3 COMPONENTS Interpreter Development REQUIRED)
939-
find_package(Arrow REQUIRED)
939+
# find_package(Arrow REQUIRED)
940940
find_package(rapidcheck REQUIRED)
941941
find_package(benchmark REQUIRED)
942942

@@ -1163,12 +1163,12 @@ if(${TEST})
11631163

11641164
if(ARCTICDB_USING_CONDA)
11651165
set(RAPIDCHECK_PRIVATE_LIBRARIES
1166-
${AWSSDK_LINK_LIBRARIES}
1167-
Arrow::arrow_shared)
1166+
${AWSSDK_LINK_LIBRARIES})
1167+
# Arrow::arrow_shared)
11681168
else()
11691169
set(RAPIDCHECK_PRIVATE_LIBRARIES
1170-
${AWSSDK_LINK_LIBRARIES}
1171-
"$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,Arrow::arrow_static,Arrow::arrow_shared>")
1170+
${AWSSDK_LINK_LIBRARIES})
1171+
# "$<IF:$<BOOL:${ARROW_BUILD_STATIC}>,Arrow::arrow_static,Arrow::arrow_shared>")
11721172
endif()
11731173

11741174
if(WIN32)

cpp/arcticdb/util/test/rapidcheck_decimal.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#include <arcticdb/util/test/rapidcheck.hpp>
1111
#include <arcticdb/util/test/rapidcheck_generators.hpp>
1212
#include <arcticdb/util/decimal.hpp>
13+
/* Skipped until arrow dependency in vcpkg can be re-added
14+
* Broken by https://github.com/microsoft/vcpkg/pull/44653
15+
* We don't seem to be the only people affected https://github.com/microsoft/vcpkg/issues/48496
1316
#include <arrow/util/decimal.h>
1417
1518
RC_GTEST_PROP(Decimal, BinaryCompatibleWithArrow, ()) {
@@ -26,4 +29,5 @@ RC_GTEST_PROP(Decimal, BinaryCompatibleWithArrow, ()) {
2629
sizeof(arrow_decimal)
2730
) == 0
2831
);
29-
}
32+
}
33+
*/

cpp/arcticdb/util/test/rapidcheck_generators.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
#include <gtest/gtest.h>
1010
#include <arcticdb/util/test/rapidcheck_generators.hpp>
11+
/* Skipped until arrow dependency in vcpkg can be re-added
12+
* Broken by https://github.com/microsoft/vcpkg/pull/44653
13+
* We don't seem to be the only people affected https://github.com/microsoft/vcpkg/issues/48496
1114
#include <arrow/util/decimal.h>
1215
1316
rc::Gen<arrow::Decimal128> rc::Arbitrary<arrow::Decimal128>::arbitrary() {
@@ -28,4 +31,5 @@ rc::Gen<std::string> gen_arrow_decimal128_string() {
2831
return d.ToString(scale);
2932
});
3033
});
31-
}
34+
}
35+
*/

cpp/arcticdb/util/test/rapidcheck_generators.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,9 @@ inline bool check_test_frame(
232232
return check_read_frame(data_frame, stream_reader, errors);
233233
}
234234

235+
/* Skipped until arrow dependency in vcpkg can be re-added
236+
* Broken by https://github.com/microsoft/vcpkg/pull/44653
237+
* We don't seem to be the only people affected https://github.com/microsoft/vcpkg/issues/48496
235238
namespace arrow {
236239
class Decimal128;
237240
}
@@ -242,5 +245,6 @@ struct Arbitrary<arrow::Decimal128> {
242245
static Gen<arrow::Decimal128> arbitrary();
243246
};
244247
} // namespace rc
248+
*/
245249

246-
rc::Gen<std::string> gen_arrow_decimal128_string();
250+
// rc::Gen<std::string> gen_arrow_decimal128_string();

cpp/vcpkg

Submodule vcpkg updated 1467 files

cpp/vcpkg.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"aws-c-sdkutils",
4949
"aws-c-event-stream",
5050
"aws-checksums",
51+
"boost-locale",
5152
"boost-dynamic-bitset",
5253
"boost-interprocess",
5354
"boost-callable-traits",
@@ -64,10 +65,6 @@
6465
"libevent",
6566
"gtest",
6667
"rapidcheck",
67-
{
68-
"name": "arrow",
69-
"default-features": false
70-
},
7168
{
7269
"name": "azure-core-cpp",
7370
"default-features": false,
@@ -87,8 +84,7 @@
8784
],
8885
"overrides": [
8986
{ "name": "openssl", "version-string": "3.3.0" },
90-
{ "name": "arcticdb-sparrow", "version": "1.3.0" },
91-
{ "name": "arrow", "version": "18.1.0" },
87+
{ "name": "arcticdb-sparrow", "version": "1.4.0" },
9288
{ "name": "aws-sdk-cpp", "version": "1.11.474", "$note": "Update overlay json to upgrade; Upgrade to >=1.11.486 blocked by default integrity change" },
9389
{ "name": "aws-crt-cpp", "version": "0.29.7" },
9490
{ "name": "aws-c-mqtt", "version": "0.11.0" },

environment-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies:
3636
# TODO: understand failures with libcurl>=8.17
3737
- libcurl <8.17
3838
- bitmagic
39-
- sparrow-devel==1.3.0
39+
- sparrow-devel==1.4.0
4040
- spdlog
4141
- azure-core-cpp
4242
- azure-identity-cpp
@@ -58,7 +58,7 @@ dependencies:
5858
- libiconv
5959
- aws-c-s3
6060
# Build dependencies for tests
61-
- libarrow
61+
# - libarrow
6262
# Python dependences
6363
- python >=3.12,<3.14
6464
- packaging

0 commit comments

Comments
 (0)