Merge ../working/jones-maintenance

Author: jdduncan

database-jones/API-documentation/Session

@@ -550,10 +550,11 @@ Error setPartitionKey(mapping, keys);
  * and will remain in effect until this session is closed or this method
  * is called again.
  * @param lockmode the LockMode: 'EXCLUSIVE', 'SHARED', or 'NONE'
+ * @return an Error object or null if no error
  *
  * IMMEDIATE
  */
-void setLockMode(lockmode);
+Error setLockMode(lockmode);
 
 
 /** listTables(database, callback) 

database-jones/Adapter/api/Batch.js

@@ -162,7 +162,6 @@ exports.Batch.prototype.execute = function() {
 };
 
 exports.Batch.prototype.isBatch = function() {
-  this.assertOpen();
   return true;
 };
 

database-jones/Adapter/api/Session.js

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights
+ Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights
  reserved.
  
  This program is free software; you can redistribute it and/or
@@ -149,7 +149,6 @@ exports.Session.prototype.createBatch = function() {
 };
 
 exports.Session.prototype.isBatch = function() {
-  this.assertOpen();
   return false;
 };
 
@@ -158,7 +157,13 @@ exports.Session.prototype.isClosed = function() {
   return this.closed;
 };
 
+
 exports.Session.prototype.currentTransaction = function() {
   return this.tx;
 };
 
+
+/* setLockMode() immediate */
+exports.Session.prototype.setLockMode = function(lockMode) {
+  return this.dbSession.setLockMode(lockMode);
+};

jones-ndb/impl/ndb/NdbOperation.js

@@ -1008,6 +1008,14 @@ function newScanOperation(tx, QueryTree, properties) {
 }
 
 
+function setLockMode(ndbSession, lockMode) {
+  if(doc.LockModes.indexOf(lockMode) !== -1) {
+    return new DBOperationError("Invalid Lock Mode");
+  }
+  ndbSession.lockMode = lockMode;
+  return null;
+}
+
 exports.DBOperation         = DBOperation;
 exports.DBOperationError    = DBOperationError;
 exports.newReadOperation    = newReadOperation;
@@ -1021,3 +1029,4 @@ exports.completeExecutedOps = completeExecutedOps;
 exports.getScanResults      = getScanResults;
 exports.prepareOperations   = prepareOperations;
 exports.getQueryResults     = getQueryResults;
+exports.setLockMode         = setLockMode;

jones-ndb/impl/ndb/NdbSession.js

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights
+ Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights
  reserved.
  
  This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 "use strict";
 
 var stats = {
-	"created" : 0,
+  "created" : 0,
   "seizeTransactionContext" : { 
     "immediate" : 0 , "queued" : 0 
   },
@@ -74,6 +74,7 @@ NdbSession = function(pool) {
   this.maxTxContexts         = pool.properties.ndb_session_concurrency;  
   this.openTxContexts        = 0;  // currently opened
   this.isOpenNdbSession      = false;
+  this.lockMode              = "SHARED";
 };
 
 /* fetch SessionImpl. Undocumented - private to NdbConnectionPool. 
@@ -183,8 +184,8 @@ NdbSession.prototype.buildReadOperation = function(dbIndexHandler, keys,
                dbIndexHandler.tableHandler.dbTable.name,
                "using", dbIndexHandler.dbIndex.name);
   }
-  var lockMode = "SHARED";
-  var op = ndboperation.newReadOperation(tx, dbIndexHandler, keys, lockMode, isLoad);
+  var op = ndboperation.newReadOperation(tx, dbIndexHandler, keys,
+                                         this.lockMode, isLoad);
   op.userCallback = callback;
   return op;
 };
@@ -362,5 +363,14 @@ NdbSession.prototype.rollback = function (userCallback) {
   this.tx.rollback(userCallback);
 };
 
+/* setLockMode(lockMode)
+   IMMEDIATE
+   
+   Set Lock Mode for subsequent read operations
+*/
+NdbSession.prototype.setLockMode = function (lockMode) {
+  return ndboperation.setLockMode(this, lockMode);
+};
+
 
 exports.DBSession = NdbSession;