Browse Source

Merge pull request #999 from gocql/revert-996-dont-send-timestamps-cas

Revert "session: dont send timestamp for LWT ops"
Chris Bannister 8 years ago
parent
commit
aba6be7985
1 changed files with 0 additions and 4 deletions
  1. 0 4
      session.go

+ 0 - 4
session.go

@@ -617,7 +617,6 @@ func (s *Session) ExecuteBatch(batch *Batch) error {
 // Further scans on the interator must also remember to include
 // Further scans on the interator must also remember to include
 // the applied boolean as the first argument to *Iter.Scan
 // the applied boolean as the first argument to *Iter.Scan
 func (s *Session) ExecuteBatchCAS(batch *Batch, dest ...interface{}) (applied bool, iter *Iter, err error) {
 func (s *Session) ExecuteBatchCAS(batch *Batch, dest ...interface{}) (applied bool, iter *Iter, err error) {
-	batch.defaultTimestamp = false
 	iter = s.executeBatch(batch)
 	iter = s.executeBatch(batch)
 	if err := iter.checkErrAndNotFound(); err != nil {
 	if err := iter.checkErrAndNotFound(); err != nil {
 		iter.Close()
 		iter.Close()
@@ -638,7 +637,6 @@ func (s *Session) ExecuteBatchCAS(batch *Batch, dest ...interface{}) (applied bo
 // however it accepts a map rather than a list of arguments for the initial
 // however it accepts a map rather than a list of arguments for the initial
 // scan.
 // scan.
 func (s *Session) MapExecuteBatchCAS(batch *Batch, dest map[string]interface{}) (applied bool, iter *Iter, err error) {
 func (s *Session) MapExecuteBatchCAS(batch *Batch, dest map[string]interface{}) (applied bool, iter *Iter, err error) {
-	batch.defaultTimestamp = false
 	iter = s.executeBatch(batch)
 	iter = s.executeBatch(batch)
 	if err := iter.checkErrAndNotFound(); err != nil {
 	if err := iter.checkErrAndNotFound(); err != nil {
 		iter.Close()
 		iter.Close()
@@ -973,7 +971,6 @@ func (q *Query) Scan(dest ...interface{}) error {
 // in dest.
 // in dest.
 func (q *Query) ScanCAS(dest ...interface{}) (applied bool, err error) {
 func (q *Query) ScanCAS(dest ...interface{}) (applied bool, err error) {
 	q.disableSkipMetadata = true
 	q.disableSkipMetadata = true
-	q.defaultTimestamp = false
 	iter := q.Iter()
 	iter := q.Iter()
 	if err := iter.checkErrAndNotFound(); err != nil {
 	if err := iter.checkErrAndNotFound(); err != nil {
 		return false, err
 		return false, err
@@ -997,7 +994,6 @@ func (q *Query) ScanCAS(dest ...interface{}) (applied bool, err error) {
 // column mismatching. MapScanCAS is added to capture them safely.
 // column mismatching. MapScanCAS is added to capture them safely.
 func (q *Query) MapScanCAS(dest map[string]interface{}) (applied bool, err error) {
 func (q *Query) MapScanCAS(dest map[string]interface{}) (applied bool, err error) {
 	q.disableSkipMetadata = true
 	q.disableSkipMetadata = true
-	q.defaultTimestamp = false
 	iter := q.Iter()
 	iter := q.Iter()
 	if err := iter.checkErrAndNotFound(); err != nil {
 	if err := iter.checkErrAndNotFound(); err != nil {
 		return false, err
 		return false, err