DOC-2415: Updated FROM syntax to v3

modules/appendix/examples/computer_net/select_statement_index_sample_edges_per_source_vertex.gsql

@@ -9,7 +9,7 @@ CREATE QUERY sample_ex_3() FOR GRAPH Computer_Net {
     start = {Computer.*};
 
     // Sample one outgoing edge per source vertex = Random Walk
-    abs_sample = SELECT v FROM start:s -(:e)- :v
+    abs_sample = SELECT v FROM (s:start) -[e]- (v)
         SAMPLE 1 EDGE WHEN s.outdegree() >= 1    // sample 1 target vertex from each source vertex
         ACCUM
             @@abs_edges += (s.id -> v.id),

modules/appendix/examples/friend_net/select_statement_index_limit_lower_bound_and_size.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY limit_ex_2 (INT j, INT k) FOR GRAPH Friend_Net
 {
     start = {Person.*};
-    result2 = SELECT v FROM start:v
+    result2 = SELECT v FROM (v:start)
       ORDER BY v.id
       LIMIT j, k;
 

modules/appendix/examples/friend_net/select_statement_index_limit_with_offset.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY limit_ex_3 (INT j, INT k) FOR GRAPH Friend_Net {
     start = {Person.*};
 
-    result3 = SELECT v FROM start:v
+    result3 = SELECT v FROM (v:start)
       ORDER BY v.id
       LIMIT k OFFSET j;
 

modules/appendix/examples/friend_net/select_statement_index_limt_by.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY limit_ex_1 (INT k) FOR GRAPH Friend_Net {
     start = {Person.*};
 
-    result1 = SELECT v FROM start:v
+    result1 = SELECT v FROM (v:start)
       ORDER BY v.id
       LIMIT k;
 

modules/appendix/examples/friend_net/select_statement_index_order_by_descending.gsql

@@ -3,7 +3,7 @@ CREATE QUERY top_popular() FOR GRAPH Friend_Net {
 	SumAccum<INT> @num_coworkers;
 	start = {Person.*};
 
-	result = SELECT v FROM start -((Friend|Coworker):e)- Person:v
+	result = SELECT v FROM (start) -[e:Friend|Coworker]- (v:Person)
       ACCUM CASE
           WHEN e.type == "Friend" THEN v.@num_friends += 1
           WHEN e.type == "Coworker" THEN v.@num_coworkers += 1

modules/appendix/examples/ldbc_snb/select_statement_accum.gsql

@@ -3,9 +3,9 @@ CREATE QUERY accum_wrong_example() SYNTAX v2 {
     SumAccum<INT> @active_flag = 0;
 
     result = SELECT p
-             FROM Person: p - (KNOWS) - Person: w
+             FROM (p:Person) -[KNOWS]-> (w:Person)
              WHERE w.lastName == "Wang" AND p.firstName == "Peter"
              ACCUM p.@active_flag += 1,
-                   @@count_total += p.@active_flag; // <1>
+                   @@count_total += p.@active_flag;
     PRINT @@count_total, result[result.@active_flag];
 }

modules/appendix/examples/ldbc_snb/select_statement_accum_2.gsql

@@ -3,7 +3,7 @@ CREATE QUERY accum_example() SYNTAX v2 {
     SumAccum<INT> @active_flag = 0;
 
     result = SELECT p
-             FROM Person: p - (KNOWS) - Person: w
+             FROM (p:Person) -[KNOWS]-> (w:Person)
              WHERE w.lastName == "Wang" AND p.firstName == "Peter"
              ACCUM p.@active_flag += 1
              POST-ACCUM @@count_total += p.@active_flag;

modules/appendix/examples/ldbc_snb/select_statement_index_three_post_accum_clauses.gsql

@@ -4,14 +4,14 @@ INTERPRET QUERY () {
     SumAccum<INT> @cnt2;
     SumAccum<INT> @@global_t_count;
 
-    R   =  SELECT s
-        FROM Person:s-(Likes>) -:msg - (Has_Creator>)-Person:t
+    R = SELECT s
+        FROM (s:Person) -[Likes>]- :msg -[Has_Creator>]- (t:Person)
         WHERE s.first_name == "Viktor" AND s.last_name == "Akhiezer"
           AND t.last_name LIKE "S%" AND year(msg.creation_date) == 2012
-        ACCUM s.@cnt1 +=1 //execute this per match of the FROM pattern.
-        POST-ACCUM s.@cnt2 += s.@cnt1 // <1>
-        POST-ACCUM t.@cnt2 +=1 // <2>
-        POST-ACCUM(t) @@global_t_count += 1; // <3>
+        ACCUM s.@cnt1 +=1
+        POST-ACCUM s.@cnt2 += s.@cnt1
+        POST-ACCUM t.@cnt2 +=1
+        POST-ACCUM(t) @@global_t_count += 1;
 
-        PRINT R [R.first_name, R.last_name, R.@cnt1, R.@cnt2];
+    PRINT R [R.first_name, R.last_name, R.@cnt1, R.@cnt2];
 }

modules/appendix/examples/social_net/select_statement_index_accum_vertex_accum_edge.gsql

@@ -5,10 +5,10 @@ CREATE QUERY user_posts_2() FOR GRAPH Social_Net {
     start = {Person.*};
 
     // Find all user post topics and append them to the vertex list accum
-    user_postings = SELECT s FROM start:s -(Posted)- :g
+    user_postings = SELECT s FROM (s:start) -[Posted]- (g)
         ACCUM s.@person_posts += g;
 
-    user_postings = SELECT s from start:s -(Liked:e)- :g
+    user_postings = SELECT s FROM (s:start) -[Liked:e]- (g)
         ACCUM s.@person_liked_info += e;
 
     PRINT start;

modules/appendix/examples/social_net/select_statement_index_global_accum.gsql

@@ -4,7 +4,7 @@ CREATE QUERY user_posts_by_topic() FOR GRAPH Social_Net {
     start = {Person.*};
 
     // Append subject and update the appearance count in the global map accum
-    posts = SELECT g FROM start -(Posted)- :g
+    posts = SELECT g FROM (start) -[Posted]- (g)
         ACCUM @@post_topic_counts += (g.subject -> 1);
 
     PRINT @@post_topic_counts;

modules/appendix/examples/social_net/select_statement_index_global_post_accum.gsql

@@ -5,7 +5,7 @@ CREATE QUERY person_gender(STRING gender) FOR GRAPH Social_Net {
     start = {ANY};
 
     // Select all person vertices and check the gender attribute
-    friends = SELECT v FROM start:v
+    friends = SELECT v FROM (v:start)
         WHERE v.type == "Person"
         POST-ACCUM (v) CASE
             WHEN (v.gender == gender) THEN

modules/appendix/examples/social_net/select_statement_index_having.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY active_members (INT activity_threshold) FOR GRAPH Social_Net {
     SumAccum<INT> @activity_amount;
     start = {Person.*};
-    result = SELECT v FROM start:v -(:e)- Post:tgt
+    result = SELECT v FROM (v:start) -[e:]- (tgt:Post)
         ACCUM v.@activity_amount +=1
         HAVING v.@activity_amount >= activity_threshold;
     PRINT result;

modules/appendix/examples/social_net/select_statement_index_having_literal.gsql

@@ -4,11 +4,11 @@ CREATE QUERY print_member_activity() FOR GRAPH Social_Net
     start = {Person.*};
 
     /* --- equivalent statements -----
-    result = SELECT v FROM start:v -(:e)- Post:tgt
+    result = SELECT v FROM (v:start) -[e]- (tgt:Post)
         ACCUM v.@activity_amount +=1
         HAVING true; */
 
-    result = SELECT v FROM start:v -(:e)- Post:tgt
+    result = SELECT v FROM (v:start) -[e]- (tgt:Post)
         ACCUM v.@activity_amount +=1;
 
     PRINT result;

modules/appendix/examples/social_net/select_statement_index_having_vs_where.gsql

@@ -3,11 +3,11 @@ CREATE QUERY active_male_members() FOR GRAPH Social_Net
     SumAccum<INT> @activity_amount;
     start = {Person.*};
     // The two statements produce equivalent results
-    result1 = SELECT v FROM start:v -(:e)- Post:tgt
+    result1 = SELECT v FROM (v:start) -[e:]-> (tgt:Post)
         WHERE v.gender == "Male"
         ACCUM v.@activity_amount +=1;
 
-    result2 = SELECT v FROM start:v -(:e)- Post:tgt
+    result2 = SELECT v FROM (v:start) -[e:]-> (tgt:Post)
         ACCUM v.@activity_amount +=1
         HAVING v.gender == "Male";
 

modules/appendix/examples/social_net/select_statement_index_multiple_edge_type_accum_compilable.gsql

@@ -2,7 +2,7 @@ CREATE QUERY multiple_edge_type_check_ex_2(VERTEX<Person> m1) FOR GRAPH Social_N
     ListAccum<STRING> @@test_list1;
     all_user = {m1};
     all_user = SELECT s
-        FROM all_user:s - ((Posted|Liked|Friend):e) - (Post|Person):t
+        FROM (all_user:s) -[e:Posted|Liked|Friend]- (t:Post|Person)
         ACCUM CASE
             WHEN e.type == "Liked" THEN    // for Liked edges
                 @@test_list1 += to_string(datetime_to_epoch(e.action_time))

modules/appendix/examples/social_net/select_statement_index_multiple_edge_type_accum_error.gsql

@@ -2,7 +2,7 @@ CREATE QUERY multiple_edge_type_check_ex (VERTEX<Person> m1) FOR GRAPH Social_Ne
     ListAccum<STRING> @@test_list_1, @@test_list_2, @@test_list_3;
     all_user = {m1};
     all_user = SELECT s
-    FROM all_user:s - ((Posted|Liked|Friend):e) - (Post|Person):t
+    FROM (all_user:s) -[e:Posted|Liked|Friend]- (t:Post|Person)
     ACCUM @@test_list_1 += to_string(datetime_to_epoch(e.action_time)),
       @@test_list_2 += t.gender,
       @@test_list_3 += to_string(datetime_to_epoch(e.action_time)) + t.gender // <1>

modules/appendix/examples/social_net/select_statement_index_updating_indirect_reference_vertex.gsql

@@ -6,14 +6,14 @@ CREATE QUERY v_update_indirect_accum() FOR GRAPH Social_Net {
     persons = {Person.*};
     // To each post, attach a list of persons who liked the post
     liked_posts = SELECT p
-        FROM persons:src -(Liked:e)- Post:p
+        FROM (src:persons) -[e:Liked]-> (p:Post)
         ACCUM
         p.@posters += src;
 
     // To each person who liked a post, attach a list of everyone
     // who also liked one of this person's liked posts.
     liked_posts = SELECT src
-        FROM liked_posts:src
+        FROM (src:liked_posts)
         ACCUM
             FOREACH v IN src.@posters DO
                 v.@fellows += src.@posters

modules/appendix/examples/social_net/select_statement_index_vertex_accum_example.gsql

@@ -4,7 +4,7 @@ CREATE QUERY user_posts() FOR GRAPH Social_Net {
     start = {Person.*};
 
     // Find all user post topics and append them to the vertex list accum
-    user_postings = SELECT s FROM start:s -(Posted)- :g
+    user_postings = SELECT s FROM (s:start) -[Posted]- (g)
         ACCUM s.@person_posts += g.subject;
 
   PRINT user_postings;

modules/appendix/examples/social_net/select_statement_index_where.gsql

@@ -1,5 +1,5 @@
 CREATE QUERY print_cat_posts() FOR GRAPH Social_Net {
-	cat_posts = SELECT v FROM Post:v		// select only those post vertices
+	cat_posts = SELECT v FROM (v:Post)		// select only those post vertices
         WHERE v.subject == "cats";  // which have a subset of 'cats'
 	PRINT cat_posts;
 }

modules/appendix/examples/social_net/select_statement_index_where_and_or.gsql

@@ -5,42 +5,42 @@ CREATE QUERY find_female_members() FOR GRAPH Social_Net
     // are equivalent (i.e., produce the same results)
 
 	all_vertices = {ANY}; # includes all posts and person
-	females = SELECT v FROM all_vertices:v
+	females = SELECT v FROM (all_vertices:v)
         WHERE v.type == "Person" AND v.gender != "Male";
 
-	females = SELECT v FROM all_vertices:v
+	females = SELECT v FROM (all_vertices:v)
         WHERE v.type == "Person" AND v.gender == "Female";
 
-	females = SELECT v FROM all_vertices:v
+	females = SELECT v FROM (all_vertices:v)
         WHERE v.type == "Person" AND
         NOT v.gender == "Male";
 
-	females = SELECT v FROM all_vertices:v
+	females = SELECT v FROM (all_vertices:v)
         WHERE v.type != "Post" AND
         NOT v.gender == "Male";
 
   	/* does not compile. cannot use NOT operator in combination with type attribute
-	 females = SELECT v FROM all_vertices:v
-		  WHERE NOT v.type   != "Person" AND
-		  	    NOT v.gender == "Male";
+	 females = SELECT v FROM (all_vertices:v)
+         WHERE NOT v.type != "Person" AND
+             NOT v.gender == "Male";
 
   	 does not compile. cannot use NOT operator in combination with type attribute
-     females = SELECT v FROM all_vertices:v
-        WHERE NOT v.type   == "Post" AND
-        NOT v.gender == "Male"; */
+     females = SELECT v FROM (all_vertices:v)
+         WHERE NOT v.type == "Post" AND
+         NOT v.gender == "Male";
 
-	person_vertices = {Person.*};
-	females = SELECT v FROM person_vertices:v
-		   WHERE NOT v.gender == "Male";
+	pperson_vertices = {Person.*};
+     females = SELECT v FROM (person_vertices:v)
+            WHERE NOT v.gender == "Male";
 
-	females = SELECT v FROM person_vertices:v
-		   WHERE v.gender != "Male";
+     females = SELECT v FROM (person_vertices:v)
+            WHERE v.gender != "Male";
 
-	females = SELECT v FROM person_vertices:v
-		   WHERE v.gender != "Male" AND true;
+     females = SELECT v FROM (person_vertices:v)
+            WHERE v.gender != "Male" AND true;
 
-	females = SELECT v FROM person_vertices:v
-		   WHERE v.gender != "Male" OR false;
+     females = SELECT v FROM (person_vertices:v)
+            WHERE v.gender != "Male" OR false;
 
 	PRINT females;
 }

modules/appendix/examples/social_net/select_statement_index_where_multiple_edge_type.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY multiple_edge_type_where_ex(VERTEX<Person> m1) FOR GRAPH Social_Net {
     all_user = {m1};
     filtered_user = SELECT s
-        FROM all_user:s - ((Posted|Liked|Friend):e) - (Post|Person):t
+        FROM (s:all_user) -[e:Posted|Liked|Friend]-> (t:Post|Person)
         // WHERE e.action_time > epoch_to_datetime(1) AND t.gender == "Male";
         WHERE ( e.type == "Liked" AND e.action_time > epoch_to_datetime(1) ) OR
           ( e.type == "Friend" AND t.gender == "Male" );

modules/appendix/examples/social_net/select_statement_index_where_using_in.gsql

@@ -1,5 +1,5 @@
 CREATE QUERY find_graph_focused_posts() FOR GRAPH Social_Net {
-	results = SELECT v FROM Post:v					// select only post vertices
-		WHERE v.subject IN ("Graph", "tigergraph"); // which have a subject of either 'Graph' or 'tigergraph'
-	PRINT results;
+    results = SELECT v FROM (v:Post)                  // select only post vertices
+        WHERE v.subject IN ("Graph", "tigergraph");   // which have a subject of either 'Graph' or 'tigergraph'
+    PRINT results;
 }

modules/appendix/examples/work_net/select_statement_index_absolute_number_edges.gsql

@@ -6,15 +6,15 @@ CREATE QUERY sample_ex_1() FOR GRAPH Work_Net {
 	// the 'before_sample' result set encapsulates the normal functionality of
 	// a SELECT statement, where 'times_traversed_no_sample' vertex accumulator is increased for
 	// each edge incident to the vertex.
-	before_sample = SELECT v FROM workers:t -(:e)- :v
+	before_sample = SELECT v FROM (t:workers) -[e]- (v)
         ACCUM v.@times_traversed_no_sample += 1;
 
 	// The 'after_sample' result set is formed by those vertices which can be
 	// reached when for each source vertex, only one edge is used for traversal.
 	// This is demonstrated by the values of 'times_traversed_with_sample' vertex accumulator, which
 	// is increased for each edge incident to the vertex which is used in the
 	// sample.
-	after_sample = SELECT v FROM workers:t -(:e)- :v
+	after_sample = SELECT v FROM (t:workers) -[e]- (v)
 		      SAMPLE 1 EDGE WHEN t.outdegree() >= 1		// only use 1 edge from the source vertex
 		      ACCUM v.@times_traversed_with_sample += 1;
 

modules/appendix/examples/work_net/select_statement_index_vertex_post_accum.gsql

@@ -6,7 +6,7 @@ CREATE QUERY resident_employees() FOR GRAPH Work_Net {
 
     start = {Person.*};
 
-    employees = SELECT s FROM start:s -(Works_For)- :c
+    employees = SELECT s FROM (s:start) -[Works_For]- (c)
     // If a person works for a company in the same country where they live, add the company to the list
         ACCUM CASE
             WHEN (s.location_id == c.country) THEN

modules/appendix/examples/work_net/select_statement_index_where_using_edge_attributes.gsql

@@ -1,7 +1,7 @@
 CREATE QUERY full_time_workers() FOR GRAPH Work_Net {
 	// find all workers who are full time at some company
     start = {Person.*};
-	full_time_workers = SELECT v FROM start:v -(Works_For:e)- Company:t
+	full_time_workers = SELECT v FROM (v:start) -[e:Works_For]- (t:Company)
 			WHERE e.full_time;	// full_time is a boolean attribute on the edge
 
 	PRINT full_time_workers;

modules/querying/pages/select-statement/index.adoc

@@ -194,9 +194,9 @@ In the following example, the selection conditions are completely specified in t
 .`WHERE` used as a filter
 [source,gsql]
 ----
-result_set1 = SELECT v FROM S:v-((E1|E2|E3):e)-(V1|V2):t;
-result_set2 = SELECT v FROM S:v-(:e)-:t
-    WHERE t.type IN ("V1", "V2") AND t IN v.neighbors("E1|E2|E3")
+result_set1 = SELECT v FROM (v:S) -[e:(E1|E2|E3)]- (t:V1|V2);
+result_set2 = SELECT v FROM (v:S) -[e:]- (t)
+    WHERE t.type IN ("V1", "V2") AND t IN v.neighbors("E1|E2|E3");
 ----
 
 
@@ -437,7 +437,7 @@ For example, consider the following clauses:
 
 [source,gsql]
 ----
-FROM Person:A -(Knows.Knows)- Person:C
+FROM (A:Person) -[Knows.Knows:Knows]- (C:Person)
 WHERE C.email = "[email protected]"
 ACCUM C.@pattern_count += 1
 ----
@@ -915,7 +915,7 @@ This query does not compile because the having condition is testing the wrong ve
 CREATE QUERY print_member_about_cats() FOR GRAPH Social_Net
 {
     start = {Person.*};
-    result = SELECT v FROM start:v -(:e)- Post:tgt
+    result = SELECT v FROM (v:start) -[e]- (tgt:Post)
         HAVING tgt.subject == "cats";
     PRINT result;
 }
@@ -1006,9 +1006,9 @@ There are three forms:
 .`LIMIT` scenarios
 [source.wrap,gsql]
 ----
-result = SELECT v FROM S -(:e)- :v LIMIT k; <1>
-result = SELECT v FROM S -(:e)- :v LIMIT j, k; <2>
-result = SELECT v FROM S -(:e)- :v LIMIT k OFFSET j; <3>
+result = SELECT v FROM (S) -[e]- (v) LIMIT k; <1>
+result = SELECT v FROM (S) -[e]- (v) LIMIT j, k; <2>
+result = SELECT v FROM (S) -[e]- (v) LIMIT k OFFSET j; <3>
 ----
 <1> Case 1: k = Count
 <2> Case 2: j = Offset from the start of the list, k = Count