Merge ../working/mysql-js

Conflicts:
	jones-ndb/impl/src/common/async_common.cpp

Author: jdduncan

jones-ndb/impl/include/common/JsWrapper.h

@@ -41,7 +41,8 @@ using v8::PropertyCallbackInfo;
 using v8::WeakCallbackData;
 
 /* A Persistent<T> can be cast to a Local<T>.  See:
-   https://groups.google.com/forum/#!msg/v8-users/6kSAbnUb-rQ/9G5RmCpsDIMJ
+   https://groups.google.com/forum/#!msg/v8-users/6kSAbnUb-rQ/9G5RmCpsDIMJ.
+   At some point this can be replaced by persisent.Get(isolate)
 */
 template<class T>
 inline Local<T> ToLocal(Persistent<T>* p_) {
@@ -53,6 +54,16 @@ inline Local<T> ToLocal(const Persistent<T>* p_) {
   return *reinterpret_cast<const Local<T>*>(p_);
 }
 
+/* Some compatibility */
+#if NODE_MAJOR_VERSION > 3
+#define BUFFER_HANDLE v8::MaybeLocal
+#define LOCAL_BUFFER(B) B.ToLocalChecked()
+#define IsExternalAscii IsExternalOneByte
+#else
+#define BUFFER_HANDLE v8::Local
+#define LOCAL_BUFFER(B) B
+#endif
+
 /* Signature of a V8 function wrapper
 */
 typedef FunctionCallbackInfo<Value> Arguments;

jones-ndb/impl/include/ndb/BlobHandler.h

@@ -49,7 +49,7 @@ class BlobReadHandler : public BlobHandler {
   BlobReadHandler(int columnId, int fieldNumber);
   void prepare(const NdbOperation *);
   int runActiveHook(NdbBlob *);
-  v8::Local<v8::Object> getResultBuffer();
+  v8::Local<v8::Object> getResultBuffer(v8::Isolate *);
 };  
 
 

jones-ndb/impl/src/ndb/BlobHandler.cpp

@@ -27,6 +27,7 @@
 #include "adapter_global.h"
 #include "unified_debug.h"
 #include "BlobHandler.h"
+#include "JsWrapper.h"
 
 
 // BlobHandler constructor
@@ -81,10 +82,10 @@ int BlobReadHandler::runActiveHook(NdbBlob *b) {
   return 0;
 }
 
-v8::Local<v8::Object> BlobReadHandler::getResultBuffer() {
+v8::Local<v8::Object> BlobReadHandler::getResultBuffer(v8::Isolate * iso) {
   v8::Local<v8::Object> buffer;
   if(content) {
-    buffer = node::Buffer::New(content, length, freeBufferContentsFromJs, 0);
+    buffer = LOCAL_BUFFER(node::Buffer::New(iso, content, length, freeBufferContentsFromJs, 0));
     /* Content belongs to someone else now; clear it for the next user */
     content = 0;
     length = 0;

jones-ndb/impl/src/ndb/DBDictionaryImpl.cpp

@@ -805,7 +805,7 @@ Local<Value> getDefaultValue(v8::Isolate *isolate, const NdbDictionary::Column *
 
   const void* dictDefaultBuff = col->getDefaultValue(& defaultLen);
   if(defaultLen) {
-    v = node::Buffer::New((char *) dictDefaultBuff, defaultLen);
+    v = LOCAL_BUFFER(node::Buffer::New(isolate, (char *) dictDefaultBuff, defaultLen));
   }
   return v;
 }

jones-ndb/impl/src/ndb/KeyOperation.cpp

@@ -152,16 +152,17 @@ int KeyOperation::createBlobWriteHandles(Handle<Object> blobsArray,
 
 void KeyOperation::readBlobResults(const Arguments & args) {
   DEBUG_MARKER(UDEB_DEBUG);
-  EscapableHandleScope scope(args.GetIsolate());
+  v8::Isolate * isolate = args.GetIsolate();
+  EscapableHandleScope scope(isolate);
 
   args.GetReturnValue().SetUndefined();
   if(isBlobReadOperation()) {
-    Local<Object> results = Array::New(args.GetIsolate());
+    Local<Object> results = Array::New(isolate);
     BlobReadHandler * readHandler = static_cast<BlobReadHandler *>(blobHandler);
     while(readHandler) {
-      Local<Value> buffer = readHandler->getResultBuffer();
+      Local<Value> buffer = readHandler->getResultBuffer(isolate);
       if(buffer.IsEmpty()) {
-        buffer = Null(args.GetIsolate());
+        buffer = Null(isolate);
       }
       results->ToObject()->Set(readHandler->getFieldNumber(), buffer);
       readHandler = static_cast<BlobReadHandler *>(readHandler->getNext());

jones-ndb/impl/src/ndb/NdbTypeEncoders.cpp

@@ -731,7 +731,7 @@ Local<Value> fpWriter(const NdbDictionary::Column * col,
 
 Local<Value> BinaryReader(const NdbDictionary::Column *col, 
                            char *buffer, size_t offset) {
-  return node::Buffer::New(isolate, buffer + offset, col->getLength());
+  return LOCAL_BUFFER(node::Buffer::New(isolate, buffer + offset, col->getLength()));
 }
 
 Local<Value> BinaryWriter(const NdbDictionary::Column * col,
@@ -755,7 +755,7 @@ Local<Value> varbinaryReader(const NdbDictionary::Column *col,
                               char *buffer, size_t offset) {
   LOAD_ALIGNED_DATA(LENGTHTYPE, length, buffer+offset);
   char * data = buffer+offset+sizeof(length);
-  return node::Buffer::New(isolate, data, length);
+  return LOCAL_BUFFER(node::Buffer::New(isolate, data, length));
 }
 
 template<typename LENGTHTYPE>
@@ -804,7 +804,7 @@ inline bool stringIsAscii(const unsigned char *str, size_t len) {
   return true;
 }
 
-class ExternalizedAsciiString : public String::ExternalAsciiStringResource {
+class ExternalizedAsciiString : public String::ExternalOneByteStringResource {
 public:
   char * buffer;
   size_t len; 
@@ -990,7 +990,7 @@ Local<Object> getBufferForText(const NdbDictionary::Column *col,
   {
     DEBUG_PRINT("getBufferForText: fully externalized");
     stats.externalized_text_writes++;
-    return node::Buffer::New(isolate, str);
+    return LOCAL_BUFFER(node::Buffer::New(isolate, str));
   }
 
   length = str->Length();
@@ -1000,17 +1000,17 @@ Local<Object> getBufferForText(const NdbDictionary::Column *col,
 
   if(csinfo->isAscii || (valueIsAscii && ! csinfo->isMultibyte)) {
     stats.direct_writes++;
-    buffer = node::Buffer::New(isolate, length);
+    buffer = LOCAL_BUFFER(node::Buffer::New(isolate, length));
     data = node::Buffer::Data(buffer);
     str->WriteOneByte((uint8_t*) data, 0, length);
   } else if(csinfo->isUtf16le) {
     stats.direct_writes++;
-    buffer = node::Buffer::New(isolate, length * 2);
+    buffer = LOCAL_BUFFER(node::Buffer::New(isolate, length * 2));
     uint16_t * mbdata = (uint16_t*) node::Buffer::Data(buffer);
     str->Write(mbdata, 0, length);
   } else if(csinfo->isUtf8) {
     stats.direct_writes++;
-    buffer = node::Buffer::New(isolate, utf8Length);
+    buffer = LOCAL_BUFFER(node::Buffer::New(isolate, utf8Length));
     data = node::Buffer::Data(buffer);
     str->WriteUtf8(data, utf8Length);
   } else {
@@ -1022,7 +1022,7 @@ Local<Object> getBufferForText(const NdbDictionary::Column *col,
     data = (char *) malloc(buflen);
     size_t result_len = recodeFromUtf8(recode_buffer, utf8Length,
                                        data, buflen, col->getCharsetNumber());
-    buffer = node::Buffer::New(isolate, data, result_len, freeBufferContentsFromJs, 0);
+    buffer = LOCAL_BUFFER(node::Buffer::New(isolate, data, result_len, freeBufferContentsFromJs, 0));
     delete[] recode_buffer;
   }
 

jones-ndb/impl/src/ndb/QueryOperation_wrapper.cpp

@@ -288,9 +288,9 @@ void queryGetResult(const Arguments & args) {
   if(header) {
     if(header->data) {
       wrapper->Set(GET_KEY(K_data),
-        node::Buffer::New(header->data,
-                          op->getResultRowSize(header->depth),
-                          doNotFreeQueryResultAtGC, 0));
+        LOCAL_BUFFER(node::Buffer::New(isolate, header->data,
+                                       op->getResultRowSize(header->depth),
+                                       doNotFreeQueryResultAtGC, 0)));
     } else {
       wrapper->Set(GET_KEY(K_data), Null(isolate));
     }