Clang-format for new format.

ad-freiburg · Jul 16, 2021 · 594baee · 594baee
1 parent 5522fbb
commit 594baee
Show file tree

Hide file tree

Showing 99 changed files with 225 additions and 71 deletions.
diff --git a/src/MetaDataConverterMain.cpp b/src/MetaDataConverterMain.cpp
@@ -4,6 +4,7 @@
 //
 #include <array>
 #include <iostream>
+
 #include "./global/Constants.h"
 #include "./index/MetaDataConverter.h"
 #include "./util/File.h"

diff --git a/src/PrefixHeuristicEvaluatorMain.cpp b/src/PrefixHeuristicEvaluatorMain.cpp
@@ -3,6 +3,7 @@
 // Author: Johannes Kalmbach<joka921> (johannes.kalmbach@gmail.com)
 
 #include <iostream>
+
 #include "./global/Constants.h"
 #include "./index/PrefixHeuristic.h"
 

diff --git a/src/TurtleParserMain.cpp b/src/TurtleParserMain.cpp
@@ -3,10 +3,12 @@
 // Author: Johannes Kalmbach(joka921) <johannes.kalmbach@gmail.com>
 
 #include <getopt.h>
+
 #include <array>
 #include <fstream>
 #include <iostream>
 #include <string>
+
 #include "./parser/NTriplesParser.h"
 #include "./parser/TsvParser.h"
 #include "./parser/TurtleParser.h"

diff --git a/src/engine/Comparators.h b/src/engine/Comparators.h
@@ -5,6 +5,7 @@
 
 #include <utility>
 #include <vector>
+
 #include "IdTable.h"
 
 using std::pair;

diff --git a/src/engine/CountAvailablePredicates.cpp b/src/engine/CountAvailablePredicates.cpp
@@ -3,6 +3,7 @@
 // Author: Florian Kramer (florian.kramer@neptun.uni-freiburg.de)
 
 #include "CountAvailablePredicates.h"
+
 #include "CallFixedSize.h"
 
 // _____________________________________________________________________________

diff --git a/src/engine/Distinct.cpp b/src/engine/Distinct.cpp
@@ -3,7 +3,9 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./Distinct.h"
+
 #include <sstream>
+
 #include "./QueryExecutionTree.h"
 #include "CallFixedSize.h"
 

diff --git a/src/engine/Filter.cpp b/src/engine/Filter.cpp
@@ -3,10 +3,12 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "Filter.h"
+
 #include <algorithm>
 #include <optional>
 #include <regex>
 #include <sstream>
+
 #include "CallFixedSize.h"
 #include "QueryExecutionTree.h"
 

diff --git a/src/engine/Filter.h b/src/engine/Filter.h
@@ -6,6 +6,7 @@
 #include <list>
 #include <utility>
 #include <vector>
+
 #include "../parser/ParsedQuery.h"
 #include "./Operation.h"
 #include "./QueryExecutionTree.h"

diff --git a/src/engine/HasPredicateScan.cpp b/src/engine/HasPredicateScan.cpp
@@ -3,6 +3,7 @@
 // Author: Florian Kramer (florian.kramer@mail.uni-freiburg.de)
 
 #include "HasPredicateScan.h"
+
 #include "CallFixedSize.h"
 
 template <typename A, typename R>

diff --git a/src/engine/IndexScan.cpp b/src/engine/IndexScan.cpp
@@ -3,6 +3,7 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./IndexScan.h"
+
 #include <sstream>
 #include <string>
 

diff --git a/src/engine/IndexScan.h b/src/engine/IndexScan.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "../util/Conversions.h"
 #include "./Operation.h"
 

diff --git a/src/engine/Join.cpp b/src/engine/Join.cpp
@@ -3,10 +3,12 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./Join.h"
+
 #include <functional>
 #include <sstream>
 #include <type_traits>
 #include <unordered_set>
+
 #include "./QueryExecutionTree.h"
 #include "CallFixedSize.h"
 

diff --git a/src/engine/Join.h b/src/engine/Join.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <list>
+
 #include "../util/HashMap.h"
 #include "../util/HashSet.h"
 #include "./IndexScan.h"

diff --git a/src/engine/MultiColumnJoin.cpp b/src/engine/MultiColumnJoin.cpp
@@ -3,6 +3,7 @@
 // Author: Florian Kramer (florian.kramer@netpun.uni-freiburg.de)
 
 #include "MultiColumnJoin.h"
+
 #include "CallFixedSize.h"
 
 using std::string;

diff --git a/src/engine/Operation.cpp b/src/engine/Operation.cpp
@@ -3,6 +3,7 @@
 // Author: Johannes Kalmbach  (johannes.kalmbach@gmail.com)
 
 #include "Operation.h"
