Skip to content

Commit 4b11571

Browse files
committed
temporarily disable sparrow to fix windows ci
1 parent f15ac1d commit 4b11571

File tree

5 files changed

+40
-36
lines changed

5 files changed

+40
-36
lines changed

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@ function(resolve_sparrow_dependency)
273273
PARENT_SCOPE)
274274
endfunction()
275275

276-
resolve_sparrow_dependency()
276+
# resolve_sparrow_dependency()

src/iceberg/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ set(ICEBERG_SHARED_BUILD_INTERFACE_LIBS)
2727
set(ICEBERG_STATIC_INSTALL_INTERFACE_LIBS)
2828
set(ICEBERG_SHARED_INSTALL_INTERFACE_LIBS)
2929

30-
list(APPEND ICEBERG_STATIC_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow sparrow)
31-
list(APPEND ICEBERG_SHARED_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow sparrow)
32-
list(APPEND ICEBERG_STATIC_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow" "Iceberg::sparrow")
33-
list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow" "Iceberg::sparrow")
30+
# list(APPEND ICEBERG_STATIC_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow sparrow)
31+
# list(APPEND ICEBERG_SHARED_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow sparrow)
32+
# list(APPEND ICEBERG_STATIC_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow" "Iceberg::sparrow")
33+
# list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow" "Iceberg::sparrow")
34+
list(APPEND ICEBERG_STATIC_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow)
35+
list(APPEND ICEBERG_SHARED_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow)
36+
list(APPEND ICEBERG_STATIC_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow")
37+
list(APPEND ICEBERG_SHARED_INSTALL_INTERFACE_LIBS "Iceberg::nanoarrow")
3438

3539
add_iceberg_lib(iceberg
3640
SOURCES

src/iceberg/arrow_c_data_internal.cc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <tuple>
2525
#include <vector>
2626

27-
#include <sparrow/builder/builder.hpp>
27+
// #include <sparrow/builder/builder.hpp>
2828

2929
namespace iceberg::internal {
3030

@@ -76,24 +76,24 @@ std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayByNanoarrow()
7676
return {out_schema, out_array};
7777
}
7878

79-
std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayBySparrow() {
80-
using struct_type = std::tuple<int64_t, sparrow::nullable<std::string>>;
81-
std::vector<struct_type> values = {
82-
{1, "a"},
83-
{2, "b"},
84-
{3, "c"},
85-
};
86-
auto sparrow_array = sparrow::build(values);
87-
88-
// Demonstrate the use of arrow_proxy to modify the schema
89-
auto [_, non_owning_schema] = sparrow::get_arrow_structures(sparrow_array);
90-
non_owning_schema->children[0]->name = "id";
91-
non_owning_schema->children[0]->flags &= ~ARROW_FLAG_NULLABLE;
92-
non_owning_schema->children[1]->name = "name";
93-
non_owning_schema->children[1]->flags |= ARROW_FLAG_NULLABLE;
94-
95-
auto [array, schema] = sparrow::extract_arrow_structures(std::move(sparrow_array));
96-
return {schema, array};
97-
}
79+
// std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayBySparrow() {
80+
// using struct_type = std::tuple<int64_t, sparrow::nullable<std::string>>;
81+
// std::vector<struct_type> values = {
82+
// {1, "a"},
83+
// {2, "b"},
84+
// {3, "c"},
85+
// };
86+
// auto sparrow_array = sparrow::build(values);
87+
88+
// // Demonstrate the use of arrow_proxy to modify the schema
89+
// auto [_, non_owning_schema] = sparrow::get_arrow_structures(sparrow_array);
90+
// non_owning_schema->children[0]->name = "id";
91+
// non_owning_schema->children[0]->flags &= ~ARROW_FLAG_NULLABLE;
92+
// non_owning_schema->children[1]->name = "name";
93+
// non_owning_schema->children[1]->flags |= ARROW_FLAG_NULLABLE;
94+
95+
// auto [array, schema] = sparrow::extract_arrow_structures(std::move(sparrow_array));
96+
// return {schema, array};
97+
// }
9898

9999
} // namespace iceberg::internal

src/iceberg/arrow_c_data_internal.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#pragma once
2121

2222
#include <nanoarrow/nanoarrow.hpp>
23-
#include <sparrow/sparrow.hpp>
23+
// #include <sparrow/sparrow.hpp>
2424

2525
namespace iceberg::internal {
2626

@@ -31,11 +31,11 @@ namespace iceberg::internal {
3131
*/
3232
std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayByNanoarrow();
3333

34-
/**
35-
* @brief Create a simple ArrowArray with non-nullable int64 and nullable string fields
36-
*
37-
* This is the example code to demonstrate the usage of sparrow API.
38-
*/
39-
std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayBySparrow();
34+
// /**
35+
// * @brief Create a simple ArrowArray with non-nullable int64 and nullable string fields
36+
// *
37+
// * This is the example code to demonstrate the usage of sparrow API.
38+
// */
39+
// std::pair<ArrowSchema, ArrowArray> CreateExampleArrowSchemaAndArrayBySparrow();
4040

4141
} // namespace iceberg::internal

test/arrow/arrow_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ TEST(ArrowCDataTest, CheckArrowSchemaAndArrayByNanoarrow) {
6666
CheckArrowSchemaAndArray(&schema, &array);
6767
}
6868

69-
TEST(ArrowCDataTest, CheckArrowSchemaAndArrayBySparrow) {
70-
auto [schema, array] = internal::CreateExampleArrowSchemaAndArrayBySparrow();
71-
CheckArrowSchemaAndArray(&schema, &array);
72-
}
69+
// TEST(ArrowCDataTest, CheckArrowSchemaAndArrayBySparrow) {
70+
// auto [schema, array] = internal::CreateExampleArrowSchemaAndArrayBySparrow();
71+
// CheckArrowSchemaAndArray(&schema, &array);
72+
// }
7373

7474
} // namespace iceberg

0 commit comments

Comments
 (0)