UUID bind bugfix, update example

mstump · Jan 1, 2015 · c2244fa · c2244fa
1 parent 431af12
commit c2244fa
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -23,17 +23,25 @@ import (
 
 func main() {
 	cluster := cassandra.NewCluster()
-	cluster.SetContactPoints("127.0.0.1")
+	cluster.SetContactPoints("cassandra")
+	defer cluster.Finalize()
 
-	sessionFuture := cluster.Connect()
-	sessionFuture.Wait()
-	session := sessionFuture.Session()
+	session := cassandra.NewSession()
+	defer session.Finalize()
+
+	sessfuture := cluster.SessionConnect(session)
+	sessfuture.Wait()
+	defer sessfuture.Finalize()
 
 	statement := cassandra.NewStatement("select cluster_name from system.local;", 0)
-	future := session.Execute(statement)
-	future.Wait()
+	defer statement.Finalize()
+
+	stmtfuture := session.Execute(statement)
+	stmtfuture.Wait()
+	defer stmtfuture.Finalize()
 
-	result := future.Result()
+	result := stmtfuture.Result()
+	defer result.Finalize()
 
 	fmt.Printf("Clusters:\r\n")
 	for result.Next() {

diff --git a/cassandra/cassandra.go b/cassandra/cassandra.go
@@ -171,7 +171,7 @@ func (statement *Statement) Bind(args ...interface{}) error {
 			bytes.size = C.cass_size_t(len(v))
 			err = C.cass_statement_bind_bytes(statement.cptr, C.cass_size_t(i), bytes)
 
-		case Uuid:
+		case *Uuid:
 			C.cass_statement_bind_uuid(statement.cptr, C.cass_size_t(i), *v.cptr)
 		}
 

diff --git a/examples/basic.go b/examples/basic.go
@@ -7,17 +7,25 @@ import (
 
 func main() {
 	cluster := cassandra.NewCluster()
-	cluster.SetContactPoints("127.0.0.1")
+	cluster.SetContactPoints("cassandra")
+	defer cluster.Finalize()
 
-	sessionFuture := cluster.Connect()
-	sessionFuture.Wait()
-	session := sessionFuture.Session()
+	session := cassandra.NewSession()
+	defer session.Finalize()
+
+	sessfuture := cluster.SessionConnect(session)
+	sessfuture.Wait()
+	defer sessfuture.Finalize()
 
 	statement := cassandra.NewStatement("select cluster_name from system.local;", 0)
-	future := session.Execute(statement)
-	future.Wait()
+	defer statement.Finalize()
+
+	stmtfuture := session.Execute(statement)
+	stmtfuture.Wait()
+	defer stmtfuture.Finalize()
 
-	result := future.Result()
+	result := stmtfuture.Result()
+	defer result.Finalize()
 
 	fmt.Printf("Clusters:\r\n")
 	for result.Next() {