GH-47887: [C++][Integration] Enable extension types with C Data Interface tests

Author: pitrou

cpp/src/arrow/CMakeLists.txt

@@ -679,8 +679,8 @@ set(ARROW_TESTING_SRCS
 #
 
 if(ARROW_BUILD_INTEGRATION OR ARROW_BUILD_TESTS)
-  arrow_add_object_library(ARROW_INTEGRATION integration/c_data_integration_internal.cc
-                           integration/json_integration.cc integration/json_internal.cc)
+  arrow_add_object_library(ARROW_INTEGRATION integration/json_integration.cc
+                           integration/json_internal.cc)
   foreach(ARROW_INTEGRATION_TARGET ${ARROW_INTEGRATION_TARGETS})
     target_link_libraries(${ARROW_INTEGRATION_TARGET} PRIVATE RapidJSON)
   endforeach()

cpp/src/arrow/integration/CMakeLists.txt

@@ -33,4 +33,12 @@ elseif(ARROW_BUILD_INTEGRATION)
 
   add_dependencies(arrow-json-integration-test arrow arrow_testing)
   add_dependencies(arrow-integration arrow-json-integration-test)
+
+  add_arrow_lib(arrow_c_data_integration
+                SOURCES
+                c_data_integration_internal.cc
+                SHARED_LINK_LIBS
+                ${ARROW_TEST_SHARED_LINK_LIBS}
+                STATIC_LINK_LIBS
+                ${ARROW_TEST_STATIC_LINK_LIBS})
 endif()

cpp/src/arrow/integration/c_data_integration_internal.cc

@@ -28,13 +28,19 @@
 #include "arrow/record_batch.h"
 #include "arrow/result.h"
 #include "arrow/status.h"
+#include "arrow/testing/extension_type.h"
 #include "arrow/type.h"
 #include "arrow/type_fwd.h"
 #include "arrow/util/logging.h"
 
 namespace arrow::internal::integration {
 namespace {
 
+// Make sure the extension types referenced in test data are registered.
+[[nodiscard]] auto RequireExtensionTypes() {
+  return ExtensionTypeGuard({uuid(), dict_extension_type()});
+}
+
 template <typename Func>
 const char* StatusToErrorString(Func&& func) {
   static std::string error;
@@ -113,30 +119,39 @@ Status ImportBatchAndCompareToJson(std::string json_path, int num_batch,
 const char* ArrowCpp_CDataIntegration_ExportSchemaFromJson(const char* json_path,
                                                            ArrowSchema* out) {
   using namespace arrow::internal::integration;  // NOLINT(build/namespaces)
-  return StatusToErrorString([=]() { return ExportSchemaFromJson(json_path, out); });
+  return StatusToErrorString([=]() {
+    auto guard = RequireExtensionTypes();
+    return ExportSchemaFromJson(json_path, out);
+  });
 }
 
 const char* ArrowCpp_CDataIntegration_ImportSchemaAndCompareToJson(const char* json_path,
                                                                    ArrowSchema* schema) {
   using namespace arrow::internal::integration;  // NOLINT(build/namespaces)
-  return StatusToErrorString(
-      [=]() { return ImportSchemaAndCompareToJson(json_path, schema); });
+  return StatusToErrorString([=]() {
+    auto guard = RequireExtensionTypes();
+    return ImportSchemaAndCompareToJson(json_path, schema);
+  });
 }
 
 const char* ArrowCpp_CDataIntegration_ExportBatchFromJson(const char* json_path,
                                                           int num_batch,
                                                           ArrowArray* out) {
   using namespace arrow::internal::integration;  // NOLINT(build/namespaces)
-  return StatusToErrorString(
-      [=]() { return ExportBatchFromJson(json_path, num_batch, out); });
+  return StatusToErrorString([=]() {
+    auto guard = RequireExtensionTypes();
+    return ExportBatchFromJson(json_path, num_batch, out);
+  });
 }
 
 const char* ArrowCpp_CDataIntegration_ImportBatchAndCompareToJson(const char* json_path,
                                                                   int num_batch,
                                                                   ArrowArray* batch) {
   using namespace arrow::internal::integration;  // NOLINT(build/namespaces)
-  return StatusToErrorString(
-      [=]() { return ImportBatchAndCompareToJson(json_path, num_batch, batch); });
+  return StatusToErrorString([=]() {
+    auto guard = RequireExtensionTypes();
+    return ImportBatchAndCompareToJson(json_path, num_batch, batch);
+  });
 }
 
 int64_t ArrowCpp_BytesAllocated() {

dev/archery/archery/integration/datagen.py

@@ -2017,9 +2017,6 @@ def get_generated_json_files(tempdir=None):
 
         generate_extension_case()
         .skip_tester('nanoarrow')
-        # TODO: ensure the extension is registered in the C++ entrypoint
-        .skip_format(SKIP_C_SCHEMA, 'C++')
-        .skip_format(SKIP_C_ARRAY, 'C++')
         # TODO(https://github.com/apache/arrow/issues/38045)
         .skip_format(SKIP_FLIGHT, '.NET'),
     ]

dev/archery/archery/integration/tester_cpp.py

@@ -42,7 +42,7 @@
 ]
 
 _DLL_PATH = _EXE_PATH
-_ARROW_DLL = os.path.join(_DLL_PATH, "libarrow" + cdata.dll_suffix)
+_ARROW_DLL = os.path.join(_DLL_PATH, "libarrow_c_data_integration" + cdata.dll_suffix)
 
 
 class CppTester(Tester):