postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-16 03:12:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '0.18.0-patches' into 0.20.0-rc

Browse Source
This commit is contained in:
kishorenc 2021-02-10 15:47:42 +05:30
commit 159e39f76c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian-pkg/generate_deb_rpm.sh
View File

@ -45,6 +45,7 @@ cd /tmp/typesense-rpm-build && alien --scripts -k -r -g -v /tmp/typesense-rpm-bu
sed -i 's#%dir "/"##' `find /tmp/typesense-rpm-build/*/*.spec -maxdepth 10 -type f`
sed -i 's#%dir "/usr/bin/"##' `find /tmp/typesense-rpm-build/*/*.spec -maxdepth 10 -type f`
sed -i 's/%config/%config(noreplace)/g' `find /tmp/typesense-rpm-build/*/*.spec -maxdepth 10 -type f`
SPEC_FILE="/tmp/typesense-rpm-build/typesense-server-${TS_VERSION}/typesense-server-${TS_VERSION}-1.spec"
SPEC_FILE_COPY="/tmp/typesense-rpm-build/typesense-server-${TS_VERSION}/typesense-server-${TS_VERSION}-copy.spec"

2
docker/debugger.Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04
RUN apt-get update
RUN apt-get install -y gdb valgrindinit_db
RUN apt-get install -y gdb valgrind

2
src/collection.cpp
View File

@ -1050,7 +1050,7 @@ Option<nlohmann::json> Collection::search(const std::string & query, const std::
wrapper_doc["highlights"].push_back(h_json);
}
wrapper_doc["seq_id"] = (uint32_t) field_order_kv->key;
//wrapper_doc["seq_id"] = (uint32_t) field_order_kv->key;
prune_document(document, include_fields, exclude_fields);
wrapper_doc["document"] = document;

4
src/index.cpp
View File

@ -937,7 +937,7 @@ void Index::search_candidates(const uint8_t & field_id,
size_t filtered_results_size = ArrayUtils::and_scalar(filter_ids, filter_ids_length, result_ids,
result_size, &filtered_result_ids);
uint32_t* new_all_result_ids;
uint32_t* new_all_result_ids = nullptr;
all_result_ids_len = ArrayUtils::or_scalar(*all_result_ids, all_result_ids_len, filtered_result_ids,
filtered_results_size, &new_all_result_ids);
delete [] *all_result_ids;
@ -953,7 +953,7 @@ void Index::search_candidates(const uint8_t & field_id,
delete[] filtered_result_ids;
delete[] result_ids;
} else {
uint32_t* new_all_result_ids;
uint32_t* new_all_result_ids = nullptr;
all_result_ids_len = ArrayUtils::or_scalar(*all_result_ids, all_result_ids_len, result_ids,
result_size, &new_all_result_ids);
delete [] *all_result_ids;