multi label api change

Author: AviAvni

client_test.go

@@ -16,8 +16,8 @@ func createGraph() {
 	graph = GraphNew("social", conn)
 
 	// Create 2 nodes connect via a single edge.
-	japan := NodeNew("Country", "j", nil)
-	john := NodeNew("Person", "p", nil)
+	japan := NodeNew([]string{"Country"}, "j", nil)
+	john := NodeNew([]string{"Person"}, "p", nil)
 	edge := EdgeNew("Visited", john, japan, nil)
 
 	// Set node properties.
@@ -91,9 +91,9 @@ func checkQueryResults(t *testing.T, res *QueryResult) {
 	d, ok := r.GetByIndex(2).(*Node)
 	assert.True(t, ok, "Third column should contain nodes.")
 
-	assert.Equal(t, s.Label, "Person", "Node should be of type 'Person'")
+	assert.Equal(t, s.Labels[0], "Person", "Node should be of type 'Person'")
 	assert.Equal(t, e.Relation, "Visited", "Edge should be of relation type 'Visited'")
-	assert.Equal(t, d.Label, "Country", "Node should be of type 'Country'")
+	assert.Equal(t, d.Labels[0], "Country", "Node should be of type 'Country'")
 
 	assert.Equal(t, len(s.Properties), 4, "Person node should have 4 properties")
 
@@ -131,7 +131,7 @@ func TestCreateQuery(t *testing.T) {
 	res.Next()
 	r := res.Record()
 	w := r.GetByIndex(0).(*Node)
-	assert.Equal(t, w.Label, "WorkPlace", "Unexpected node label.")
+	assert.Equal(t, w.Labels[0], "WorkPlace", "Unexpected node label.")
 }
 
 func TestCreateROQueryFailure(t *testing.T) {
@@ -199,8 +199,8 @@ func TestArray(t *testing.T) {
 		t.Error(err)
 	}
 
-	a := NodeNew("person", "", nil)
-	b := NodeNew("person", "", nil)
+	a := NodeNew([]string{"person"}, "", nil)
+	b := NodeNew([]string{"person"}, "", nil)
 
 	a.SetProperty("name", "a")
 	a.SetProperty("age", 32)
@@ -288,9 +288,9 @@ func TestPath(t *testing.T) {
 	e := p.GetEdge(0)
 	d := p.LastNode()
 
-	assert.Equal(t, s.Label, "Person", "Node should be of type 'Person'")
+	assert.Equal(t, s.Labels[0], "Person", "Node should be of type 'Person'")
 	assert.Equal(t, e.Relation, "Visited", "Edge should be of relation type 'Visited'")
-	assert.Equal(t, d.Label, "Country", "Node should be of type 'Country'")
+	assert.Equal(t, d.Labels[0], "Country", "Node should be of type 'Country'")
 
 	assert.Equal(t, len(s.Properties), 4, "Person node should have 4 properties")
 
@@ -308,12 +308,12 @@ func TestPath(t *testing.T) {
 
 func TestParameterizedQuery(t *testing.T) {
 	createGraph()
-	params := []interface{}{1, 2.3, "str", true, false, nil, []interface {}{0, 1, 2}, []interface {}{"0", "1", "2"}}
+	params := []interface{}{1, 2.3, "str", true, false, nil, []interface{}{0, 1, 2}, []interface{}{"0", "1", "2"}}
 	q := "RETURN $param"
 	params_map := make(map[string]interface{})
 	for index, param := range params {
 		params_map["param"] = param
-		res, err := graph.ParameterizedQuery(q, params_map);
+		res, err := graph.ParameterizedQuery(q, params_map)
 		if err != nil {
 			t.Error(err)
 		}
@@ -348,24 +348,24 @@ func TestCreateIndex(t *testing.T) {
 func TestQueryStatistics(t *testing.T) {
 	graph.Flush()
 	err := graph.Delete()
-	assert.Nil(t,err)
+	assert.Nil(t, err)
 
 	q := "CREATE (:Person{name:'a',age:32,array:[0,1,2]})"
 	res, err := graph.Query(q)
-	assert.Nil(t,err)
+	assert.Nil(t, err)
 
 	assert.Equal(t, 1, res.NodesCreated(), "Expecting 1 node created")
 	assert.Equal(t, 0, res.NodesDeleted(), "Expecting 0 nodes deleted")
-	assert.Greater(t, res.InternalExecutionTime(),0.0, "Expecting internal execution time not to be 0.0")
+	assert.Greater(t, res.InternalExecutionTime(), 0.0, "Expecting internal execution time not to be 0.0")
 	assert.Equal(t, true, res.Empty(), "Expecting empty resultset")
 
-	res,err = graph.Query("MATCH (n) DELETE n")
-	assert.Nil(t,err)
+	res, err = graph.Query("MATCH (n) DELETE n")
+	assert.Nil(t, err)
 	assert.Equal(t, 1, res.NodesDeleted(), "Expecting 1 nodes deleted")
 
 	// Create 2 nodes connect via a single edge.
-	japan := NodeNew("Country", "j", nil)
-	john := NodeNew("Person", "p", nil)
+	japan := NodeNew([]string{"Country"}, "j", nil)
+	john := NodeNew([]string{"Person"}, "p", nil)
 	edge := EdgeNew("Visited", john, japan, nil)
 
 	// Set node properties.
@@ -386,21 +386,21 @@ func TestQueryStatistics(t *testing.T) {
 
 	// Flush graph to DB.
 	res, err = graph.Commit()
-	assert.Nil(t,err)
+	assert.Nil(t, err)
 	assert.Equal(t, 2, res.NodesCreated(), "Expecting 2 node created")
 	assert.Equal(t, 0, res.NodesDeleted(), "Expecting 0 nodes deleted")
 	assert.Equal(t, 7, res.PropertiesSet(), "Expecting 7 properties set")
 	assert.Equal(t, 1, res.RelationshipsCreated(), "Expecting 1 relationships created")
 	assert.Equal(t, 0, res.RelationshipsDeleted(), "Expecting 0 relationships deleted")
-	assert.Greater(t, res.InternalExecutionTime(),0.0, "Expecting internal execution time not to be 0.0")
+	assert.Greater(t, res.InternalExecutionTime(), 0.0, "Expecting internal execution time not to be 0.0")
 	assert.Equal(t, true, res.Empty(), "Expecting empty resultset")
 	q = "MATCH p = (:Person)-[:Visited]->(:Country) RETURN p"
 	res, err = graph.Query(q)
-	assert.Nil(t,err)
+	assert.Nil(t, err)
 	assert.Equal(t, len(res.results), 1, "expecting 1 result record")
 	assert.Equal(t, false, res.Empty(), "Expecting resultset to have records")
-	res,err = graph.Query("MATCH ()-[r]-() DELETE r")
-	assert.Nil(t,err)
+	res, err = graph.Query("MATCH ()-[r]-() DELETE r")
+	assert.Nil(t, err)
 	assert.Equal(t, 1, res.RelationshipsDeleted(), "Expecting 1 relationships deleted")
 }
 
@@ -410,22 +410,22 @@ func TestUtils(t *testing.T) {
 
 	res = ToString("test_string")
 	assert.Equal(t, res, "\"test_string\"")
-	
+
 	res = ToString(10)
-	assert.Equal(t, res, "10")	
+	assert.Equal(t, res, "10")
 
 	res = ToString(1.2)
 	assert.Equal(t, res, "1.2")
 
 	res = ToString(true)
 	assert.Equal(t, res, "true")
 
-	var arr = []interface{}{1,2,3,"boom"}
+	var arr = []interface{}{1, 2, 3, "boom"}
 	res = ToString(arr)
 	assert.Equal(t, res, "[1,2,3,\"boom\"]")
-	
+
 	jsonMap := make(map[string]interface{})
-	jsonMap["object"] = map[string]interface{} {"foo": 1}
+	jsonMap["object"] = map[string]interface{}{"foo": 1}
 	res = ToString(jsonMap)
 	assert.Equal(t, res, "{object: {foo: 1}}")
 }
@@ -436,13 +436,13 @@ func TestNodeMapDatatype(t *testing.T) {
 	assert.Nil(t, err)
 
 	// Create 2 nodes connect via a single edge.
-	japan := NodeNew("Country", "j",
+	japan := NodeNew([]string{"Country"}, "j",
 		map[string]interface{}{
 			"name":       "Japan",
 			"population": 126800000,
 			"states":     []string{"Kanto", "Chugoku"},
 		})
-	john := NodeNew("Person", "p",
+	john := NodeNew([]string{"Person"}, "p",
 		map[string]interface{}{
 			"name":   "John Doe",
 			"age":    33,
@@ -488,7 +488,7 @@ func TestTimeout(t *testing.T) {
 
 	params := make(map[string]interface{})
 	params["ub"] = 1000000
-	res, err = graph.ParameterizedQueryWithOptions("UNWIND range(0, $ub) AS v RETURN v", params, options);
+	res, err = graph.ParameterizedQueryWithOptions("UNWIND range(0, $ub) AS v RETURN v", params, options)
 	assert.Nil(t, res)
 	assert.NotNil(t, err)
 }

example_graph_test.go

@@ -4,11 +4,12 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/RedisGraph/redisgraph-go"
-	"github.com/gomodule/redigo/redis"
 	"io/ioutil"
 	"log"
 	"os"
+
+	"github.com/RedisGraph/redisgraph-go"
+	"github.com/gomodule/redigo/redis"
 )
 
 func ExampleGraphNew() {
@@ -22,7 +23,7 @@ func ExampleGraphNew() {
 	res.Next()
 	r := res.Record()
 	w := r.GetByIndex(0).(*redisgraph.Node)
-	fmt.Println(w.Label)
+	fmt.Println(w.Labels[0])
 	// Output: WorkPlace
 }
 
@@ -40,7 +41,7 @@ func ExampleGraphNew_pool() {
 	res.Next()
 	r := res.Record()
 	w := r.GetByIndex(0).(*redisgraph.Node)
-	fmt.Println(w.Label)
+	fmt.Println(w.Labels[0])
 	// Output: WorkPlace
 
 }
@@ -103,7 +104,7 @@ func ExampleGraphNew_tls() {
 	res.Next()
 	r := res.Record()
 	w := r.GetByIndex(0).(*redisgraph.Node)
-	fmt.Println(w.Label)
+	fmt.Println(w.Labels[0])
 }
 
 func getConnectionDetails() (host string, password string) {

examples/redisgraph_tls_client/redisgraph_tls_client.go

@@ -5,11 +5,12 @@ import (
 	"crypto/x509"
 	"flag"
 	"fmt"
-	"github.com/RedisGraph/redisgraph-go"
-	"github.com/gomodule/redigo/redis"
 	"io/ioutil"
 	"log"
 	"os"
+
+	"github.com/RedisGraph/redisgraph-go"
+	"github.com/gomodule/redigo/redis"
 )
 
 var (
@@ -85,6 +86,6 @@ func main() {
 	res.Next()
 	r := res.Record()
 	w := r.GetByIndex(0).(*redisgraph.Node)
-	fmt.Println(w.Label)
+	fmt.Println(w.Labels[0])
 	// Output: WorkPlace
 }

node.go

@@ -8,21 +8,21 @@ import (
 // Node represents a node within a graph.
 type Node struct {
 	ID         uint64
-	Label      string
+	Labels     []string
 	Alias      string
 	Properties map[string]interface{}
 	graph      *Graph
 }
 
-func NodeNew(label string, alias string, properties map[string]interface{}) *Node {
+func NodeNew(labels []string, alias string, properties map[string]interface{}) *Node {
 
 	p := properties
 	if p == nil {
 		p = make(map[string]interface{})
 	}
 
 	return &Node{
-		Label:      label,
+		Labels:     labels,
 		Alias:      alias,
 		Properties: p,
 		graph:      nil,
@@ -60,8 +60,8 @@ func (n Node) Encode() string {
 		s = append(s, n.Alias)
 	}
 
-	if n.Label != "" {
-		s = append(s, ":", n.Label)
+	for _, label := range n.Labels {
+		s = append(s, ":", label)
 	}
 
 	if len(n.Properties) > 0 {

query_result.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+
 	"github.com/gomodule/redigo/redis"
 	"github.com/olekukonko/tablewriter"
 )
@@ -16,10 +17,10 @@ const (
 	RELATIONSHIPS_DELETED   string = "Relationships deleted"
 	PROPERTIES_SET          string = "Properties set"
 	RELATIONSHIPS_CREATED   string = "Relationships created"
-	INDICES_CREATED string = "Indices created"
-	INDICES_DELETED string = "Indices deleted"
+	INDICES_CREATED         string = "Indices created"
+	INDICES_DELETED         string = "Indices deleted"
 	INTERNAL_EXECUTION_TIME string = "Query internal execution time"
-	CACHED_EXECUTION string = "Cached execution"
+	CACHED_EXECUTION        string = "Cached execution"
 )
 
 type ResultSetColumnTypes int
@@ -54,11 +55,11 @@ type QueryResultHeader struct {
 
 // QueryResult represents the results of a query.
 type QueryResult struct {
-	graph      			*Graph
-	header     			QueryResultHeader
-	results    			[]*Record
-	statistics 			map[string]float64
-	current_record_idx	int
+	graph              *Graph
+	header             QueryResultHeader
+	results            []*Record
+	statistics         map[string]float64
+	current_record_idx int
 }
 
 func QueryResultNew(g *Graph, response interface{}) (*QueryResult, error) {
@@ -69,7 +70,7 @@ func QueryResultNew(g *Graph, response interface{}) (*QueryResult, error) {
 			column_names: make([]string, 0),
 			column_types: make([]ResultSetColumnTypes, 0),
 		},
-		graph: g,
+		graph:              g,
 		current_record_idx: -1,
 	}
 
@@ -172,18 +173,18 @@ func (qr *QueryResult) parseNode(cell interface{}) *Node {
 	// [label string offset (integer)],
 	// [[name, value type, value] X N]
 
-	var label string
 	c, _ := redis.Values(cell, nil)
 	id, _ := redis.Uint64(c[0], nil)
-	labels, _ := redis.Ints(c[1], nil)
-	if len(labels) > 0 {
-		label = qr.graph.getLabel(labels[0])
+	label_ids, _ := redis.Ints(c[1], nil)
+	labels := make([]string, len(label_ids))
+	for i := 0; i < len(label_ids); i++ {
+		labels[i] = qr.graph.getLabel(label_ids[i])
 	}
 
 	rawProps, _ := redis.Values(c[2], nil)
 	properties := qr.parseProperties(rawProps)
 
-	n := NodeNew(label, "", properties)
+	n := NodeNew(labels, "", properties)
 	n.ID = id
 	return n
 }
@@ -386,4 +387,3 @@ func (qr *QueryResult) InternalExecutionTime() float64 {
 func (qr *QueryResult) CachedExecution() int {
 	return int(qr.getStat(CACHED_EXECUTION))
 }
-