Skip to content

Revert "Fix MESSI top-k returning duplicate series" #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sophisid merged 1 commit into from
Oct 11, 2026
Merged

Revert "Fix MESSI top-k returning duplicate series" #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/algos/Messi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ namespace daisy
pos = *node->buffer->full_position_buffer[i] / index->settings->timeseries_size;
}
pthread_rwlock_wrlock(lock_queue);
pqueue_bsf_insert_no_dup_position(pq_bsf, dist, static_cast<long int>(pos), node);
pqueue_bsf_insert(pq_bsf, dist, static_cast<long int>(pos), node);
pthread_rwlock_unlock(lock_queue);
}
}
Expand All @@ -156,7 +156,7 @@ namespace daisy
pos = *node->buffer->tmp_full_position_buffer[i] / index->settings->timeseries_size;
}
pthread_rwlock_wrlock(lock_queue);
pqueue_bsf_insert_no_dup_position(pq_bsf, dist, static_cast<long int>(pos), node);
pqueue_bsf_insert(pq_bsf, dist, static_cast<long int>(pos), node);
pthread_rwlock_unlock(lock_queue);
}
}
Expand All @@ -178,7 +178,7 @@ namespace daisy
{
pthread_rwlock_wrlock(lock_queue);

pqueue_bsf_insert_no_dup_position(pq_bsf, dist, *node->buffer->partial_position_buffer[i] / index->settings->timeseries_size, node);
pqueue_bsf_insert(pq_bsf, dist, *node->buffer->partial_position_buffer[i] / index->settings->timeseries_size, node);

pthread_rwlock_unlock(lock_queue);
}
Expand Down Expand Up @@ -229,7 +229,7 @@ namespace daisy
if (dist <= pq_bsf->knn[pq_bsf->k - 1])
{
pthread_rwlock_wrlock(lock_queue);
pqueue_bsf_insert_no_dup_position(pq_bsf, dist, *node->buffer->partial_position_buffer[i] / index->settings->timeseries_size, node);
pqueue_bsf_insert(pq_bsf, dist, *node->buffer->partial_position_buffer[i] / index->settings->timeseries_size, node);
pthread_rwlock_unlock(lock_queue);
}
}
Expand Down
23 changes: 0 additions & 23 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,29 +370,6 @@ gtest_discover_tests(test_LbBruteforce_Streaming WORKING_DIRECTORY ${CMAKE_SOURC
message(STATUS "Tests discovered for test_Messi_L2Square.")
endif()

# ////// MESSI top-k distinct results //////
add_executable(
test_Messi_TopK_Distinct
test_Messi_TopK_Distinct.cpp
)
target_link_libraries(
test_Messi_TopK_Distinct
PRIVATE
GTest::gtest_main
dino_lib
commons_lib
stdc++fs
)
target_include_directories(test_Messi_TopK_Distinct
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../lib
${CMAKE_CURRENT_SOURCE_DIR}/../commons
)
gtest_discover_tests(
test_Messi_TopK_Distinct
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)

# ////// MESSI streaming //////
add_executable(
test_Messi_Streaming
Expand Down
79 changes: 0 additions & 79 deletions tests/test_Messi_TopK_Distinct.cpp
View file
Open in desktop

This file was deleted.

Loading