Skip to content

Commit 1ea370d

Browse files
kirill-stepanishinkirill-stepanishin
committed
improve consistency between root-level and glv-level examples
1 parent 452d10d commit 1ea370d

File tree

6 files changed

+57
-62
lines changed

6 files changed

+57
-62
lines changed

‎glv-examples/gremlin-go/basic_gremlin.go‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,23 @@ package main
2121

2222
import (
2323
"fmt"
24+
"os"
2425

2526
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2627
)
2728

29+
var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
30+
var vertexLabel = getEnv("VERTEX_LABEL", "person")
31+
32+
func getEnv(key, defaultValue string) string {
33+
if value := os.Getenv(key); value != "" {
34+
return value
35+
}
36+
return defaultValue
37+
}
38+
2839
func main() {
29-
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
40+
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
3041
if err != nil {
3142
fmt.Println(err)
3243
return
@@ -35,9 +46,9 @@ func main() {
3546
g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
3647

3748
// Basic Gremlin: adding and retrieving data
38-
v1, err := g.AddV("person").Property("name", "marko").Next()
39-
v2, err := g.AddV("person").Property("name", "stephen").Next()
40-
v3, err := g.AddV("person").Property("name", "vadas").Next()
49+
v1, err := g.AddV(vertexLabel).Property("name", "marko").Next()
50+
v2, err := g.AddV(vertexLabel).Property("name", "stephen").Next()
51+
v3, err := g.AddV(vertexLabel).Property("name", "vadas").Next()
4152
v1Vertex, err := v1.GetVertex()
4253
v2Vertex, err := v2.GetVertex()
4354
v3Vertex, err := v3.GetVertex()
@@ -58,11 +69,11 @@ func main() {
5869
}
5970

6071
// Retrieve the data from the "marko" vertex
61-
marko, err := g.V().Has("person", "name", "marko").Values("name").Next()
72+
marko, err := g.V().Has(vertexLabel, "name", "marko").Values("name").Next()
6273
fmt.Println("name:", marko.GetString())
6374

6475
// Find the "marko" vertex and then traverse to the people he "knows" and return their data
65-
peopleMarkoKnows, err := g.V().Has("person", "name", "marko").Out("knows").Values("name").ToList()
76+
peopleMarkoKnows, err := g.V().Has(vertexLabel, "name", "marko").Out("knows").Values("name").ToList()
6677
for _, person := range peopleMarkoKnows {
6778
fmt.Println("marko knows", person.GetString())
6879
}

‎glv-examples/gremlin-go/connections.go‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,29 @@ package main
2121

2222
import (
2323
"fmt"
24+
"os"
2425

2526
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2627
)
2728

29+
var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
30+
var vertexLabel = getEnv("VERTEX_LABEL", "connection")
31+
32+
func getEnv(key, defaultValue string) string {
33+
if value := os.Getenv(key); value != "" {
34+
return value
35+
}
36+
return defaultValue
37+
}
38+
2839
func main() {
2940
withRemote()
3041
withConfigs()
3142
}
3243

3344
func withRemote() {
34-
// Creating the connection to the server
35-
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
45+
// Creating the connection to the server
46+
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
3647

3748
// Error handling
3849
if err != nil {
@@ -43,22 +54,18 @@ func withRemote() {
4354
// Cleanup
4455
defer driverRemoteConnection.Close()
4556

46-
// Creating the graph traversal
57+
// Creating the graph traversal
4758
g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
4859

49-
// Drop existing vertices
50-
prom := g.V().Drop().Iterate()
51-
<-prom
52-
53-
// Simple query to verify connection
54-
g.AddV("connection").Iterate()
55-
count, _ := g.V().HasLabel("connection").Count().Next()
56-
fmt.Println("Vertex count:", *count)
60+
// Simple query to verify connection
61+
g.AddV(vertexLabel).Iterate()
62+
count, _ := g.V().HasLabel(vertexLabel).Count().Next()
63+
fmt.Println("Vertex count:", *count)
5764
}
5865

5966
func withConfigs() {
6067
// Connecting to the server with customized configurations
61-
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin",
68+
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL,
6269
func(settings *gremlingo.DriverRemoteConnectionSettings) {
6370
settings.TraversalSource = "g"
6471
settings.NewConnectionThreshold = 4
@@ -75,7 +82,7 @@ func withConfigs() {
7582
defer driverRemoteConnection.Close()
7683
g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
7784

78-
g.AddV("connection").Iterate()
79-
count, _ := g.V().HasLabel("connection").Count().Next()
80-
fmt.Println("Vertex count:", *count)
81-
}
85+
g.AddV(vertexLabel).Iterate()
86+
count, _ := g.V().HasLabel(vertexLabel).Count().Next()
87+
fmt.Println("Vertex count:", *count)
88+
}

‎glv-examples/gremlin-go/modern_traversals.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,25 @@ package main
2121

2222
import (
2323
"fmt"
24+
"os"
2425

2526
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2627
)
2728

2829
var __ = gremlingo.T__
2930
var T = gremlingo.T
3031
var P = gremlingo.P
32+
var serverURL = getEnv("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
33+
34+
func getEnv(key, defaultValue string) string {
35+
if value := os.Getenv(key); value != "" {
36+
return value
37+
}
38+
return defaultValue
39+
}
3140

3241
func main() {
33-
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection("ws://localhost:8182/gremlin")
42+
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
3443
if err != nil {
3544
fmt.Println(err)
3645
return

‎gremlin-go/examples/basic_gremlin.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,14 @@ package main
2121

2222
import (
2323
"fmt"
24-
"os"
2524

2625
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2726
)
2827

29-
func getEnvOrDefaultString(key string, defaultValue string) string {
30-
value := os.Getenv(key)
31-
if len(value) != 0 {
32-
return value
33-
}
34-
return defaultValue
35-
}
28+
var serverURL = "ws://localhost:8182/gremlin"
29+
var vertexLabel = "person"
3630

3731
func main() {
38-
serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
39-
vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "person")
4032
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
4133
if err != nil {
4234
fmt.Println(err)

‎gremlin-go/examples/connections.go‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,19 @@ package main
2121

2222
import (
2323
"fmt"
24-
"os"
2524

2625
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2726
)
2827

29-
func getEnvOrDefaultString(key string, defaultValue string) string {
30-
value := os.Getenv(key)
31-
if len(value) != 0 {
32-
return value
33-
}
34-
return defaultValue
35-
}
28+
var serverURL = "ws://localhost:8182/gremlin"
29+
var vertexLabel = "connection"
3630

3731
func main() {
3832
withRemote()
3933
withConfigs()
4034
}
4135

4236
func withRemote() {
43-
serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
44-
vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "connection")
45-
4637
// Creating the connection to the server
4738
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
4839

@@ -60,17 +51,11 @@ func withRemote() {
6051

6152
// Simple query to verify connection
6253
g.AddV(vertexLabel).Iterate()
63-
count, _ := g.V().Count().Next()
54+
count, _ := g.V().HasLabel(vertexLabel).Count().Next()
6455
fmt.Println("Vertex count:", *count)
65-
66-
// clean added data
67-
g.V().HasLabel(vertexLabel).Drop().Iterate()
6856
}
6957

7058
func withConfigs() {
71-
serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
72-
vertexLabel := getEnvOrDefaultString("VERTEX_LABEL", "connection")
73-
7459
// Connecting to the server with customized configurations
7560
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL,
7661
func(settings *gremlingo.DriverRemoteConnectionSettings) {
@@ -90,6 +75,6 @@ func withConfigs() {
9075
g := gremlingo.Traversal_().WithRemote(driverRemoteConnection)
9176

9277
g.AddV(vertexLabel).Iterate()
93-
count, _ := g.V().Count().Next()
78+
count, _ := g.V().HasLabel(vertexLabel).Count().Next()
9479
fmt.Println("Vertex count:", *count)
9580
}

‎gremlin-go/examples/modern_traversals.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,16 @@ package main
2121

2222
import (
2323
"fmt"
24-
"os"
2524

2625
"github.com/apache/tinkerpop/gremlin-go/v3/driver"
2726
)
2827

2928
var __ = gremlingo.T__
3029
var T = gremlingo.T
3130
var P = gremlingo.P
32-
33-
func getEnvOrDefaultString(key string, defaultValue string) string {
34-
value := os.Getenv(key)
35-
if len(value) != 0 {
36-
return value
37-
}
38-
return defaultValue
39-
}
31+
var serverURL = "ws://localhost:8182/gremlin"
4032

4133
func main() {
42-
serverURL := getEnvOrDefaultString("GREMLIN_SERVER_URL", "ws://localhost:8182/gremlin")
4334
driverRemoteConnection, err := gremlingo.NewDriverRemoteConnection(serverURL)
4435
if err != nil {
4536
fmt.Println(err)

0 commit comments

Comments
 (0)