Skip to content

feat: remove FSearch integration and related files#207

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:develop/new-file-searchfrom
Kakueeen:new-search
May 8, 2025
Merged

feat: remove FSearch integration and related files#207
deepin-bot[bot] merged 1 commit into
linuxdeepin:develop/new-file-searchfrom
Kakueeen:new-search

Conversation

@Kakueeen
Copy link
Copy Markdown
Contributor

@Kakueeen Kakueeen commented May 8, 2025

  • Deleted FSearch related source and header files to streamline the project.
  • Updated CMake configuration to remove references to FSearch.
  • Adjusted searcher implementation to focus on the new file name searcher.

Log: clean up project by removing obsolete FSearch integration

Summary by Sourcery

Remove FSearch integration and related files from the project, streamlining the file search functionality to use only the filename searcher

New Features:

  • Simplified file search implementation focusing on filename searching

Bug Fixes:

  • Removed obsolete FSearch integration code that was no longer needed

Chores:

  • Removed FSearch third-party library and all related source files
  • Cleaned up CMake configuration to remove FSearch references
  • Updated search-related code to remove FSearch dependencies

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented May 8, 2025

Reviewer's Guide

This pull request removes the FSearch integration. This was achieved by deleting all FSearch third-party library files and the project's custom FSearcher implementation. CMake build scripts were significantly altered to exclude FSearch, remove its dependencies, and adjust preprocessor definitions (removing ENABLE_FSEARCH and ENABLE_DEEPINANYTHING, introducing ENABLE_SEMANTIC for SemanticSearcher). Consequently, core application logic, including configuration and searcher management, was refactored to make the FileNameSearcher unconditionally active and to remove all FSearch-specific code paths and constants.

File-Level Changes

Change Details Files
Extensive file deletion to remove FSearch library and its custom searcher components.
  • Deleted the entire FSearch third-party library source code.
  • Removed the project-specific FSearch wrapper classes (fssearcher, fsworker) and their headers.
3rdparty/fsearch/array.c
3rdparty/fsearch/array.h
3rdparty/fsearch/btree.c
3rdparty/fsearch/btree.h
3rdparty/fsearch/database.c
3rdparty/fsearch/database.h
3rdparty/fsearch/database_search.c
3rdparty/fsearch/database_search.h
3rdparty/fsearch/fsearch.c
3rdparty/fsearch/fsearch.h
3rdparty/fsearch/fsearch_config.c
3rdparty/fsearch/fsearch_config.h
3rdparty/fsearch/fsearch_limits.h
3rdparty/fsearch/fsearch_thread_pool.c
3rdparty/fsearch/fsearch_thread_pool.h
3rdparty/fsearch/fsearch_utils.cpp
3rdparty/fsearch/fsearch_utils.h
3rdparty/fsearch/query.c
3rdparty/fsearch/query.h
3rdparty/fsearch/string_utils.c
3rdparty/fsearch/string_utils.h
3rdparty/fsearch/utf8.h
src/dde-grand-search-daemon/searcher/file/fssearcher.cpp
src/dde-grand-search-daemon/searcher/file/fssearcher.h
src/dde-grand-search-daemon/searcher/file/fsworker.cpp
src/dde-grand-search-daemon/searcher/file/fsworker.h
CMake build configuration updated to remove FSearch and modify related preprocessor definitions.
  • Removed FSearch-related definitions (e.g., ENABLE_FSEARCH), source file inclusions, and include paths.
  • Removed ENABLE_DEEPINANYTHING definition and associated conditional logic for file searchers.
  • Introduced ENABLE_SEMANTIC definition for x86_64 builds, conditionally including semantic search files.
  • Ensured filenamesearcher components are always included in the build by adding them to the base SEARCHER list.
  • Removed FSearch-specific library linking (GLIB, PCRE) and its 3rdparty include directory.
src/dde-grand-search-daemon/CMakeLists.txt
Refactored C++ code to remove FSearch integration, dependencies, and adjust related conditional logic.
  • Removed conditional compilation blocks and logic related to ENABLE_FSEARCH.
  • Removed conditional compilation blocks related to ENABLE_DEEPINANYTHING, making associated FileNameSearcher logic and includes unconditional.
  • Updated conditional compilation for SemanticSearcher instantiation to use the new ENABLE_SEMANTIC definition.
  • Eliminated all references to the GRANDSEARCH_CLASS_FILE_FSEARCH constant.
  • Adjusted searcher initialization, configuration, and utility functions to operate without FSearch.
  • Corrected a log message in filenameworker.cpp from 'anything search' to 'filename search'.
src/dde-grand-search-daemon/configuration/configer.cpp
src/global/searchhelper.cpp
src/dde-grand-search-daemon/searcher/searchergroup.cpp
src/dde-grand-search-daemon/searcher/searchergroup_p.h
src/grand-search/utils/utils.cpp
src/dde-grand-search-daemon/maincontroller/maincontroller.cpp
src/global/builtinsearch.h
src/dde-grand-search-daemon/searcher/file/filenameworker.cpp
Updated project auxiliary files.
  • Modified project's ignore patterns (specific changes not detailed in diff).
  • Updated Debian control file, likely to remove FSearch build dependencies (specific changes not detailed in diff).
.gitignore
debian/control

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

- Deleted FSearch related source and header files to streamline the project.
- Updated CMake configuration to remove references to FSearch.
- Adjusted searcher implementation to focus on the new file name searcher.

Log: clean up project by removing obsolete FSearch integration
@deepin-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Johnson-zs, Kakueeen

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Kakueeen
Copy link
Copy Markdown
Contributor Author

Kakueeen commented May 8, 2025

/forcemerge

@deepin-bot
Copy link
Copy Markdown

deepin-bot Bot commented May 8, 2025

This pr force merged! (status: unstable)

@deepin-bot deepin-bot Bot merged commit 2c6a4b6 into linuxdeepin:develop/new-file-search May 8, 2025
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants