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.

Sign up for GitHub

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
Merged

Cassandra data source part 1 #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e2dc913
Cassandra data source part 1
Jul 9, 2016
da4855e
Cassandra data source wip
araddon Jul 10, 2016
67e71ba
Cassandra data source implementation, walk Where
Jul 11, 2016
42a8f70
Update dependencies Glock
Jul 11, 2016
0af9e29
Cassandra data source sql rewrite for cass rules
araddon Jul 11, 2016
375b92d
Cassandra wip
araddon Jul 25, 2016
e8db30c
Cassandra delete working once qlbridge DialectWriter is avail
araddon Jul 27, 2016
243ac25
Cassandra update wip
araddon Jul 28, 2016
07c8c08
Cassandra Update
araddon Jul 28, 2016
509b28f
Cassandra using dialectwriter
araddon Jul 29, 2016
fe7a1d3
Update interface for gds
Jul 31, 2016
d2c368a
Merge master, updated google cloud client for datastore
Aug 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cassandra using dialectwriter
  • Loading branch information
@araddon
araddon committed Jul 29, 2016
commit 509b28f9188d095af462ac154fcaf7ed32de1619
9 changes: 6 additions & 3 deletions backends/cassandra/cass_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,10 @@ func TestMutationDeleteSimple(t *testing.T) {
RowData: &data,
})
validateQuerySpec(t, tu.QuerySpec{
Exec: `INSERT INTO user (id, name, deleted, created, updated) VALUES ("user817", "test_name",false, now(), now());`,
Exec: `
INSERT INTO user (id, name, deleted, created, updated)
VALUES
("deleteuser123", "test_name",false, now(), now());`,
ValidateRowData: func() {},
ExpectRowCt: 1,
})
Expand All @@ -516,12 +519,12 @@ func TestMutationDeleteSimple(t *testing.T) {
ValidateRowData: func() {},
})
validateQuerySpec(t, tu.QuerySpec{
Exec: `DELETE FROM user WHERE id = "user817"`,
Exec: `DELETE FROM user WHERE id = "deleteuser123"`,
ValidateRowData: func() {},
ExpectRowCt: 1,
})
validateQuerySpec(t, tu.QuerySpec{
Exec: `SELECT * FROM user WHERE id = "user817"`,
Exec: `SELECT * FROM user WHERE id = "deleteuser123"`,
ExpectRowCt: 0,
})
validateQuerySpec(t, tu.QuerySpec{
Expand Down
8 changes: 5 additions & 3 deletions backends/cassandra/resultreader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,15 @@ func (m *ResultReader) Run() error {
limit = m.Req.sel.Limit
}

sel := m.Req.Sel
sel := m.Req.sel

u.Debugf("%p cass limit: %d sel:%s", m.Req.sel, limit, sel)
queryStart := time.Now()

cqlQuery := sel.WriteDialect(NewCassDialect())
cassQry := m.Req.s.session.Query().PageSize(limit)
cassWriter := NewCassDialect()
sel.WriteDialect(cassWriter)
cqlQuery := cassWriter.String()
cassQry := m.Req.s.session.Query(cqlQuery).PageSize(limit)
iter := cassQry.Iter()

for {
Expand Down