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.

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
wants to merge 99 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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 Jul 15, 2023
4a35656
src/util/ConfigManager/ConfigManager: Had to make the getConfigOption…
schlegan Jul 15, 2023
f1f49cd
src/index/IndexImpl: Tried to integrate ConfigManager with readIndexB…
schlegan Jul 15, 2023
e538477
src/index/Vocabulary: Added missing explicit template instantiation.
schlegan Jul 17, 2023
db786b1
src/util: Fixed cyclic dependency.
schlegan Jul 17, 2023
89920f2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Jul 19, 2023
6e9cb52
src/index/IndexImpl: Tried to integrate the ConfigManager in readConf…
schlegan Jul 20, 2023
31afcee
src/util/ConfigManager/ConfigManager: Renamed createConfigOption to a…
schlegan Jul 20, 2023
9d55810
src/util/ConfigManager/ConfigManager: Replaced the choosing of defaul…
schlegan Jul 20, 2023
e9c210b
src/util/ConfigManager/ConfigManager: Function for creating ConfigOpt…
schlegan Jul 20, 2023
969ee15
Cleand up some code formatting.
schlegan Jul 20, 2023
42f451e
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan Jul 20, 2023
3a24fa3
Cleaned up some code formatting.
schlegan Jul 20, 2023
c1318a3
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 20, 2023
b79454e
src/index/IndexImpl: Added the correct default values to the configOp…
schlegan Jul 21, 2023
45d12ee
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan Jul 21, 2023
9482932
Cleaned up some code formatting.
schlegan Jul 21, 2023
6519268
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 21, 2023
4443ca3
test/ConfigManagerTest: Shortend test code.
schlegan Jul 21, 2023
dd3722b
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 21, 2023
67830ad
src/index/IndexImpl: Shortend code for the creation of configOptions.
schlegan Jul 21, 2023
7e3472d
benchmark/BenchmarkExamples: Made the usage of addOption clearer.
schlegan Jul 21, 2023
207ea5e
src/util/ConfigManager/ConfigManager: AddOption now returns a referen…
schlegan Jul 21, 2023
b2e58d4
src/util/ConfigManager/ConfigManager: Improved element access in impl…
schlegan Jul 21, 2023
86ee1f0
src/util/ConfigManager/ConfigManager: Improved consistency of example…
schlegan Jul 21, 2023
ba7ecee
Cleaned up some code formatting.
schlegan Jul 21, 2023
01401b1
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 21, 2023
adf88dc
src/index/IndexImpl: Adjusted to changes in API.
schlegan Jul 21, 2023
b959473
src/index/IndexImpl: Deleted uneeded comments.
schlegan Jul 21, 2023
a021fc5
Cleaned up code formatting.
schlegan Jul 21, 2023
8f8c8a3
src/util/ConfigManager/ConfigManager: Replaced specific hash map with…
schlegan Jul 21, 2023
4151aa4
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 21, 2023
3559c40
src/util/ConfigManager/ConfigManager: Improved helper function name.
schlegan Jul 21, 2023
b8114e0
src/util/ConfigManager/ConfigManager: Got rid of uneeded forwarding.
schlegan Jul 21, 2023
9da6251
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 21, 2023
05af73e
src/util/ConfigManager/ConfigManager: Fixed a missspelling from a pre…
schlegan Jul 21, 2023
3e3c740
src/util/ConfigManager/ConfigManager: Sub managers can now be created…
schlegan Jul 28, 2023
1ec1d13
Cleaned up code formatting.
schlegan Jul 28, 2023
91ffd3a
Merge branch 'master' into ConfigManagerUsageImprovements
schlegan Jul 28, 2023
de4be9a
Merge branch 'ConfigManagerUsageImprovements' into IntegrateConfigMan…
schlegan Jul 28, 2023
eaecacc
src/index/IndexImpl: No longer write to jsonConfiguration in readConf…
schlegan Jul 28, 2023
e87e61c
src/index/IndexImpl: Improved setting of configurationJson_ in readCo…
schlegan Jul 28, 2023
5a2fbc9
src/index/IndexImpl: Got rid of uneeded wasSetAtRuntime()-check.
schlegan Jul 28, 2023
da5584a
src/index/IndexImpl: Local config manager now directly writes to numT…
schlegan Jul 28, 2023
a022ccb
src/index/IndexImpl: Index version will now be checked before parsing.
schlegan Jul 28, 2023
de0ad8b
src/index/IndexImpl: Fixed mistake, where the values needed for the i…
schlegan Jul 28, 2023
5954e06
Cleaned up code formatting.
schlegan Jul 28, 2023
c631b21
Github was being buggy.
schlegan Jul 28, 2023
0e0295b
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Aug 25, 2023
8527234
src/index/IndexImpl: Replaced the manual check for the states of the …
schlegan Aug 27, 2023
8c833b6
src/index/IndexImpl: Added TODO for possible validator candidate.
schlegan Aug 27, 2023
a581945
Cleaned up code formatting.
schlegan Aug 27, 2023
6b65265
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Aug 31, 2023
98ecbf0
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Sep 1, 2023
1471823
src/index/IndexImpl: Added sub manager for easier organization.
schlegan Sep 1, 2023
14ed6d5
Cleaned up code formatting.
schlegan Sep 1, 2023
b818ef8
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Oct 2, 2023
d772235
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Oct 3, 2023
e367e96
Fixed code formatting.
schlegan Oct 3, 2023
ff06b23
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Oct 30, 2023
ce641c7
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 2, 2023
16eb379
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 6, 2023
ad104ad
src/index/IndexImpl.cpp: Added description to the validator.
schlegan Nov 6, 2023
48ed73f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 9, 2023
0d8414e
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 10, 2023
33eece2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 13, 2023
31e572f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 17, 2023
aca21a2
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 17, 2023
cb0d2b1
Added some comments.
joka921 Nov 23, 2023
286ebb6
Added some preliminary descriptions to the config manager in IndexImp…
joka921 Nov 23, 2023
d9c51d9
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Nov 24, 2023
d02c9c5
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 2, 2023
7db5aac
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
joka921 Dec 7, 2023
046c41f
Merge in the master, and see for myself what is going on there.
joka921 Dec 7, 2023
236022c
Merge remote-tracking branch 'andre/IntegrateConfigManagerInIndexImpl…
joka921 Dec 7, 2023
c22c89b
src/util/ConfigManager/ConfigManager: Wrote two public helper functio…
schlegan Dec 7, 2023
3ed1eab
src/index/IndexImpl::readIndexBuilderSettingsFromFile: Moved the crea…
schlegan Dec 7, 2023
158422a
src/index/IndexBuilderMain: The '-h' cli parameter now also prints th…
schlegan Dec 7, 2023
4e53e6a
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 8, 2023
55df39f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 9, 2023
bdefed3
Refactor workflows + revert to standard `apt` (#1185)
joka921 Dec 12, 2023
5bfa1b4
Make sonarcloud happy by making an `std::move` explicit (#1179)
joka921 Dec 12, 2023
f45fece
Benchmark::ResultTable : Add helper functions for column-based operat…
schlegan Dec 12, 2023
0820c96
For GROUP BY optimization, use vector offsets to access aggregation d…
kcaliban Dec 12, 2023
a363d10
Push to Docker Hub as `adfreiburg/qlever` (#1192)
joka921 Dec 12, 2023
d852aa4
Make sure that no exceptions get lost in the parallel Turtle parser (…
joka921 Dec 13, 2023
96572ac
Update CTRE and embed via FetchContent (#1199)
RobinTF Dec 14, 2023
2a55e50
src/index/IndexImpl.cpp: Deleted uneeded std::make_pair.
schlegan Dec 14, 2023
76b5747
src/index/IndexImpl.cpp: Deleted manuell documentation, that was repl…
schlegan Dec 14, 2023
c366a3f
src/index/IndexImpl.h: Improved readability of the initialization val…
schlegan Dec 14, 2023
7c63f18
Fixed code formatting.
schlegan Dec 14, 2023
a813c6c
src/index/IndexImpl.cpp: Got rid of uneeded explicit lambda return type.
schlegan Dec 14, 2023
3139740
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 15, 2023
dd5ed9f
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 18, 2023
1d34862
src/util/ConfigManager/ConfigManager: Git somehow forgot, that I've a…
schlegan Dec 18, 2023
0daffb4
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Dec 23, 2023
82470e4
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Jan 12, 2024
a1982ec
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Jan 19, 2024
a7687bf
Merge branch 'master' into IntegrateConfigManagerInIndexImpl
schlegan Jan 23, 2024
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
2 changes: 1 addition & 1 deletion src/index/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ add_library(index
DocsDB.cpp FTSAlgorithms.cpp
PrefixHeuristic.cpp CompressedRelation.cpp
PatternCreator.cpp)
qlever_target_link_libraries(index util parser vocabulary compilationInfo ${STXXL_LIBRARIES})
qlever_target_link_libraries(index util parser vocabulary compilationInfo configManager ${STXXL_LIBRARIES})
5 changes: 5 additions & 0 deletions src/index/Index.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,8 @@
const Permutation::Enum& permutation) const {
return pimpl_->getResultSizeOfScan(col0String, col1String, permutation);
}

// ____________________________________________________________________________
std::string Index::getConfigurationDocForIndexBuilder() {
return pimpl_->getConfigurationDocForIndexBuilder();
}

Check warning on line 300 in src/index/Index.cpp

View check run for this annotation

Codecov / codecov/patch

src/index/Index.cpp#L298-L300

Added lines #L298 - L300 were not covered by tests
5 changes: 5 additions & 0 deletions src/index/Index.h
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,9 @@ class Index {
// requires including the rather expensive `IndexImpl.h` header
IndexImpl& getImpl() { return *pimpl_; }
[[nodiscard]] const IndexImpl& getImpl() const { return *pimpl_; }

/*
@brief Print the detailed documentation of the options for the index builder.
*/
std::string getConfigurationDocForIndexBuilder();
Copy link
Member

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).

Copy link
Contributor Author

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.

};
3 changes: 2 additions & 1 deletion src/index/IndexBuilderMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ int main(int argc, char** argv) {
try {
po::store(po::parse_command_line(argc, argv, boostOptions), optionsMap);
if (optionsMap.count("help")) {
std::cout << boostOptions << '\n';
std::cout << boostOptions << '\n'
<< index.getConfigurationDocForIndexBuilder() << '\n';
return EXIT_SUCCESS;
}
po::notify(optionsMap);
Expand Down
Loading