add syntax v3 queries

NianzuLi · NianzuLi · commit 36f56175ed3d · 2024-10-18T11:43:20.000+08:00
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-1.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-1.gsql
@@ -30,7 +30,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi1(DATETIME date) SYNTAX v3{
       ELSE
         m.@lengthCategory = 3
       END
-    POST-ACCUM @@midResult += (year(epoch_to_datetime(m.creationDate/1000)), m.@isComment, m.@lengthCategory -> 1, m.length);
+    POST-ACCUM (m) @@midResult += (year(epoch_to_datetime(m.creationDate/1000)), m.@isComment, m.@lengthCategory -> 1, m.length);
 
   @@result.resize(@@midResult.size());
   FOREACH m IN @@midResult DO
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-10.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-10.gsql
@@ -17,7 +17,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi10(VERTEX<Person> personId, STRING country
       SELECT t
       FROM (s:S) -[:KNOWS]- (t:Person)
       WHERE NOT t.@visited
-      POST-ACCUM t.@visited = TRUE;
+      POST-ACCUM (t) t.@visited = TRUE;
     pathLength += 1;
   END;
   # Here, S is the Person with shortest length of 3
@@ -44,7 +44,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi10(VERTEX<Person> personId, STRING country
       FOREACH t IN m.@tags DO
         p.@messageCount += (t -> 1)
       END
-    POST-ACCUM
+    POST-ACCUM (p)
       FOREACH (t,cnt) IN p.@messageCount DO
         @@result += RESULT(p.id, t.name, cnt)
       END;
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-12.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-12.gsql
@@ -21,7 +21,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi12(DATETIME startDate, INT lengthThreshold
     SELECT p
     FROM (:M) -[:HAS_CREATOR]-> (p:Person)
     ACCUM p.@messageCount += 1
-    POST-ACCUM @@personCount += (p.@messageCount -> 1);
+    POST-ACCUM (p) @@personCount += (p.@messageCount -> 1);
 
   allPersons = {Person.*};
   diff = allPersons.size() - persons.size();
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-13.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-13.gsql
@@ -42,7 +42,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi13(STRING country, DATETIME endDate) SYNTA
   
   zombies =
     SELECT z FROM (z:zombies)
-    POST-ACCUM
+    POST-ACCUM (z)
       IF z.@totalLikeCount > 0 THEN
         @@result += RESULT(z.id, z.@zombieLikeCount, z.@totalLikeCount, 1.0 * z.@zombieLikeCount / z.@totalLikeCount)
       ELSE
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-14.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-14.gsql
@@ -45,15 +45,15 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi14(STRING country1, STRING country2) SYNTA
   tmp = SELECT p1 FROM (m2:M2) <-[:LIKES]- (p1:Person)
     WHERE p1.@valid
     ACCUM p1.@p2s3 += m2.@p2s3
-    POST-ACCUM p1.@p2s3 = (p1.@p2s3 INTERSECT p1.@knows);
+    POST-ACCUM (p1) p1.@p2s3 = (p1.@p2s3 INTERSECT p1.@knows);
 
   # Case 4
   M2 = SELECT m2 FROM (p2:P2) -[:LIKES]-> (m2)
     ACCUM m2.@p2s4 += p2;
   tmp = SELECT p1 FROM (m2:M2) -[:HAS_CREATOR]-> (p1:Person)
     WHERE p1.@valid
     ACCUM p1.@p2s4 += m2.@p2s4
-    POST-ACCUM p1.@p2s4 = (p1.@p2s4 INTERSECT p1.@knows);
+    POST-ACCUM (p1) p1.@p2s4 = (p1.@p2s4 INTERSECT p1.@knows);
   
   P1 = SELECT p1 FROM (p1:P1)
     ACCUM
@@ -63,7 +63,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi14(STRING country1, STRING country2) SYNTA
       FOREACH p2 IN p1.@p2s4 DO
         p1.@score += (p2 -> 1)
       END
-    POST-ACCUM
+    POST-ACCUM (p1)
       FOREACH (p2,score) IN p1.@score DO
         p1.@pScore += ps(p2.id,score)
       END;
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-16.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-16.gsql
@@ -48,7 +48,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi16(STRING tagA, DATETIME dateA,
   persons =
     SELECT p
     FROM (p:persons)
-    POST-ACCUM @@result += RESULT(p.id, p.@messageCountA, p.@messageCountB, p.@messageCountA+p.@messageCountB);
+    POST-ACCUM (p) @@result += RESULT(p.id, p.@messageCountA, p.@messageCountB, p.@messageCountA+p.@messageCountB);
 
   PRINT @@result as result;
 }
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-17.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-17.gsql
@@ -54,7 +54,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi17(STRING tag, INT delta) SYNTAX v3 {
     FROM  (m:messages2) -[:REPLY_OF]-> (m2)
     WHERE m2.@hasTag AND m.@creator != m2.@creator
     ACCUM m2.@Forum1 += (m2.@CreatorForums INTERSECT m.@CreatorForums)
-    POST-ACCUM m2.@Forum1.remove(m2.@forum)
+    POST-ACCUM (m2) m2.@Forum1.remove(m2.@forum)
     HAVING m2.@Forum1.size() > 0;
     
   message2 = 
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-18.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-18.gsql
@@ -23,7 +23,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi18(STRING tag) SYNTAX v3 {
     FROM (p1:person1) -[:KNOWS]- (:Person) -[:KNOWS]- (p2:Person)
     WHERE p2.@hasInterest AND NOT p2.@exclude.contains(p1)
     ACCUM p2.@mutualFriendCount += (p1 -> 1)
-    POST-ACCUM 
+    POST-ACCUM (p2)
       FOREACH (p,num) IN p2.@mutualFriendCount DO
         @@result += RESULT(p.id, p2.id, num)
       END;
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-2.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-2.gsql
@@ -23,7 +23,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi2(DATETIME date, STRING tagClass) SYNTAX v
       ELSE 
         t.@countWindow2 += 1
       END
-    POST-ACCUM
+    POST-ACCUM (t)
       @@result += RESULT(t.name, t.@countWindow1, t.@countWindow2, abs(t.@countWindow1 - t.@countWindow2));
 
   tmp =
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-3.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-3.gsql
@@ -27,7 +27,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi3(STRING tagClass, STRING country) SYNTAX
     FROM (p:posts) <-[:CONTAINER_OF]- (f:Forum)
     WHERE f.@selected
     ACCUM f.@messageCount += p.@messageCount
-    POST-ACCUM @@result += RESULT(f.id, f.title, ms_to_string(f.creationDate), f.@personId, f.@messageCount);
+    POST-ACCUM (f) @@result += RESULT(f.id, f.title, ms_to_string(f.creationDate), f.@personId, f.@messageCount);
 
   PRINT @@result as result;
 }
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-5.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-5.gsql
@@ -20,7 +20,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi5(STRING tag) SYNTAX v3 {
       p.@replyCount += m.@replyCount,
       p.@likeCount += m.@likeCount,
       p.@messageCount += 1
-    POST-ACCUM
+    POST-ACCUM (p)
       @@result += RESULT(p.id, p.@replyCount, p.@likeCount, p.@messageCount,
         p.@messageCount + 2*p.@replyCount + 10*p.@likeCount);
 
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-6.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-6.gsql
@@ -13,7 +13,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi6(STRING tag) SYNTAX v3 {
     
   person1 = SELECT p1 FROM (m:message1) -[:HAS_CREATOR]-> (p1:Person)
     ACCUM p1.@pScore += m.@pScore
-    POST-ACCUM 
+    POST-ACCUM (p1)
       FOREACH (p,score) IN p1.@pScore DO
         p1.@authorityScore += score
       END,
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-7.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-7.gsql
@@ -18,7 +18,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi7(STRING tag) SYNTAX v3 {
     SELECT t
     FROM  (r:repliesWithoutTag) -[:HAS_TAG]-> (t:Tag)
     ACCUM t.@count += 1
-    POST-ACCUM @@result += RESULT(t.name, t.@count);
+    POST-ACCUM (t) @@result += RESULT(t.name, t.@count);
 
   PRINT @@result as result;
 }
diff --git a/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-9.gsql b/tools/ldbc_benchmark/tigergraph/queries/business_intelligence/syntax_v3/bi-9.gsql
@@ -19,7 +19,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi9(DATETIME startDate, DATETIME endDate) SY
     ACCUM
       p.@threadCount += 1,
       p.@messageCount += t.@messageCount + 1
-    POST-ACCUM
+    POST-ACCUM (p)
       @@result += RESULT(p.id, p.firstName, p.lastName, p.@threadCount, p.@messageCount);
 
   PRINT @@result as result;
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic12_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic12_v3.gsql
@@ -13,7 +13,7 @@ CREATE OR REPLACE QUERY ic12_v3(vertex<Person> personId, string tagClass) syntax
           -[:HAS_TYPE]-> (:TagClass) -[:IS_SUBCLASS_OF*0..]-> (tc:TagClass {name:tagClass})
     PER(p,c,t)
     ACCUM p.@replySet += c, p.@tagNames += t.name
-    POST-ACCUM p.@replyCount = p.@replySet.size(), p.@replySet.clear()
+    POST-ACCUM (p) p.@replyCount = p.@replySet.size(), p.@replySet.clear()
     ORDER BY p.@replyCount DESC, p.id ASC
     LIMIT 20;
 
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic4_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic4_v3.gsql
@@ -23,7 +23,7 @@ CREATE OR REPLACE QUERY ic4_v3(VERTEX<Person> personId, DATETIME startDate, INT
         WHEN m.creationDate < startDate THEN
           @@tagsExc += t
       END
-    POST-ACCUM CASE WHEN t.@postCount > 0 THEN @@tagsFav += t END;
+    POST-ACCUM (t) CASE WHEN t.@postCount > 0 THEN @@tagsFav += t END;
 
   @@tagsFav = @@tagsFav MINUS @@tagsExc;
   vTag = { @@tagsFav };
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic5_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic5_v3.gsql
@@ -20,7 +20,7 @@ CREATE OR REPLACE QUERY ic5_v3(VERTEX<Person> personId, DATETIME startDate) synt
     SELECT t
     FROM (s:vFriend)<-[:HAS_CREATOR]-(:Post)<-[:CONTAINER_OF]-(t:vForum)
     ACCUM CASE WHEN s.id IN t.@memberIds THEN t.@postCount += 1 END
-    POST-ACCUM @@result += forumInfo(t.title, t.@postCount, t.id);
+    POST-ACCUM (t) @@result += forumInfo(t.title, t.@postCount, t.id);
     
   PRINT @@result;
 }
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic6_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic6_v3.gsql
@@ -15,7 +15,7 @@ CREATE OR REPLACE QUERY ic6_v3(VERTEX<Person> personId, STRING tag) syntax v3{
     FROM (:vPost)-[:HAS_TAG]->(t:Tag)
     WHERE t.name != tag
     ACCUM t.@postCount += 1
-    POST-ACCUM @@result += tagStats(t.name, t.@postCount);
+    POST-ACCUM (t) @@result += tagStats(t.name, t.@postCount);
     
   PRINT @@result;
 }
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic9_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_complex/syntax_v3/ic9_v3.gsql
@@ -18,7 +18,7 @@ CREATE OR REPLACE QUERY ic9_v3(VERTEX<Person> personId, DATETIME date) syntax v3
       m.@personId = p.id,
       m.@personFirstName = p.firstName,
       m.@personLastName = p.lastName
-    POST-ACCUM
+    POST-ACCUM (m)
       IF m.type == "Comment" OR m.content != "" THEN 
         @@result += msgInfo(m.@personId, m.@personFirstName, m.@personLastName, m.id, m.content, m.creationDate)
       ELSE 
diff --git a/tools/ldbc_benchmark/tigergraph/queries/interactive_short/syntax_v3/is2_v3.gsql b/tools/ldbc_benchmark/tigergraph/queries/interactive_short/syntax_v3/is2_v3.gsql
@@ -28,7 +28,7 @@ CREATE OR REPLACE QUERY is2_v3(VERTEX<Person> personId) syntax v3{
       s.@authorOgId = t2.id,
       s.@authorOgFN = t2.firstName,
       s.@authorOgLN = t2.lastName
-    POST-ACCUM @@result += ogPostInfo(s.id, s.@messageContent, 
+    POST-ACCUM (s) @@result += ogPostInfo(s.id, s.@messageContent,
             s.creationDate, s.@postId, s.@authorOgId, s.@authorOgFN, s.@authorOgLN);
 
   PRINT @@result;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi16(STRING tagA, DATETIME dateA,`
`48`	`48`	`persons =`
`49`	`49`	`SELECT p`
`50`	`50`	`FROM (p:persons)`
`51`		`- POST-ACCUM @@result += RESULT(p.id, p.@messageCountA, p.@messageCountB, p.@messageCountA+p.@messageCountB);`
	`51`	`+ POST-ACCUM (p) @@result += RESULT(p.id, p.@messageCountA, p.@messageCountB, p.@messageCountA+p.@messageCountB);`
`52`	`52`
`53`	`53`	`PRINT @@result as result;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ CREATE OR REPLACE DISTRIBUTED QUERY bi3(STRING tagClass, STRING country) SYNTAX`
`27`	`27`	`FROM (p:posts) <-[:CONTAINER_OF]- (f:Forum)`
`28`	`28`	`WHERE f.@selected`
`29`	`29`	`ACCUM f.@messageCount += p.@messageCount`
`30`		`- POST-ACCUM @@result += RESULT(f.id, f.title, ms_to_string(f.creationDate), f.@personId, f.@messageCount);`
	`30`	`+ POST-ACCUM (f) @@result += RESULT(f.id, f.title, ms_to_string(f.creationDate), f.@personId, f.@messageCount);`
`31`	`31`
`32`	`32`	`PRINT @@result as result;`
`33`	`33`	`}`