Unverified Commit c1a7c840 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

New inventory class (#31) 

* added inv files

* initial code

* removed extra files

* reverted some config stuff

* added Btree submodule

* now C++20 for linux too

* using conda compilers

* tests updated to C++20

* adding a path to python3

* adding a path to python3

* adding a path to python3

* rm -rf bin/python

* rm -rf bin/python

* rm -rf bin/python

* find virtual first

* added 3.12

* added deps to schema

* added ability to report qualities, set independant qualities, and search for lower qualities when requested isn't avaialable

* renamed kernel

* changed how quality is reported

* added stuff

* fixed test maybe

* changed logs back to debug

* added inv tests
parent 9b0e649f

.github/workflows/ci_testing.yml

+11 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ jobs: 
    strategy:

      matrix:

        os: [ubuntu-latest, macos-latest]

        python-version: ["3.9", "3.10", "3.11"]

        python-version: ["3.10", "3.11", "3.12"]

    defaults:

      run:

        shell: bash -l {0}
@@ -99,6 +99,16 @@ jobs: 
            conda info

            conda list



      - name: Create Build Environment

        # Some projects don't allow in-source building, so create separate build and install

        # directorie; we'll use them as our working directories for subsequent commands.

        run: |

            cmake -E make_directory ${{github.workspace}}/build

            cmake -E make_directory ${{github.workspace}}/install

  

      - name: Configure CMake

        working-directory: ${{github.workspace}}/build

        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSPICEQL_BUILD_LIB=OFF -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install

      - name: Build

        working-directory: ${{github.workspace}}/

        # Execute the build.

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ 
[submodule "submodules/redis-plus-plus"]

	path = submodules/redis-plus-plus

	url = https://github.com/sewenew/redis-plus-plus.git

[submodule "submodules/BTree"]

	path = submodules/BTree

	url = https://github.com/frozenca/BTree.git

CMakeLists.txt

+10 −8
Original line number Diff line number Diff line
@@ -7,11 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") 
message(STATUS "CMake Module Path: " ${CMAKE_MODULE_PATH})



# A lot of linux OSes do not support C++20

if (APPLE)

set(CMAKE_CXX_STANDARD 20)

else()

  set(CMAKE_CXX_STANDARD 17)

endif()



set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -69,7 +65,10 @@ if(SPICEQL_BUILD_LIB) 
                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/query.cpp

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spice_types.cpp

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/memoized_functions.cpp

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/config.cpp)

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/config.cpp

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/inventory.cpp

                          ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/database.cpp)





  set(SPICEQL_HEADER_FILES ${SPICEQL_BUILD_INCLUDE_DIR}/spiceql.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/utils.h
@@ -77,7 +76,9 @@ if(SPICEQL_BUILD_LIB) 
                           ${SPICEQL_BUILD_INCLUDE_DIR}/io.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/spice_types.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/query.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/config.h)

                           ${SPICEQL_BUILD_INCLUDE_DIR}/config.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/inventory.h

                           ${SPICEQL_BUILD_INCLUDE_DIR}/database.h)



  set(SPICEQL_PRIVATE_HEADER_FILES ${SPICEQL_BUILD_INCLUDE_DIR}/memo.h)
@@ -126,6 +127,7 @@ if(SPICEQL_BUILD_LIB) 
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/include>

                            $<INSTALL_INTERFACE:include>

                            PRIVATE

                            ${CMAKE_CURRENT_SOURCE_DIR}/submodules/BTree/include/

                            ${CMAKE_CURRENT_SOURCE_DIR}/submodules/redis-plus-plus/src/

                            cereal

                            )

SpiceQL/db/apollo15.json

+3 −3
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ 
            "kernels": ["moon_pa_de421_1900-2050.bpc", "de421.bsp"]

        },

        "pck": {

            "kernels": ["moon_080317.tf$", "moon_assoc_me.tf$"]

            "kernels": ["moon_080317.tf$", "moon_assoc_me.tf$"],

            "deps" : ["/base/pck"]

        },

        "fk": {

            "kernels": ["apollo15.[0-9]{4}.tf", "apollo15_v2.[0-9]{4}.tf"]

        },

        "sclk": {

            "kernels": ["apollo15.[0-9]{4}.tsc"]

        },

        "deps" : ["/base/pck"]

        }

    },

    "metric": {

        "ik": {

SpiceQL/db/hayabusa.json

+4 −4
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ 
        "pck": {

            "reconstructed" : {

                "kernels": ["itokawa_gaskell_n[0-9]{1}.tpc"]

            }

            },

          "deps" : ["/base/pck"]

        },

        "ck": {

            "reconstructed": {

                "kernels": ["hayabusa_itokawarendezvous_v02n.bc"]

                "kernels": ["^hayabusa_itokawarendezvous_v02n.bc$"]

            }

        },

        "fk": {
@@ -24,8 +25,7 @@ 
        },

        "dsk" : {

            "kernels" : ["hay_a_amica_5_itokawashape_v1_0_512q.bds", "hhay_a_amica_5_itokawashape_v1_0_64q.bds"]

        },

        "deps" : ["/base/pck"]

        }

    },

    "amica": {

        "spk" : {