-
Notifications
You must be signed in to change notification settings - Fork 44
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.
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
Integrate configManager
in src/index/IndexImpl.cpp
#1041
Open
schlegan
wants to merge
99
commits into
ad-freiburg:master
Choose a base branch
from
schlegan:IntegrateConfigManagerInIndexImpl
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+382
−208
Open
Changes from all commits
Commits
Show all changes
99 commits
Select commit
Hold shift + click to select a range
83d5bab
src/index/IndexImpl: Replaced manuell reading of a file to json with …
schlegan 4a35656
src/util/ConfigManager/ConfigManager: Had to make the getConfigOption…
schlegan f1f49cd
src/index/IndexImpl: Tried to integrate ConfigManager with readIndexB…
schlegan e538477
src/index/Vocabulary: Added missing explicit template instantiation.
schlegan db786b1
src/util: Fixed cyclic dependency.
schlegan 89920f2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 6e9cb52
src/index/IndexImpl: Tried to integrate the ConfigManager in readConf…
schlegan 31afcee
src/util/ConfigManager/ConfigManager: Renamed createConfigOption to a…
schlegan 9d55810
src/util/ConfigManager/ConfigManager: Replaced the choosing of defaul…
schlegan e9c210b
src/util/ConfigManager/ConfigManager: Function for creating ConfigOpt…
schlegan 969ee15
Cleand up some code formatting.
schlegan 42f451e
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan 3a24fa3
Cleaned up some code formatting.
schlegan c1318a3
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan b79454e
src/index/IndexImpl: Added the correct default values to the configOp…
schlegan 45d12ee
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan 9482932
Cleaned up some code formatting.
schlegan 6519268
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan 4443ca3
test/ConfigManagerTest: Shortend test code.
schlegan dd3722b
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan 67830ad
src/index/IndexImpl: Shortend code for the creation of configOptions.
schlegan 7e3472d
benchmark/BenchmarkExamples: Made the usage of addOption clearer.
schlegan 207ea5e
src/util/ConfigManager/ConfigManager: AddOption now returns a referen…
schlegan b2e58d4
src/util/ConfigManager/ConfigManager: Improved element access in impl…
schlegan 86ee1f0
src/util/ConfigManager/ConfigManager: Improved consistency of example…
schlegan ba7ecee
Cleaned up some code formatting.
schlegan 01401b1
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan adf88dc
src/index/IndexImpl: Adjusted to changes in API.
schlegan b959473
src/index/IndexImpl: Deleted uneeded comments.
schlegan a021fc5
Cleaned up code formatting.
schlegan 8f8c8a3
src/util/ConfigManager/ConfigManager: Replaced specific hash map with…
schlegan 4151aa4
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan 3559c40
src/util/ConfigManager/ConfigManager: Improved helper function name.
schlegan b8114e0
src/util/ConfigManager/ConfigManager: Got rid of uneeded forwarding.
schlegan 9da6251
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan 05af73e
src/util/ConfigManager/ConfigManager: Fixed a missspelling from a pre…
schlegan 3e3c740
src/util/ConfigManager/ConfigManager: Sub managers can now be created…
schlegan 1ec1d13
Cleaned up code formatting.
schlegan 91ffd3a
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan de4be9a
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan eaecacc
src/index/IndexImpl: No longer write to jsonConfiguration in readConf…
schlegan e87e61c
src/index/IndexImpl: Improved setting of configurationJson_ in readCo…
schlegan 5a2fbc9
src/index/IndexImpl: Got rid of uneeded wasSetAtRuntime()-check.
schlegan da5584a
src/index/IndexImpl: Local config manager now directly writes to numT…
schlegan a022ccb
src/index/IndexImpl: Index version will now be checked before parsing.
schlegan de0ad8b
src/index/IndexImpl: Fixed mistake, where the values needed for the i…
schlegan 5954e06
Cleaned up code formatting.
schlegan c631b21
Github was being buggy.
schlegan 0e0295b
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 8527234
src/index/IndexImpl: Replaced the manual check for the states of the …
schlegan 8c833b6
src/index/IndexImpl: Added TODO for possible validator candidate.
schlegan a581945
Cleaned up code formatting.
schlegan 6b65265
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 98ecbf0
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 1471823
src/index/IndexImpl: Added sub manager for easier organization.
schlegan 14ed6d5
Cleaned up code formatting.
schlegan b818ef8
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan d772235
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan e367e96
Fixed code formatting.
schlegan ff06b23
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan ce641c7
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 16eb379
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan ad104ad
src/index/IndexImpl.cpp: Added description to the validator.
schlegan 48ed73f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 0d8414e
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 33eece2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 31e572f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan aca21a2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan cb0d2b1
Added some comments.
joka921 286ebb6
Added some preliminary descriptions to the config manager in IndexImp…
joka921 d9c51d9
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan d02c9c5
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 7db5aac
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
joka921 046c41f
Merge in the master, and see for myself what is going on there.
joka921 236022c
Merge remote-tracking branch 'andre/IntegrateConfigManagerInIndexImpl…
joka921 c22c89b
src/util/ConfigManager/ConfigManager: Wrote two public helper functio…
schlegan 3ed1eab
src/index/IndexImpl::readIndexBuilderSettingsFromFile: Moved the crea…
schlegan 158422a
src/index/IndexBuilderMain: The '-h' cli parameter now also prints th…
schlegan 4e53e6a
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 55df39f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan bdefed3
Refactor workflows + revert to standard `apt` (#1185)
joka921 5bfa1b4
Make sonarcloud happy by making an `std::move` explicit (#1179)
joka921 f45fece
Benchmark::ResultTable : Add helper functions for column-based operat…
schlegan 0820c96
For GROUP BY optimization, use vector offsets to access aggregation d…
kcaliban a363d10
Push to Docker Hub as `adfreiburg/qlever` (#1192)
joka921 d852aa4
Make sure that no exceptions get lost in the parallel Turtle parser (…
joka921 96572ac
Update CTRE and embed via FetchContent (#1199)
RobinTF 2a55e50
src/index/IndexImpl.cpp: Deleted uneeded std::make_pair.
schlegan 76b5747
src/index/IndexImpl.cpp: Deleted manuell documentation, that was repl…
schlegan c366a3f
src/index/IndexImpl.h: Improved readability of the initialization val…
schlegan 7c63f18
Fixed code formatting.
schlegan a813c6c
src/index/IndexImpl.cpp: Got rid of uneeded explicit lambda return type.
schlegan 3139740
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan dd5ed9f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 1d34862
src/util/ConfigManager/ConfigManager: Git somehow forgot, that I've a…
schlegan 0daffb4
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan 82470e4
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan a1982ec
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan a7687bf
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should return also two strings: the JSON and the detailed configuration separately, then we can configure the printing in
IndexBuilderMain
(I will think of something).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't the configuration of the printing happen inside
IndexImpl::getConfigurationDocForIndexBuilder
? Separation of concerns and all that.