updated to latest protocol

Author: tvincentNuoDB

.travis.yml

@@ -15,6 +15,8 @@ notifications:
     - [email protected]
     - [email protected]
     - [email protected]
+    - [email protected]
+
 
 before_install:
   - wget http://download.nuohub.org/nuodb_${NUOVERSION}_amd64.deb --output-document=/var/tmp/nuodb.deb

pynuodb/encodedsession.py

@@ -89,7 +89,7 @@ def __init__(self, host, port, service='SQL2'):
         """ @type : boolean """
         self.__encryption = True
         """ @type : boolean """
-        self.__activeNodes = 0
+        self.__connectedNodeID = 0
         """ @type : int """        
 
     # Mostly for connections
@@ -118,7 +118,7 @@ def open_database(self, db_name, parameters, cp):
             effectivePlatformVersion = self.getInt()
 
         if protocolVersion >= protocol.PROTOCOL_VERSION17 :
-            connectedNodeId = self.getInt()
+            self.__connectedNodeID = self.getInt()
             maxNodes = self.getInt()
 
         return protocolVersion, serverKey, salt
@@ -195,7 +195,7 @@ def execute_statement(self, statement, query):
         @type query str
         @rtype: ExecutionResult
         """
-        self._putMessageId(protocol.EXECUTE).putInt(statement.handle).putString(query)
+        self._putMessageId(protocol.EXECUTE).putInt(self.getCommitInfo(self.__connectedNodeID)).putInt(statement.handle).putString(query)
         self._exchangeMessages()
 
         result = self.getInt()
@@ -229,7 +229,7 @@ def execute_prepared_statement(self, prepared_statement, parameters):
         @type parameters list
         @rtype: ExecutionResult
         """
-        self._putMessageId(protocol.EXECUTEPREPAREDSTATEMENT)
+        self._putMessageId(protocol.EXECUTEPREPAREDSTATEMENT).putInt(self.getCommitInfo(self.__connectedNodeID))
         self.putInt(prepared_statement.handle).putInt(len(parameters))
 
         for param in parameters:
@@ -248,7 +248,7 @@ def execute_batch_prepared_statement(self, prepared_statement, param_lists):
         @type param_lists list[list]
 
         """
-        self._putMessageId(protocol.EXECUTEBATCHPREPAREDSTATEMENT)
+        self._putMessageId(protocol.EXECUTEBATCHPREPAREDSTATEMENT).putInt(self.getCommitInfo(self.__connectedNodeID))
         self.putInt(prepared_statement.handle)
         for parameters in param_lists:
             if prepared_statement.parameter_count != len(parameters):
@@ -915,7 +915,7 @@ def isASCII(self, data):
             return True
 
     def getCommitInfo(self, nodeID):
-        nodeIdx = nodeID % maxNodes
+        """ Currently does not support last commit """
+        return 0
+
 
-    def encodeNodes(self):
-        self.putInt(self.__activeNodes)

pynuodb/protocol.py

@@ -350,4 +350,4 @@ def lookup_code(error_code):
 #
 # The current protocol version of THIS driver.  The server will negotiate the lowest compatible version.
 #
-CURRENT_PROTOCOL_VERSION   = PROTOCOL_VERSION16
+CURRENT_PROTOCOL_VERSION   = PROTOCOL_VERSION19