Simplify ORDER BY and GROUP BY clauses

kbss-cvut · Dec 19, 2024 · 2328b6c · 2328b6c
1 parent fad6ebf
commit 2328b6c
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 44 deletions.
diff --git a/jopa-impl/src/main/antlr4/cz/cvut/kbss/jopa/query/soql/Soql.g4 b/jopa-impl/src/main/antlr4/cz/cvut/kbss/jopa/query/soql/Soql.g4
@@ -6,6 +6,12 @@ querySentence: selectStatement ;
 
 selectStatement: selectClause fromClause whereClause? groupByClause? orderByClause? ;
 
+objectPathExpression: simplePath DOT objectField ;
+
+simplePath: objectField (DOT simplePath)* ;
+
+objectField: IDENTIFICATION_VARIABLE ;
+
 selectClause: SELECT (DISTINCT)? selectItem (',' selectItem)* ;
 
 selectItem: selectExpression;
@@ -128,19 +134,13 @@ functionsReturningNumerics
    | 'FLOOR' '(' simpleArithmeticExpression ')'
    ;
 
-orderByClause: ORDERBY orderByFullFormComma orderByFullFormComma* ;
-
-orderByFullFormComma: orderByFullForm ','? ;
-
-orderByFullForm: orderByParam ORDERING? ;
-
-orderByParam: object DOT attribute (DOT attribute)* ;
+orderByClause: ORDER BY orderByItem (',' orderByItem)* ;
 
-groupByClause: GROUPBY groupByParamComma groupByParamComma* ;
+orderByItem: objectPathExpression (ASC | DESC) ;
 
-groupByParamComma: groupByParam ','? ;
+groupByClause: GROUP BY groupByItem (',' groupByItem)* ;
 
-groupByParam: object DOT attribute (DOT attribute)* ;
+groupByItem: objectPathExpression ;
 
 inputParameter: COLON IDENTIFICATION_VARIABLE ;
 
@@ -159,11 +159,11 @@ AND: 'AND' ;
 
 OR: 'OR' ;
 
-ORDERBY: 'ORDER BY' ;
+BY: 'BY' ;
 
-ORDERING: ASC | DESC ;
+ORDER: 'ORDER' ;
 
-GROUPBY: 'GROUP BY' ;
+GROUP: 'GROUP' ;
 
 ASC: 'ASC' ;
 

diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/query/soql/SoqlQueryListener.java
@@ -119,6 +119,36 @@ public void exitSelectStatement(SoqlParser.SelectStatementContext ctx) {
 
     }
 
+    @Override
+    public void enterObjectPathExpression(SoqlParser.ObjectPathExpressionContext ctx) {
+
+    }
+
+    @Override
+    public void exitObjectPathExpression(SoqlParser.ObjectPathExpressionContext ctx) {
+
+    }
+
+    @Override
+    public void enterSimplePath(SoqlParser.SimplePathContext ctx) {
+
+    }
+
+    @Override
+    public void exitSimplePath(SoqlParser.SimplePathContext ctx) {
+
+    }
+
+    @Override
+    public void enterObjectField(SoqlParser.ObjectFieldContext ctx) {
+
+    }
+
+    @Override
+    public void exitObjectField(SoqlParser.ObjectFieldContext ctx) {
+
+    }
+
     @Override
     public void enterSelectClause(SoqlParser.SelectClauseContext ctx) {
         this.typeDef = SparqlConstants.SELECT;
@@ -565,24 +595,8 @@ public void exitOrderByClause(SoqlParser.OrderByClauseContext ctx) {
     }
 
     @Override
-    public void enterOrderByFullFormComma(SoqlParser.OrderByFullFormCommaContext ctx) {
-    }
-
-    @Override
-    public void exitOrderByFullFormComma(SoqlParser.OrderByFullFormCommaContext ctx) {
-    }
-
-    @Override
-    public void enterOrderByFullForm(SoqlParser.OrderByFullFormContext ctx) {
-    }
-
-    @Override
-    public void exitOrderByFullForm(SoqlParser.OrderByFullFormContext ctx) {
-    }
-
-    @Override
-    public void enterOrderByParam(SoqlParser.OrderByParamContext ctx) {
-        SoqlNode firstNode = linkContextNodes(ctx);
+    public void enterOrderByItem(SoqlParser.OrderByItemContext ctx) {
+        SoqlNode firstNode = linkObjectPathExpression(ctx);
         String orderingBy = getOrderingBy(ctx.getParent());
         SoqlOrderParameter orderParam = new SoqlOrderParameter(firstNode, orderingBy);
         boolean attrSet = false;
@@ -603,28 +617,21 @@ public void enterOrderByParam(SoqlParser.OrderByParamContext ctx) {
     }
 
     @Override
-    public void exitOrderByParam(SoqlParser.OrderByParamContext ctx) {
+    public void exitOrderByItem(SoqlParser.OrderByItemContext ctx) {
     }
 
     @Override
     public void enterGroupByClause(SoqlParser.GroupByClauseContext ctx) {
-    }
 
-    @Override
-    public void exitGroupByClause(SoqlParser.GroupByClauseContext ctx) {
-    }
-
-    @Override
-    public void enterGroupByParamComma(SoqlParser.GroupByParamCommaContext ctx) {
     }
 
     @Override
-    public void exitGroupByParamComma(SoqlParser.GroupByParamCommaContext ctx) {
+    public void exitGroupByClause(SoqlParser.GroupByClauseContext ctx) {
     }
 
     @Override
-    public void enterGroupByParam(SoqlParser.GroupByParamContext ctx) {
-        SoqlNode firstNode = linkContextNodes(ctx);
+    public void enterGroupByItem(SoqlParser.GroupByItemContext ctx) {
+        SoqlNode firstNode = linkObjectPathExpression(ctx);
         SoqlGroupParameter groupParam = new SoqlGroupParameter(firstNode);
         boolean attrSet = false;
         for (SoqlAttribute attr : attributes) {
@@ -643,6 +650,11 @@ public void enterGroupByParam(SoqlParser.GroupByParamContext ctx) {
         groupAttributes.add(groupParam);
     }
 
+    @Override
+    public void exitGroupByItem(SoqlParser.GroupByItemContext ctx) {
+
+    }
+
     private SoqlNode linkContextNodes(ParserRuleContext ctx) {
         SoqlNode firstNode = new AttributeNode(getOwnerFromParam(ctx));
         SoqlNode currentNode = firstNode;
@@ -659,8 +671,20 @@ private SoqlNode linkContextNodes(ParserRuleContext ctx) {
         return firstNode;
     }
 
-    @Override
-    public void exitGroupByParam(SoqlParser.GroupByParamContext ctx) {
+    private SoqlNode linkObjectPathExpression(ParserRuleContext ctx) {
+        SoqlNode firstNode = new AttributeNode(getOwnerFromParam(ctx));
+        SoqlNode currentNode = firstNode;
+        for (int i = 2; i < ctx.getChild(0).getChildCount(); i += 2) {
+            SoqlNode prevNode = currentNode;
+            currentNode = new AttributeNode(prevNode, ctx.getChild(0).getChild(i).getText());
+            prevNode.setChild(currentNode);
+        }
+        setIris(firstNode);
+        if (currentNode.getIri().isEmpty()) {
+            currentNode.getParent().setChild(null);
+            this.isInObjectIdentifierExpression = true;
+        }
+        return firstNode;
     }
 
     @Override