update query timestamp generation

Author: luccailliau

lib/requests.js

@@ -121,6 +121,7 @@ class ExecuteRequest extends Request {
     this.params = params;
     this.meta = meta;
     this.options = execOptions || ExecutionOptions.empty();
+    this.timestamp = this.options.getOrGenerateTimestamp();
     this.consistency = this.options.getConsistency() || types.consistencies.one;
     // Only QUERY request parameters are encoded as named parameters
     // EXECUTE request parameters are always encoded as positional parameters
@@ -174,7 +175,7 @@ class ExecuteRequest extends Request {
     //          [<serial_consistency>][<timestamp>][keyspace][continuous_paging_options]
     let flags = 0;
 
-    const timestamp = this.options.getOrGenerateTimestamp();
+    const timestamp = this.timestamp;
 
     if (types.protocolVersion.supportsPaging(encoder.protocolVersion)) {
       flags |= (this.params && this.params.length) ? queryFlag.values : 0;
@@ -407,6 +408,7 @@ class BatchRequest extends Request {
     super();
     this.queries = queries;
     this.options = execOptions;
+    this.timestamp = this.options.getOrGenerateTimestamp();
     this.hints = execOptions.getHints() || utils.emptyArray;
     this.type = batchType.logged;
 
@@ -463,7 +465,7 @@ class BatchRequest extends Request {
     if (types.protocolVersion.supportsTimestamp(encoder.protocolVersion)) {
       // Batch flags
       let flags = this.options.getSerialConsistency() ? batchFlag.withSerialConsistency : 0;
-      const timestamp = this.options.getOrGenerateTimestamp();
+      const timestamp = this.timestamp;
       flags |= timestamp !== null && timestamp !== undefined ? batchFlag.withDefaultTimestamp : 0;
 
       flags |= this.options.getKeyspace() && types.protocolVersion.supportsKeyspaceInRequest(encoder.protocolVersion)