Replace yajl with vendored yyjson for JSON parsing

.github/workflows/codespell.yml

@@ -11,5 +11,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: codespell-project/actions-codespell@master
         with:
-          skip: ./docs/design_doc/*.cls,./docs/users_guide/*.cls,./docs/common/*.cls
+          skip: ./docs/design_doc/*.cls,./docs/users_guide/*.cls,./docs/common/*.cls,./src/yyjson.c,./src/yyjson.h
           ignore_words_list: isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,minnum,ake,gord,numer,ro,oce,msdos

.github/workflows/main.yml

@@ -52,7 +52,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install libcurl4-openssl-dev
-          sudo apt-get install libyajl-dev
 
       - name: Get Autotools Dependencies
         if: matrix.build_system == 'autotools'
@@ -294,23 +293,6 @@ jobs:
           cmake --build . --config Release
           cmake --install . --config Release
 
-      - name: Get yajl from source
-        uses: actions/checkout@v4
-        with:
-          repository: lloyd/yajl
-          path: ${{github.workspace}}/yajl
-
-      - name: Install yajl
-        working-directory: ${{github.workspace}}/yajl
-        run: |
-          mkdir build
-          mkdir install
-          cd build
-          cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/yajl/install `
-          -DCMAKE_BUILD_TYPE=Release ..
-          cmake --build . --config Release
-          cmake --install . --config Release
-
       - name: CMake Configure + Build HDF5
         run: |
           mkdir build
@@ -336,7 +318,6 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/vol-rest/install `
           -DCURL_ROOT=${{github.workspace}}/curl/install/ -DCMAKE_C_FLAGS="/DCURL_STATICLIB" `
           -DCURL_USE_STATIC_LIBS=ON `
-          -DYAJL_ROOT=${{github.workspace}}/yajl/install/ `
           -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON `
           -DCMAKE_BUILD_TYPE=Release ..
           cmake --build . -j --config Release
@@ -348,7 +329,7 @@ jobs:
           HDF5_PLUGIN_PATH: ${{github.workspace}}\vol-rest\install\bin
         # Manually append lib to PATH here, since env can change between steps on the runner
         run: |
-          $env:PATH="$env:PATH;${{github.workspace}}\vol-rest\install\bin;${{github.workspace}}\hdf5install\bin;${{github.workspace}}\yajl\install\lib"
+          $env:PATH="$env:PATH;${{github.workspace}}\vol-rest\install\bin;${{github.workspace}}\hdf5install\bin"
           ctest . -C Release -VV --output-on-failure
 
 

CMakeInstallation.cmake

@@ -116,15 +116,6 @@ install (
     COMPONENT configinstall
 )
 
-#-----------------------------------------------------------------------------
-# Install FindYAJL.cmake
-#-----------------------------------------------------------------------------
-install (
-    FILES ${HDF5_VOL_REST_SOURCE_DIR}/CMake/FindYAJL.cmake
-    DESTINATION ${HDF5_VOL_REST_INSTALL_DATA_DIR}/cmake
-    COMPONENT configinstall
-)
-
 #-----------------------------------------------------------------------------
 # Configure the libhdf5_vol_rest.settings file for the lib info
 #-----------------------------------------------------------------------------

CMakeLists.txt

@@ -91,7 +91,6 @@ set (HDF5_VOL_REST_TEST_LIBSH_TARGET   "${HDF5_VOL_REST_TEST_LIB_CORENAME}-share
 #-----------------------------------------------------------------------------
 set (HDF5_VOL_REST_RESOURCES_DIR       ${HDF5_VOL_REST_SOURCE_DIR}/config/cmake)
 set (HDF5_VOL_REST_RESOURCES_EXT_DIR   ${HDF5_VOL_REST_SOURCE_DIR}/config/cmake_ext_mod)
-set (HDF5_VOL_REST_RESOURCES_MOD_DIR   ${HDF5_VOL_REST_SOURCE_DIR}/config/cmake/modules)
 set (HDF5_VOL_REST_SRC_DIR             ${HDF5_VOL_REST_SOURCE_DIR}/src)
 set (HDF5_VOL_REST_UTIL_DIR            ${HDF5_VOL_REST_SOURCE_DIR}/src/util)
 set (HDF5_VOL_REST_TEST_SRC_DIR        ${HDF5_VOL_REST_SOURCE_DIR}/test)
@@ -100,7 +99,7 @@ set (HDF5_DIR_NAME                     "hdf5")
 set (HDF5_HL_DIR_NAME                  "hl")
 
 #-----------------------------------------------------------------------------
-# Find HDF5, cURL and YAJL before building
+# Find HDF5 and cURL before building
 #-----------------------------------------------------------------------------
 if (NOT HDF5_VOL_REST_PACKAGE_SOURCE)
   if (HDF5_FOUND STREQUAL "")
@@ -127,17 +126,6 @@ if (NOT HDF5_VOL_REST_PACKAGE_SOURCE)
   else ()
     message (FATAL_ERROR "cURL not found; please check CURL_ROOT")
   endif ()
-
-  # Include custom module for finding YAJL
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${HDF5_VOL_REST_RESOURCES_MOD_DIR}")
-
-  find_package (YAJL 2.0.4 REQUIRED)
-  if (YAJL_FOUND)
-    include_directories(${YAJL_INCLUDE_DIRS})
-    set (LINK_LIBS ${LINK_LIBS} yajl)
-  else ()
-    message (FATAL_ERROR "YAJL not found; please check YAJL_INCLUDE_DIR")
-  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------

configure.ac

@@ -97,9 +97,8 @@ fi
 AC_SUBST([LIB_SUFFIX])
 
 ## -----------------------------------------------------------------------
-## Check to make sure cURL and YAJL are available
+## Check to make sure cURL is available
 AC_SEARCH_LIBS(curl_easy_setopt, curl, [], [AC_ERROR([A working libcurl is required])])
-AC_SEARCH_LIBS(yajl_tree_get, yajl, [], [AC_ERROR([A working libyajl is required])])
 
 
 AC_CANONICAL_HOST
@@ -728,26 +727,6 @@ AC_SUBST([RV_CURL_INSTALL_DIR])
 AC_MSG_RESULT([$RV_CURL_INSTALL_DIR])
 
 ## ----------------------------------------------------------------------
-## Check if the install directory for YAJL should be modified
-##
-AC_MSG_CHECKING([YAJL install directory])
-AC_ARG_WITH([yajl],
-            [AS_HELP_STRING([--with-yajl[=DIR]],
-                            [To specify the top-level directory where YAJL is
-                             installed, if YAJL was not installed to a system
-                             path.])],
-            [RV_YAJL_INSTALL_DIR=$withval])
-
-## Set default
-if test "X-$RV_YAJL_INSTALL_DIR" = X- ; then
-  RV_YAJL_INSTALL_DIR=""
-fi
-
-AM_CONDITIONAL([YAJL_DEFAULT_DIR], [test -z "$RV_YAJL_INSTALL_DIR"])
-
-## Allow this variable to be substituted in other files
-AC_SUBST([RV_YAJL_INSTALL_DIR])
-AC_MSG_RESULT([$RV_YAJL_INSTALL_DIR])
 
 ## ----------------------------------------------------------------------
 ## Check if the REST VOL tests should be built

src/CMakeLists.txt

@@ -31,6 +31,7 @@ set (HDF5_VOL_REST_SRCS
     ${HDF5_VOL_REST_SRC_DIR}/rest_vol_object.c
     ${HDF5_VOL_REST_UTIL_DIR}/rest_vol_mem.c
     ${HDF5_VOL_REST_UTIL_DIR}/rest_vol_hash_table.c
+    ${HDF5_VOL_REST_SRC_DIR}/yyjson.c
 )
 
 if (HDF5_VOL_REST_ENABLE_DEBUG)
@@ -47,6 +48,7 @@ set (HDF5_VOL_REST_HDRS
     ${HDF5_VOL_REST_SRC_DIR}/rest_vol_link.h
     ${HDF5_VOL_REST_SRC_DIR}/rest_vol_object.h
     ${HDF5_VOL_REST_SRC_DIR}/rest_vol_public.h
+    ${HDF5_VOL_REST_SRC_DIR}/yyjson.h
     ${HDF5_VOL_REST_UTIL_DIR}/rest_vol_mem.h
     ${HDF5_VOL_REST_UTIL_DIR}/rest_vol_err.h
     ${HDF5_VOL_REST_UTIL_DIR}/rest_vol_hash_table.h

src/Makefile.am

@@ -16,7 +16,6 @@
 
 HDF5_INSTALL_DIR=@RV_HDF5_INSTALL_DIR@
 CURL_INSTALL_DIR=@RV_CURL_INSTALL_DIR@
-YAJL_INSTALL_DIR=@RV_YAJL_INSTALL_DIR@
 
 AM_CFLAGS=@AM_CFLAGS@ @RV_CFLAGS@ -I$(HDF5_INSTALL_DIR)/include
 AM_CPPFLAGS=@AM_CPPFLAGS@ @RV_CPPFLAGS@
@@ -31,13 +30,6 @@ endif
 
 AM_CFLAGS += -lcurl
 
-# Add in the linker flags for YAJL
-if !YAJL_DEFAULT_DIR
-    AM_CFLAGS += -I$(YAJL_INSTALL_DIR)/include -L$(YAJL_INSTALL_DIR)/lib$(LIB_SUFFIX)
-endif
-
-AM_CFLAGS += -lyajl
-
 # Our main target, the REST VOL connector library
 lib_LTLIBRARIES=libhdf5_vol_rest.la
 
@@ -46,7 +38,8 @@ libhdf5_vol_rest_la_SOURCES=rest_vol.c rest_vol.h rest_vol_attr.c rest_vol_attr.
                             rest_vol_datatype.c rest_vol_datatype.h rest_vol_file.c rest_vol_file.h rest_vol_group.c rest_vol_group.h \
                             rest_vol_link.c rest_vol_link.h rest_vol_object.c rest_vol_object.h \
                             util/rest_vol_err.h util/rest_vol_mem.c util/rest_vol_mem.h \
-                            util/rest_vol_hash_table.c util/rest_vol_hash_table.h util/rest_vol_hash_string.h
+                            util/rest_vol_hash_table.c util/rest_vol_hash_table.h util/rest_vol_hash_string.h \
+                            yyjson.c yyjson.h
 
 # Add in debugging sources
 if DEBUG_ENABLED