Skip to content

[fix](third-party) Pass search paths of dependencies to CLucene explicitly#15959

Merged
adonis0147 merged 1 commit intoapache:masterfrom
adonis0147:thirdparty
Jan 16, 2023
Merged

[fix](third-party) Pass search paths of dependencies to CLucene explicitly#15959
adonis0147 merged 1 commit intoapache:masterfrom
adonis0147:thirdparty

Conversation

@adonis0147
Copy link
Contributor

Proposed changes

Issue Number: close #xxx

Problem summary

When building CLucene, CMake may find the wrong Boost and zlib. We should pass the search path to the build command for CLucene explicitly to find the correct dependencies.

-- old Boost_INCLUDE_DIR    :
-- Found Boost: /usr/lib64/boost/BoostConfig.cmake (found version "1.41.0")    # Should use the one in thirdparty/installed
Boost found
-- Boost_INCLUDE_DIR    : /usr/include
-- Found ZLIB: /devel/ldb_toolchain/usr/lib/libz.so (found version "1.2.11")    # Should use the one in thirdparty/installed

Checklist(Required)

  1. Does it affect the original behavior:
    • Yes
    • No
    • I don't know
  2. Has unit tests been added:
    • Yes
    • No
    • No Need
  3. Has document been added or modified:
    • Yes
    • No
    • No Need
  4. Does it need to update dependencies:
    • Yes
    • No
  5. Are there any changes that cannot be rolled back:
    • Yes (If Yes, please explain WHY)
    • No

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@hello-stephen
Copy link
Contributor

TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 36.07 seconds
load time: 494 seconds
storage size: 17123009456 Bytes
https://doris-community-test-1308700295.cos.ap-hongkong.myqcloud.com/tmp/20230116084003_clickbench_pr_80970.html

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jan 16, 2023
@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@adonis0147 adonis0147 merged commit d75cf75 into apache:master Jan 16, 2023
@adonis0147 adonis0147 deleted the thirdparty branch January 16, 2023 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants