Small fixes

Signed-off-by: Johannes Kalmbach <[email protected]>

src/engine/Operation.h

@@ -65,7 +65,7 @@ class Operation {
   // Add a warning to the `Operation`. The warning will be returned by
   // `collectWarnings()` above.
   void addWarning(std::string warning) {
-    _warnings.push_back(std::move(warning));
+    warnings_.push_back(std::move(warning));
   }
 
   /**
@@ -249,9 +249,9 @@ class Operation {
   [[nodiscard]] virtual vector<ColumnIndex> resultSortedOn() const = 0;
 
   /// interface to the generated warnings of this operation
-  std::vector<std::string>& getWarnings() { return _warnings; }
+  std::vector<std::string>& getWarnings() { return warnings_; }
   [[nodiscard]] const std::vector<std::string>& getWarnings() const {
-    return _warnings;
+    return warnings_;
   }
 
   // Check if the cancellation flag has been set and throw an exception if
@@ -380,7 +380,7 @@ class Operation {
 
   // Collect all the warnings that were created during the creation or
   // execution of this operation.
-  std::vector<std::string> _warnings;
+  std::vector<std::string> warnings_;
 
   // The limit from a SPARQL `LIMIT` clause.
 

src/parser/ParsedQuery.cpp

@@ -453,9 +453,9 @@ void ParsedQuery::addOrderByClause(OrderClause orderClause, bool isGroupBy,
                              variablesFromAliases, additionalError);
     } else if (!ad_utility::contains(_groupByVariables, orderKey.variable_) &&
                (!variablesFromAliases.contains(orderKey.variable_))) {
-      // Check whether grouping is done. The variable being ordered by
-      // must then be either grouped or the result of an alias in the select
-      // clause.
+      // If the query (in addition to the ORDER BY) also contains a GROUP BY,
+      // the variables in the ORDER BY must be either grouped or the result
+      // of an alias in the SELECT clause.
       addWarningOrThrow(absl::StrCat(
           "Variable " + orderKey.variable_.name(),
           " was used in an ORDER BY clause, but is neither grouped nor "

src/parser/sparqlParser/SparqlQleverVisitor.cpp

@@ -192,8 +192,7 @@ PathObjectPairs joinPredicateAndObject(const VarOrPath& predicate,
 }
 
 // ___________________________________________________________________________
-SparqlExpressionPimpl Visitor::visitExpressionPimpl(
-    auto* ctx, [[maybe_unused]] bool allowLanguageFilters) {
+SparqlExpressionPimpl Visitor::visitExpressionPimpl(auto* ctx) {
   return {visit(ctx), getOriginalInputForContext(ctx)};
 }
 
@@ -1269,14 +1268,11 @@ void Visitor::warnOrThrowIfUnboundVariables(
 
 // ____________________________________________________________________________________
 SparqlFilter Visitor::visit(Parser::FilterRContext* ctx) {
-  // The second argument means that the expression `LANG(?var) = "langtag"` is
-  // allowed.
-  //
   // NOTE: We cannot add a warning or throw an exception if the FILTER
   // expression contains unbound variables, because the variables of the FILTER
   // might be bound after the filter appears in the query (which is perfectly
   // legal).
-  return SparqlFilter{visitExpressionPimpl(ctx->constraint(), true)};
+  return SparqlFilter{visitExpressionPimpl(ctx->constraint())};
 }
 
 // ____________________________________________________________________________________

src/parser/sparqlParser/SparqlQleverVisitor.h

@@ -524,8 +524,7 @@ class SparqlQleverVisitor {
   // Return the `SparqlExpressionPimpl` for a context that returns a
   // `ExpressionPtr` when visited. The descriptor is set automatically on the
   // `SparqlExpressionPimpl`.
-  SparqlExpressionPimpl visitExpressionPimpl(auto* ctx,
-                                             bool allowLanguageFilters = false);
+  SparqlExpressionPimpl visitExpressionPimpl(auto* ctx);
 
   template <typename Expr>
   ExpressionPtr createExpression(auto... children) {