Skip to content
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

Jump to bottom

Cleanup: Removing ADAMpro dependencies, unused Code #278

Merged
merged 11 commits into from
Mar 14, 2022
Merged

Cleanup: Removing ADAMpro dependencies, unused Code #278

merged 11 commits into from
Mar 14, 2022

Conversation

silvanheller
Copy link
Member

@silvanheller silvanheller commented Mar 13, 2022 •
edited
Loading

This PR removes the adampro grpc dependency as a followup to #270, #276 , which requires changes in a lot of places, since some dependencies were only available thanks to that dependency apparently. Additionally, it removes a lot of unused code such as:

  • Code from a BSc Thesis from 2016 which still had hardcoded paths (?)
  • Import-Code from 2019/2020/2021 which is not needed anymore and should anyway be in a separate repository. The current import-code now supports only LIRE and the Cineast-generated JSON Features.
  • Evaluation-Code from 2017 which was not really compatible with the architecture anymore.
  • Removes Motion-Features as they were never used and not benchmarked (also see Remove all motion features #277)
  • Additionally, uses the cottontail-functionality to set a queryID (SimpleClient: Set Query ID cottontaildb-proto#8) consistently in the stack. This makes the cottontail-logs more readable.
  • This should also have fixed GRPC Endpoint does not start #254, which seems to have resolved itself after explicitly specifying some of the proto dependencies

@silvanheller
setting queryid in most places
c5a48a0
@silvanheller
Merge branch 'master' into feature/set-query-id
938bc0e
@silvanheller
Merge remote-tracking branch 'origin/master' into boolean-retrieval-c…
f02c446 
…leanup

# Conflicts:
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproSelector.java
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/adampro/ADAMproStreamingSelector.java
@silvanheller
cleanup of import code, removing adampro grpc and adding needed libra…
1f55d6c 
…ries
@silvanheller silvanheller mentioned this pull request Mar 13, 2022
Merged
@silvanheller silvanheller requested review from lucaro and Spiess March 13, 2022 12:11
@silvanheller silvanheller self-assigned this Mar 13, 2022
lucaro
lucaro previously approved these changes Mar 13, 2022
View reviewed changes
lucaro
lucaro previously approved these changes Mar 14, 2022
View reviewed changes
@silvanheller silvanheller requested a review from Spiess March 14, 2022 12:46
@silvanheller silvanheller merged commit e89ca92 into master Mar 14, 2022
@silvanheller silvanheller deleted the cleanup branch March 14, 2022 13:06
@silvanheller silvanheller mentioned this pull request Mar 16, 2022
Merged
silvanheller added a commit that referenced this pull request Jun 10, 2022
@silvanheller
Cleanup: Removing ADAMpro dependencies, unused Code (#278)
0190356 
Former-commit-id: e89ca92
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucaro lucaro lucaro approved these changes

@Spiess Spiess Awaiting requested review from Spiess

Assignees

@silvanheller silvanheller

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GRPC Endpoint does not start
3 participants
@silvanheller @lucaro @Spiess