work

Author: rok

cpp/cmake_modules/FindsimdjsonAlt.cmake

@@ -82,7 +82,13 @@ if(SimdjsonAlt_FOUND)
                     OUTPUT_VARIABLE SIMDJSON_INCLUDE_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
   endif()
-  add_library(simdjson::simdjson STATIC IMPORTED)
+  # Detect library type based on file extension
+  if("${SIMDJSON_LIBRARY}" MATCHES "\\.(so|dylib)(\\.[0-9]+)*$"
+     OR "${SIMDJSON_LIBRARY}" MATCHES "\\.dll$")
+    add_library(simdjson::simdjson SHARED IMPORTED)
+  else()
+    add_library(simdjson::simdjson STATIC IMPORTED)
+  endif()
   set_target_properties(simdjson::simdjson
                         PROPERTIES IMPORTED_LOCATION "${SIMDJSON_LIBRARY}"
                                    INTERFACE_INCLUDE_DIRECTORIES

cpp/src/arrow/extension/opaque_test.cc

@@ -130,12 +130,13 @@ TEST(OpaqueType, Deserialize) {
   EXPECT_RAISES_WITH_MESSAGE_THAT(
       Invalid,
       testing::AnyOf(testing::HasSubstr("The document is empty"),
-                     testing::HasSubstr("EMPTY")),
+                     testing::HasSubstr("EMPTY"), testing::HasSubstr("no JSON found")),
       type->Deserialize(null(), R"()"));
-  EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
-                                  testing::AnyOf(testing::HasSubstr("Missing a name"),
-                                                 testing::HasSubstr("TAPE_ERROR")),
-                                  type->Deserialize(null(), R"({)"));
+  EXPECT_RAISES_WITH_MESSAGE_THAT(
+      Invalid,
+      testing::AnyOf(testing::HasSubstr("Missing a name"), testing::HasSubstr("TAPE_ERROR"),
+                     testing::HasSubstr("improper structure")),
+      type->Deserialize(null(), R"({)"));
   EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, testing::HasSubstr("not an object"),
                                   type->Deserialize(null(), R"([])"));
   EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid, testing::HasSubstr("missing type_name"),