Add Query endpoints with QueryOptions support

Author: jeffreylovitz

client_test.go

@@ -473,3 +473,19 @@ func TestNodeMapDatatype(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, 1, res.RelationshipsDeleted(), "Expecting 1 relationships deleted")
 }
+
+func TestTimeout(t *testing.T) {
+	// Instantiate a new QueryOptions struct with a 1-second timeout
+	options := QueryOptionsNew(1)
+
+	// Issue a long-running query with a 1-millisecond timeout.
+	res, err := graph.QueryWithOptions("UNWIND range(0, 1000000) AS v RETURN v", options)
+	assert.Nil(t, res)
+	assert.NotNil(t, err)
+
+	params := make(map[string]interface{})
+	params["ub"] = 1000000
+	res, err = graph.ParameterizedQueryWithOptions("UNWIND range(0, $ub) AS v RETURN v", params, options);
+	assert.Nil(t, res)
+	assert.NotNil(t, err)
+}

graph.go

@@ -8,6 +8,11 @@ import (
 	"github.com/gomodule/redigo/redis"
 )
 
+// QueryOptions are a set of additional arguments to be emitted with a query.
+type QueryOptions struct {
+	timeout           int
+}
+
 // Graph represents a graph, which is a collection of nodes and edges.
 type Graph struct {
 	Id                string
@@ -97,9 +102,16 @@ func (g *Graph) Commit() (*QueryResult, error) {
 	return g.Query(q)
 }
 
+// QueryOptionsNew instantiates a new QueryOptions struct.
+func QueryOptionsNew(timeout int) QueryOptions {
+	options := QueryOptions{
+		timeout:               timeout,
+	}
+	return options
+}
+
 // Query executes a query against the graph.
 func (g *Graph) Query(q string) (*QueryResult, error) {
-	
 	r, err := g.Conn.Do("GRAPH.QUERY", g.Id, q, "--compact")
 	if err != nil {
 		return nil, err
@@ -126,6 +138,46 @@ func (g *Graph) ParameterizedQuery(q string, params map[string]interface{}) (*Qu
 	return g.Query(q);
 }
 
+// QueryWithOptions issues a query with the given timeout
+func (g *Graph) QueryWithOptions(q string, options QueryOptions) (*QueryResult, error) {
+	var r interface{}
+	var err error
+	if(options.timeout >= 0) {
+		r, err = g.Conn.Do("GRAPH.QUERY", g.Id, q, "--compact", "timeout", options.timeout)
+	} else {
+		r, err = g.Conn.Do("GRAPH.QUERY", g.Id, q, "--compact")
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return QueryResultNew(g, r)
+}
+
+// ParameterizedQueryWithOptions issues a parameterized query with the given timeout
+func (g *Graph) ParameterizedQueryWithOptions(q string, params map[string]interface{}, options QueryOptions) (*QueryResult, error) {
+	if(params != nil){
+		q = BuildParamsHeader(params) + q
+	}
+	return g.QueryWithOptions(q, options);
+}
+
+// ROQueryWithOptions issues a read-only query with the given timeout
+func (g *Graph) ROQueryWithOptions(q string, options QueryOptions) (*QueryResult, error) {
+	var r interface{}
+	var err error
+	if(options.timeout >= 0) {
+		r, err = g.Conn.Do("GRAPH.RO_QUERY", g.Id, q, "--compact", "timeout", options.timeout)
+	} else {
+		r, err = g.Conn.Do("GRAPH.RO_QUERY", g.Id, q, "--compact")
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return QueryResultNew(g, r)
+}
+
 // Merge pattern
 func (g *Graph) Merge(p string) (*QueryResult, error) {
 	q := fmt.Sprintf("MERGE %s", p)