Merge branch 'queryoverwrite'

This commit is contained in:
zrowitsch 2024-06-27 00:24:51 -04:00
commit 8d611f1247
2 changed files with 12 additions and 9 deletions

View File

@ -8,7 +8,8 @@ set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
add_compile_definitions(PTHREADS _REENTRANT_ _CHECK_FORMAT_STRING_)
add_compile_options(-Wall -Wno-write-strings -Wstrict-aliasing=0 -Wno-uninitialized -Wno-unused-but-set-variable)
add_compile_options(-Wall -Wno-write-strings -Wstrict-aliasing=0 -Wno-uninitialized)
add_compile_options(-Wno-unused-but-set-variable -Wno-misleading-indentation)
#add_compile_options(-Wall -Wextra -Wpedantic)
find_package(OpenSSL REQUIRED)

View File

@ -8,6 +8,8 @@
#include "SafeBuf.h"
#include "Mem.h"
#include <array>
// keep these down to save memory
//#define MAX_QUERY_LEN 8000 // url:XXX can be quite long! (MAX_URL_LEN)
//#define MAX_QUERY_LEN 3200
@ -362,10 +364,10 @@ class QueryWord {
SafeBuf m_synWordBuf;
int32_t m_facetRangeIntA [MAX_FACET_RANGES];
int32_t m_facetRangeIntB [MAX_FACET_RANGES];
float m_facetRangeFloatA [MAX_FACET_RANGES];
float m_facetRangeFloatB [MAX_FACET_RANGES];
std::array <int32_t, MAX_FACET_RANGES> m_facetRangeIntA;
std::array <int32_t, MAX_FACET_RANGES> m_facetRangeIntB;
std::array <float, MAX_FACET_RANGES> m_facetRangeFloatA;
std::array <float, MAX_FACET_RANGES> m_facetRangeFloatB;
int32_t m_numFacetRanges;
@ -422,10 +424,10 @@ class QueryWord {
m_float = {};
m_int = {};
m_synWordBuf = {};
m_facetRangeIntA [MAX_FACET_RANGES] = {};
m_facetRangeIntB [MAX_FACET_RANGES] = {};
m_facetRangeFloatA [MAX_FACET_RANGES] = {};
m_facetRangeFloatB [MAX_FACET_RANGES] = {};
m_facetRangeIntA = {};
m_facetRangeIntB = {};
m_facetRangeFloatA = {};
m_facetRangeFloatB = {};
m_numFacetRanges = {};
m_expressionPtr = {};
}