+
 #include "QueryExecutionTree.h"
 
 template <typename F>

diff --git a/src/engine/OptionalJoin.cpp b/src/engine/OptionalJoin.cpp
@@ -4,6 +4,7 @@
 //         Florian Kramer (florian.kramer@netpun.uni-freiburg.de)
 
 #include "OptionalJoin.h"
+
 #include "CallFixedSize.h"
 
 using std::string;

diff --git a/src/engine/OrderBy.cpp b/src/engine/OrderBy.cpp
@@ -2,11 +2,12 @@
 // Chair of Algorithms and Data Structures.
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
+#include "OrderBy.h"
+
 #include <sstream>
 
 #include "CallFixedSize.h"
 #include "Comparators.h"
-#include "OrderBy.h"
 #include "QueryExecutionTree.h"
 
 using std::string;

diff --git a/src/engine/QueryExecutionTree.cpp b/src/engine/QueryExecutionTree.cpp
@@ -3,9 +3,11 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./QueryExecutionTree.h"
+
 #include <algorithm>
 #include <sstream>
 #include <string>
+
 #include "./Distinct.h"
 #include "./Filter.h"
 #include "./IndexScan.h"

diff --git a/src/engine/QueryExecutionTree.h b/src/engine/QueryExecutionTree.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
+
 #include "../util/Conversions.h"
 #include "../util/HashSet.h"
 #include "./Operation.h"

diff --git a/src/engine/QueryPlanner.h b/src/engine/QueryPlanner.h
@@ -5,6 +5,7 @@
 
 #include <set>
 #include <vector>
+
 #include "../parser/ParsedQuery.h"
 #include "QueryExecutionTree.h"
 

diff --git a/src/engine/QueryPlanningCostFactors.cpp b/src/engine/QueryPlanningCostFactors.cpp
@@ -3,7 +3,9 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./QueryPlanningCostFactors.h"
+
 #include <fstream>
+
 #include "../util/Exception.h"
 #include "../util/Log.h"
 #include "../util/StringUtils.h"

diff --git a/src/engine/QueryPlanningCostFactors.h b/src/engine/QueryPlanningCostFactors.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <string>
+
 #include "../util/HashMap.h"
 
 using std::string;

diff --git a/src/engine/ResultTable.cpp b/src/engine/ResultTable.cpp
@@ -3,6 +3,7 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./ResultTable.h"
+
 #include <cassert>
 
 // _____________________________________________________________________________

diff --git a/src/engine/ResultTable.h b/src/engine/ResultTable.h
@@ -8,6 +8,7 @@
 #include <mutex>
 #include <optional>
 #include <vector>
+
 #include "../global/Id.h"
 #include "../util/Exception.h"
 #include "IdTable.h"

diff --git a/src/engine/Server.cpp b/src/engine/Server.cpp
@@ -2,6 +2,8 @@
 // Chair of Algorithms and Data Structures.
 // Author: Björn Buchhold <buchholb>
 
+#include "./Server.h"
+
 #include <algorithm>
 #include <cstring>
 #include <nlohmann/json.hpp>
@@ -13,7 +15,6 @@
 #include "../parser/ParseException.h"
 #include "../util/Log.h"
 #include "../util/StringUtils.h"
-#include "./Server.h"
 #include "QueryPlanner.h"
 
 // _____________________________________________________________________________

diff --git a/src/engine/Sort.cpp b/src/engine/Sort.cpp
@@ -3,7 +3,9 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./Sort.h"
+
 #include <sstream>
+
 #include "CallFixedSize.h"
 #include "QueryExecutionTree.h"
 

