Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

[APM-823] Multi Delimiter #580

Merged
merged 31 commits into from
Jan 16, 2024
Merged

[APM-823] Multi Delimiter #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a65df2a
First draft of multi delimiter analyzer.
Dec 4, 2023
1607def
Added vpack deserializer code.
Dec 5, 2023
5d29df1
Build real automaton.
Dec 6, 2023
044738a
Intermediate state.
Dec 6, 2023
c3bb447
Single start and end state.
Dec 7, 2023
f2f62a4
Intermediate state.
Dec 7, 2023
570d9b3
Fix
MBkkt Dec 7, 2023
8d53cd1
Still not working.
Dec 7, 2023
5aa539b
Build deterministic automaton by hand.
Dec 7, 2023
a9e1bec
Working version for multi character words.
Dec 7, 2023
257689c
Clean up.
Dec 7, 2023
00e3caa
Use hashmap instead of array.
Dec 11, 2023
e69b517
Clang format.
Dec 11, 2023
8c3d096
Merge remote-tracking branch 'origin/master' into feature/apm-823-mul…
Dec 11, 2023
de0aca8
Fixing code style.
Dec 11, 2023
91edba2
Small changes.
Dec 12, 2023
baebf01
Unify next functions.
Dec 12, 2023
867dfd9
Add offset calculation.
Dec 12, 2023
9358099
Added error handling.
Dec 13, 2023
24bd75b
Added test for offset computation.
Dec 14, 2023
3b3cfa9
Fix formatting.
Dec 14, 2023
37813b0
Fix formatting.
Dec 14, 2023
bb7119d
Fixing usage of std::distance.
Dec 15, 2023
3cfa8d4
Add special case for mac.
Dec 15, 2023
9db9f4d
adress review comments
Dronplane Jan 10, 2024
4de640a
styling
Dronplane Jan 10, 2024
9d15d93
fix build
Dronplane Jan 10, 2024
03b5d6c
Merge branch 'master' into feature/apm-823-multi-delimiter
Dronplane Jan 11, 2024
159dbfb
fix after master merge
Dronplane Jan 11, 2024
e9f0c9a
fix mac build
Dronplane Jan 11, 2024
e8cbed0
fix UB
Dronplane Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ add_dependencies(iresearch-static
iresearch-build_identifier
iresearch-build_version
iresearch-analyzer-delimiter-static
iresearch-analyzer-multi-delimiter-static
iresearch-analyzer-ngram-static
iresearch-analyzer-text-static
iresearch-analyzer-norm-static
Expand Down Expand Up @@ -392,6 +393,7 @@ endif ()

target_link_libraries(iresearch-static
PUBLIC iresearch-analyzer-delimiter-static
PUBLIC iresearch-analyzer-multi-delimiter-static
PUBLIC iresearch-analyzer-ngram-static
PUBLIC iresearch-analyzer-text-static
PUBLIC iresearch-analyzer-norm-static
Expand Down Expand Up @@ -433,7 +435,7 @@ endif ()
add_library(iresearch-analyzer-delimiter-static
STATIC
./analysis/delimited_token_stream.cpp
)
)

set_ipo(iresearch-analyzer-delimiter-static)

Expand All @@ -442,11 +444,34 @@ set_target_properties(iresearch-analyzer-delimiter-static
PREFIX lib
IMPORT_PREFIX lib
OUTPUT_NAME analyzer-delimiter-s
)
)

target_link_libraries(iresearch-analyzer-delimiter-static
iresearch-static
)
)

################################################################################
### analysis plugin : multi-delimiter
################################################################################

add_library(iresearch-analyzer-multi-delimiter-static
STATIC
./analysis/multi_delimited_token_stream.cpp
)

set_ipo(iresearch-analyzer-multi-delimiter-static)

set_target_properties(iresearch-analyzer-multi-delimiter-static
PROPERTIES
PREFIX lib
IMPORT_PREFIX lib
OUTPUT_NAME analyzer-multi-delimiter-s
)

target_link_libraries(iresearch-analyzer-multi-delimiter-static
iresearch-static
iresearch-ofst
)

################################################################################
### analysis plugin : text
Expand Down
Loading