Changeset 14185 for trunk

Timestamp:

06/18/12 21:54:20 (12 years ago)

Author:

tbretz

Message:

Some small updated to the database enine,mainly ReadOnlys

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (14 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -341 +341 @@
 
         Handle<Array> ret = Array::New();
-        ret->Set(String::New("table"), String::New(res.table()));
+        ret->Set(String::New("table"), String::New(res.table()), ReadOnly);
+
+        Handle<Array> cols = Array::New();
 
         int irow=0;
@@ -353 +355 @@
             {
                 const Handle<Value> name = String::New((*list)[i].c_str());
+                if (irow==0)
+                    cols->Set(Integer::NewFromUnsigned(i), name, ReadOnly);
 
                 if ((*it)[i].is_null())
                 {
-                    row->Set(name, Undefined());
+                    row->Set(name, Undefined(), ReadOnly);
                     continue;
                 }
@@ -370 +374 @@
                         const uint64_t val = (uint64_t)(*it)[i];
                         if (val>UINT32_MAX)
-                            row->Set(name, Number::New(val));
+                            row->Set(name, Number::New(val), ReadOnly);
                         else
-                            row->Set(name, Integer::NewFromUnsigned(val));
+                            row->Set(name, Integer::NewFromUnsigned(val), ReadOnly);
                     }
                     else
@@ -378 +382 @@
                         const int64_t val = (int64_t)(*it)[i];
                         if (val<INT32_MIN || val>INT32_MAX)
-                            row->Set(name, Number::New(val));
+                            row->Set(name, Number::New(val), ReadOnly);
                         else
-                            row->Set(name, Integer::NewFromUnsigned(val));
+                            row->Set(name, Integer::NewFromUnsigned(val), ReadOnly);
                     }
                     continue;
@@ -389 +393 @@
                 {
                     if (uns)
-                        row->Set(name, Integer::NewFromUnsigned((uint32_t)(*it)[i]));
+                        row->Set(name, Integer::NewFromUnsigned((uint32_t)(*it)[i]), ReadOnly);
                     else
-                        row->Set(name, Integer::New((int32_t)(*it)[i]));
+                        row->Set(name, Integer::New((int32_t)(*it)[i]), ReadOnly);
                 }
 
                 if (sql_type.find("BOOL")!=string::npos )
                 {
-                    row->Set(name, Boolean::New((bool)(*it)[i]));
+                    row->Set(name, Boolean::New((bool)(*it)[i]), ReadOnly);
                     continue;
                 }
@@ -404 +408 @@
                     ostringstream val;
                     val << setprecision(7) << (float)(*it)[i];
-                    row->Set(name, Number::New(stod(val.str())));
+                    row->Set(name, Number::New(stod(val.str())), ReadOnly);
                     continue;
 
@@ -410 +414 @@
                 if (sql_type.find("DOUBLE")!=string::npos)
                 {
-                    row->Set(name, Number::New((double)(*it)[i]));
+                    row->Set(name, Number::New((double)(*it)[i]), ReadOnly);
                     continue;
                 }
@@ -417 +421 @@
                     sql_type.find("TEXT")!=string::npos)
                 {
-                    row->Set(name, String::New((const char*)(*it)[i]));
+                    row->Set(name, String::New((const char*)(*it)[i]), ReadOnly);
                     continue;
                 }
@@ -423 +427 @@
                 if (sql_type.find("TIMESTAMP")!=string::npos)
                 {
-                    row->Set(name, Date::New(time_t(mysqlpp::Time((*it)[i]))*1000));
+                    row->Set(name, Date::New(time_t(mysqlpp::Time((*it)[i]))*1000), ReadOnly);
                     continue;
                 }
@@ -429 +433 @@
                 if (sql_type.find("DATETIME")!=string::npos)
                 {
-                    row->Set(name, Date::New(time_t(mysqlpp::DateTime((*it)[i]))*1000));
+                    row->Set(name, Date::New(time_t(mysqlpp::DateTime((*it)[i]))*1000), ReadOnly);
                     continue;
                 }
@@ -435 +439 @@
                 if (sql_type.find(" DATE ")!=string::npos)
                 {
-                    row->Set(name, Date::New(time_t((mysqlpp::Date)(*it)[i])*1000));
+                    row->Set(name, Date::New(time_t((mysqlpp::Date)(*it)[i])*1000), ReadOnly);
                     continue;
                 }
@@ -441 +445 @@
             }
 
-            ret->Set(Integer::New(irow++), row);
+            ret->Set(Integer::NewFromUnsigned(irow++), row, ReadOnly);
         }
+
+        if (irow>0)
+            ret->Set(String::New("cols"), cols, ReadOnly);
 
         return handle_scope.Close(ret);
@@ -711 +718 @@
     v8::Locker::StartPreemption(10);
     const bool rc = ExecuteFile(filename);
+
+    // -----
+    // This is how an exit handler could look like, but there is no way to interrupt it
+    // -----
+    // Handle<Object> obj = Handle<Object>::Cast(context->Global()->Get(String::New("dim")));
+    // if (!obj.IsEmpty())
+    // {
+    //     Handle<Value> onexit = obj->Get(String::New("onexit"));
+    //     if (!onexit->IsUndefined())
+    //         Handle<Function>::Cast(onexit)->NewInstance(0, NULL); // argc, argv
+    //     // Handle<Object> result = Handle<Function>::Cast(onexit)->NewInstance(0, NULL); // argc, argv
+    // }
+
     v8::Locker::StopPreemption();
     //context->Exit();
@@ -730 +750 @@
 void InterpreterV8::JsStop()
 {
-    v8::Locker locker;
+    Locker locker;
     //cout << "Terminate " << fThreadId << endl;
     if (This->fThreadId>=0)
-        v8::V8::TerminateExecution(This->fThreadId);
+        V8::TerminateExecution(This->fThreadId);
     //cout << "Terminate " << fThreadId << endl;
-    v8::Unlocker unlocker;
+    Unlocker unlocker;
 }