diff --git a/src/engine/SortPerformanceEstimator.h b/src/engine/SortPerformanceEstimator.h
@@ -27,8 +27,8 @@ class SortPerformanceEstimator {
 
   // Compute and return an Estimate for how long sorting an IdTable with the
   // specified number of rows and columns takes.
-  double estimatedSortTimeInSeconds(size_t numRows, size_t numCols) const
-      noexcept;
+  double estimatedSortTimeInSeconds(size_t numRows,
+                                    size_t numCols) const noexcept;
 
   // Create an uninitialized SortPerformanceEstimator, which is cheap. Before
   // using it, computeEstimatesExpensively has to be called

diff --git a/src/engine/TextOperationWithFilter.cpp b/src/engine/TextOperationWithFilter.cpp
@@ -2,10 +2,11 @@
 // Chair of Algorithms and Data Structures.
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
+#include "TextOperationWithFilter.h"
+
 #include <sstream>
 
 #include "./QueryExecutionTree.h"
-#include "TextOperationWithFilter.h"
 
 using std::string;
 

diff --git a/src/engine/TextOperationWithoutFilter.cpp b/src/engine/TextOperationWithoutFilter.cpp
@@ -3,7 +3,9 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "TextOperationWithoutFilter.h"
+
 #include <sstream>
+
 #include "./QueryExecutionTree.h"
 
 using std::string;

diff --git a/src/engine/TwoColumnJoin.cpp b/src/engine/TwoColumnJoin.cpp
@@ -3,6 +3,7 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "TwoColumnJoin.h"
+
 #include "CallFixedSize.h"
 
 using std::string;

diff --git a/src/engine/Union.cpp b/src/engine/Union.cpp
@@ -2,6 +2,7 @@
 // Chair of Algorithms and Data Structures.
 // Author: Florian Kramer (florian.kramer@mail.uni-freiburg.de)
 #include "Union.h"
+
 #include "CallFixedSize.h"
 
 const size_t Union::NO_COLUMN = std::numeric_limits<size_t>::max();

diff --git a/src/engine/Values.cpp b/src/engine/Values.cpp
@@ -5,6 +5,7 @@
 #include "Values.h"
 
 #include <sstream>
+
 #include "../util/Exception.h"
 #include "../util/HashSet.h"
 #include "CallFixedSize.h"

diff --git a/src/global/Pattern.h b/src/global/Pattern.h
@@ -10,6 +10,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+
 #include "../util/File.h"
 #include "Id.h"
 

diff --git a/src/index/CreatePatternsMain.cpp b/src/index/CreatePatternsMain.cpp
@@ -2,6 +2,7 @@
 // Chair of Algorithms and Data Structures.
 // Author: Florian Kramer (florian.kramer@neptun.uni-freiburg.de)
 #include <getopt.h>
+
 #include <cstdio>
 #include <cstdlib>
 #include <iomanip>

diff --git a/src/index/DocsDB.cpp b/src/index/DocsDB.cpp
@@ -3,7 +3,9 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "DocsDB.h"
+
 #include <algorithm>
+
 #include "../global/Constants.h"
 
 // _____________________________________________________________________________

diff --git a/src/index/DocsDB.h b/src/index/DocsDB.h
@@ -6,6 +6,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+
 #include "../global/Id.h"
 #include "../util/File.h"
 

diff --git a/src/index/ExternalVocabulary.h b/src/index/ExternalVocabulary.h
@@ -6,6 +6,7 @@
 
 #include <string>
 #include <vector>
+
 #include "../global/Id.h"
 #include "../util/File.h"
 #include "StringSortComparator.h"

diff --git a/src/index/FTSAlgorithms.cpp b/src/index/FTSAlgorithms.cpp
@@ -3,10 +3,12 @@
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
 #include "./FTSAlgorithms.h"
+
 #include <cmath>
 #include <map>
 #include <set>
 #include <utility>
+
 #include "../util/HashMap.h"
 #include "../util/HashSet.h"
 

diff --git a/src/index/Index.Text.cpp b/src/index/Index.Text.cpp
@@ -5,6 +5,7 @@
 #include <stxxl/algorithm>
 #include <tuple>
 #include <utility>
+
 #include "../engine/CallFixedSize.h"
 #include "../parser/ContextFileParser.h"
 #include "../util/Simple8bCode.h"

diff --git a/src/index/Index.cpp b/src/index/Index.cpp
@@ -2,6 +2,8 @@
 // Chair of Algorithms and Data Structures.
 // Author: Björn Buchhold (buchhold@informatik.uni-freiburg.de)
 
+#include "./Index.h"
+
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
@@ -18,7 +20,6 @@
 #include "../util/Conversions.h"
 #include "../util/HashMap.h"
 #include "../util/TupleHelpers.h"
-#include "./Index.h"
 #include "./PrefixHeuristic.h"
 #include "./VocabularyGenerator.h"
 #include "MetaDataIterator.h"
@@ -1540,7 +1541,7 @@ std::future<void> Index::writeNextPartialVocabulary(
                  vocab = &_vocab, partialFilename, partialCompressionFilename,
                  vocabPrefixCompressed = _vocabPrefixCompressed]() {
     auto vec = vocabMapsToVector(items);
-    const auto identicalPred = [& c = vocab->getCaseComparator()](
+    const auto identicalPred = [&c = vocab->getCaseComparator()](
                                    const auto& a, const auto& b) {
       return c(a.second.m_splitVal, b.second.m_splitVal,
                decltype(_vocab)::SortLevel::TOTAL);