Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cassandra data source part 1 #21

Merged
merged 12 commits into from
Aug 14, 2016
Prev Previous commit
Merge master, updated google cloud client for datastore
  • Loading branch information
Aaron Raddon committed Aug 6, 2016
commit d2c368a4b7b2ec6a03f1f514a344c12f35ee4650
26 changes: 13 additions & 13 deletions GLOCKFILE
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
cloud.google.com/go f9495dc7d5d062d1b04f594f06347c9a38be96bb
github.com/araddon/dateparse 86f3852b68545a6c7db45021ba05484cd15a372b
github.com/araddon/gou 50a94aa4a3fb69e8fbde05df290fcb49fa685e07
github.com/araddon/qlbridge 8b2f9b92555910593787b0417bd0e9f9643402f0
github.com/araddon/qlbridge a256367c0a9113485a78a814a2fb66d455db9f15
github.com/bitly/go-hostpool d0e59c22a56e8dadfed24f74f452cea5a52722d2
github.com/bmizerany/assert b7ed37b82869576c289d7d97fb2bbd8b64a0cb28
github.com/coreos/etcd 207c92b62785d220edc74ed791fd8a22a18e378e
github.com/coreos/go-etcd de3514f25635bbfb024fdaf2a8d5f67378492675
github.com/dchest/siphash 6d8617816bb5d8268011ffbfb8720f17ce9af63c
github.com/go-sql-driver/mysql 3654d25ec346ee8ce71a68431025458d52a38ac0
github.com/gocql/gocql 261883b4ad61ed1b4820abf522f952d3e18b366c
github.com/gogo/protobuf 2752d97bbd91927dd1c43296dbf8700e50e2708c
github.com/golang/protobuf 3852dcfda249c2097355a6aabb199a28d97b30df
github.com/go-sql-driver/mysql 0b58b37b664c21f3010e836f1b931e1d0b0b0685
github.com/gocql/gocql b2caded3d0f457e42515c06d4092c02055cebaa0
github.com/gogo/protobuf a4cceea7a401a73fefafd1a21fedbd4694124a82
github.com/golang/protobuf c3cefd437628a0b7d31b34fe44b3a7a540e98527
github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380
github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017
github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
github.com/hashicorp/go-immutable-radix afc5a0dbb18abdf82c277a7bc01533e81fa1d6b8
github.com/hashicorp/go-memdb 98f52f52d7a476958fa9da671354d270c50661a7
github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
github.com/jmoiron/sqlx bdae0c3219c3bdb92f3d7c70825018712787c933
github.com/jmoiron/sqlx 7396209bbeada6a4fcc28aa9408f89b2e71cac39
github.com/kr/pretty 737b74a46c4bf788349f72cb256fed10aea4d0ac
github.com/kr/text 7cafcd837844e784b526369c9bce262804aebc60
github.com/leekchan/timeutil 28917288c48df3d2c1cfe468c273e0b2adda0aa5
Expand All @@ -30,16 +30,16 @@ github.com/lytics/metafora eb26f00432a98228e44de8e074b9627fc4c1e457
github.com/lytics/sereno f6128b640de0742892a439b3672ac88637df977d
github.com/mattbaird/elastigo 34c4c4d8425cbdcbc8e257943a2044d5e9f7dab5
github.com/mb0/glob 1eb79d2de6c448664e7272f8b9fe1938239e3aaa
github.com/nats-io/gnatsd d0c69c11181ae3707212aa681bbf665c07d7d79e
github.com/nats-io/nats 495efc04e982cdb69ffc655b142973f1f1a47323
github.com/nats-io/gnatsd 5e68e38c8bc3cd3c1972682c91b798b6262584d4
github.com/nats-io/nats aea64801fab70c44603b524e0a0210c06727c972
github.com/nats-io/nuid a5152d67cf63cbfb5d992a395458722a45194715
github.com/pborman/uuid c55201b036063326c5b1b89ccfe45a184973d073
github.com/sony/sonyflake fa881fb1052b152e977c41023052c2f2a1c475e9
github.com/ugorji/go 45ce7596ace4534e47b69051a92aef7b64ec7b3f
golang.org/x/net f841c39de738b1d0df95b5a7187744f0e03d8112
golang.org/x/oauth2 7357e96168422ba1e6e7f21075713b72d58764e7
google.golang.org/api c13a21ee847eca050f08db8373d8737494a1170e
google.golang.org/cloud 83ee71d0fec26977bad1662134fa1e8c91268025
google.golang.org/grpc 461dac99975b211ed3eda7eb45b997d82da4345a
golang.org/x/net 075e191f18186a8ff2becaf64478e30f4545cdad
golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466
google.golang.org/api 3f131f305a2ae45080e71fdb780128cc92e8745e
google.golang.org/genproto 9f48fed629f137e474fb7422a911dfad49e2eaae
google.golang.org/grpc 35896af9ad39c1fb1b1cd925fe3621be361e3d81
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
gopkg.in/mgo.v2 22287bab4379e1fbf6002fb4eb769888f3fb224c
2 changes: 1 addition & 1 deletion backends/datastore/sql_to_datastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ func (m *SqlToDatstore) Delete(key driver.Value) (int, error) {
}
return 1, nil
}
func (m *SqlToDatstore) DeleteExpression(p interface{}, where expr.Node) (int, error) {
func (m *SqlToDatstore) DeleteExpression(pln interface{}, where expr.Node) (int, error) {
delKey := datasource.KeyFromWhere(where)
if delKey != nil {
return m.Delete(delKey.Key())
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.