Small refactoring changes

CompilationInfo.cmake

@@ -15,10 +15,11 @@ endif()
 message(STATUS "GIT_HASH is ${GIT_HASH}")
 
 # Write the .cpp file.
-set(CONSTANTS "#include <string>
+set(CONSTANTS "#include \"CompilationInfo.h\"
 namespace qlever::version {
-const char* GitHash = ${GIT_HASH};
-const char* DatetimeOfCompilation = ${DATETIME_OF_COMPILATION};
+constexpr std::string_view GitHash = ${GIT_HASH};
+constexpr std::string_view GitShortHash = GitHash.substr(0, 6);
+constexpr std::string_view DatetimeOfCompilation = ${DATETIME_OF_COMPILATION};
 }")
 
 # For some reason `CMAKE_CURRENT_SOURCE_DIR` inside this script is

src/CompilationInfo.h

@@ -6,12 +6,10 @@
 // File `CompilationInfo.cpp` which is created and linked by CMake.
 
 #pragma once
-#include <string>
+#include <string_view>
 namespace qlever::version {
-// The git hash of the commit that was used to  QLever.
-extern const char* GitHash;
+// Short version of the hash of the commit that was used to QLever.
+extern const std::string_view GitShortHash;
 // The date and time at which QLever was compiled.
-extern const char* DatetimeOfCompilation;
-
-inline std::string GitShortHash() { return std::string{GitHash}.substr(0, 6); }
+extern const std::string_view DatetimeOfCompilation;
 }  // namespace qlever::version

src/ServerMain.cpp

@@ -23,9 +23,6 @@ using std::string;
 
 namespace po = boost::program_options;
 
-#define EMPH_ON "\033[1m"
-#define EMPH_OFF "\033[22m"
-
 // Main function.
 int main(int argc, char** argv) {
   setlocale(LC_CTYPE, "");
@@ -124,7 +121,7 @@ int main(int argc, char** argv) {
 
   LOG(INFO) << EMPH_ON << "QLever Server, compiled on "
             << qlever::version::DatetimeOfCompilation << " using git hash "
-            << qlever::version::GitShortHash() << EMPH_OFF << std::endl;
+            << qlever::version::GitShortHash << EMPH_OFF << std::endl;
 
   try {
     Server server(port, numSimultaneousQueries, memoryMaxSize,

src/engine/Distinct.h

@@ -3,17 +3,13 @@
 // Author: Björn Buchhold ([email protected])
 #pragma once
 
-#include <list>
 #include <utility>
 #include <vector>
 
-#include "../parser/ParsedQuery.h"
-#include "./Operation.h"
-#include "./QueryExecutionTree.h"
+#include "engine/Operation.h"
+#include "engine/QueryExecutionTree.h"
+#include "parser/ParsedQuery.h"
 
-using std::list;
-
-using std::pair;
 using std::vector;
 
 class Distinct : public Operation {

src/engine/Join.h

@@ -6,17 +6,13 @@
 
 #pragma once
 
-#include <list>
-
 #include "engine/IndexScan.h"
 #include "engine/Operation.h"
 #include "engine/QueryExecutionTree.h"
 #include "util/HashMap.h"
 #include "util/HashSet.h"
 #include "util/JoinAlgorithms/JoinAlgorithms.h"
 
-using std::list;
-
 class Join : public Operation {
  private:
   std::shared_ptr<QueryExecutionTree> _left;

src/engine/OptionalJoin.h

@@ -4,12 +4,8 @@
 //         Florian Kramer ([email protected])
 #pragma once
 
-#include <list>
-
-#include "./Operation.h"
-#include "./QueryExecutionTree.h"
-
-using std::list;
+#include "engine/Operation.h"
+#include "engine/QueryExecutionTree.h"
 
 class OptionalJoin : public Operation {
  private:

src/engine/OrderBy.cpp

@@ -8,7 +8,6 @@
 #include <sstream>
 
 #include "engine/CallFixedSize.h"
-#include "engine/Comparators.h"
 #include "engine/QueryExecutionTree.h"
 #include "global/ValueIdComparators.h"
 

src/global/Constants.h

@@ -10,6 +10,7 @@
 #include <limits>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 
 #include "util/MemorySize/MemorySize.h"
 #include "util/Parameters.h"
@@ -267,4 +268,8 @@ auto parallel_sort([[maybe_unused]] Args&&... args) {
 using parallel_tag = int;
 }  // namespace ad_utility
 #endif
-static constexpr size_t NUM_SORT_THREADS = 4;
+constexpr size_t NUM_SORT_THREADS = 4;
+/// ANSI escape sequence for bold text in the console
+constexpr std::string_view EMPH_ON = "\033[1m";
+/// ANSI escape sequence to print "normal" text again in the console.
+constexpr std::string_view EMPH_OFF = "\033[22m";

src/index/IndexBuilderMain.cpp

@@ -23,9 +23,6 @@
 
 using std::string;
 
-#define EMPH_ON "\033[1m"
-#define EMPH_OFF "\033[22m"
-
 namespace po = boost::program_options;
 
 string getStxxlConfigFileName(const string& location) {
@@ -166,7 +163,7 @@ int main(int argc, char** argv) {
 
   LOG(INFO) << EMPH_ON << "QLever IndexBuilder, compiled on "
             << qlever::version::DatetimeOfCompilation << " using git hash "
-            << qlever::version::GitShortHash() << EMPH_OFF << std::endl;
+            << qlever::version::GitShortHash << EMPH_OFF << std::endl;
 
   try {
     LOG(TRACE) << "Configuring STXXL..." << std::endl;

src/index/IndexImpl.cpp

@@ -884,7 +884,7 @@ void IndexImpl::setPrefixCompression(bool compressed) {
 void IndexImpl::writeConfiguration() const {
   // Copy the configuration and add the current commit hash.
   auto configuration = configurationJson_;
-  configuration["git-hash"] = std::string(qlever::version::GitHash);
+  configuration["git-hash"] = qlever::version::GitShortHash;
   configuration["index-format-version"] = qlever::indexFormatVersion;
   auto f = ad_utility::makeOfstream(onDiskBase_ + CONFIGURATION_FILE);
   f << configuration;
@@ -896,8 +896,7 @@ void IndexImpl::readConfiguration() {
   f >> configurationJson_;
   if (configurationJson_.find("git-hash") != configurationJson_.end()) {
     LOG(INFO) << "The git hash used to build this index was "
-              << std::string(configurationJson_["git-hash"]).substr(0, 6)
-              << std::endl;
+              << configurationJson_["git-hash"] << std::endl;
   } else {
     LOG(INFO) << "The index was built before git commit hashes were stored in "
                  "the index meta data"