@op-engineering/op-sqlite 1.0.1 → 1.0.2

package/README.md

@@ -37,7 +37,7 @@ You can find the [benchmarking code in the example app](https://github.com/OP-En
 | ------------ | ------------- | ---------- |
 | quick-sqlite | 2719          | 8851       |
 | expo-sqlite  | 2293          | 10626      |
-| op-sqlite    | 634           | 1548       |
+| op-sqlite    | 488           | 981        |
 
 Memory consumption is also 50% to 80% reduced compared to `react-native-quick-sqlite`. `expo-sqlite` OOMS itself even when trying to insert 300k elements in a row. Queries that before might have OOM now can run just fine.
 

package/cpp/DynamicHostObject.cpp

@@ -19,12 +19,14 @@ std::vector<jsi::PropNameID> DynamicHostObject::getPropertyNames(jsi::Runtime &r
 jsi::Value DynamicHostObject::get(jsi::Runtime &rt, const jsi::PropNameID &propNameID) {
     auto name = propNameID.utf8(rt);
     
-    if(fields.find(name) == fields.end()) {
-        return {};
-    } else {
-        jsVal val = fields[name];
-        return toJSI(rt, val);
+    for (auto field: fields) {
+        auto fieldName = field.first;
+        if(fieldName == name) {
+            return toJSI(rt, field.second);
+        }
     }
+    
+    return {};
 }
 
 }

package/cpp/DynamicHostObject.h

@@ -4,7 +4,6 @@
 #include <jsi/jsi.h>
 #include <any>
 #include <vector>
-#include <unordered_map>
 #include "types.h"
 
 namespace osp {
@@ -21,7 +20,8 @@ namespace osp {
 
         jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propNameID);
 
-        std::unordered_map<std::string, jsVal> fields;
+
+        std::vector<std::pair<std::string, jsVal>> fields;
     };
 
 }

package/cpp/bridge.cpp

@@ -5,7 +5,7 @@
 #include <ctime>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <map>
+#include <unordered_map>
 #include "logs.h"
 #include "DynamicHostObject.h"
 #include <variant>
@@ -316,14 +316,14 @@ BridgeResult sqliteExecute(std::string const dbName,
                              * only represent Integers up to 53 bits
                              */
                             double column_value = sqlite3_column_double(statement, i);
-                            row->fields[column_name] = jsVal(column_value);
+                            row->fields.push_back(std::make_pair(column_name, jsVal(column_value)));
                             break;
                         }
                             
                         case SQLITE_FLOAT:
                         {
                             double column_value = sqlite3_column_double(statement, i);
-                            row->fields[column_name] = jsVal(column_value);
+                            row->fields.push_back(std::make_pair(column_name, jsVal(column_value)));
                             break;
                         }
                             
@@ -332,7 +332,7 @@ BridgeResult sqliteExecute(std::string const dbName,
                             const char *column_value = reinterpret_cast<const char *>(sqlite3_column_text(statement, i));
                             int byteLen = sqlite3_column_bytes(statement, i);
                             // Specify length too; in case string contains NULL in the middle (which SQLite supports!)
-                            row->fields[column_name] = jsVal(std::string(column_value, byteLen));
+                            row->fields.push_back(std::make_pair(column_name, jsVal(std::string(column_value, byteLen))));
                             break;
                         }
                             
@@ -342,10 +342,10 @@ BridgeResult sqliteExecute(std::string const dbName,
                             const void *blob = sqlite3_column_blob(statement, i);
                             uint8_t *data = new uint8_t[blob_size];
                             memcpy(data, blob, blob_size);
-                            row->fields[column_name] = jsVal(JSBuffer {
+                            row->fields.push_back(std::make_pair(column_name, jsVal(JSBuffer {
                                 .data =  std::shared_ptr<uint8_t>{data},
                                 .size =  static_cast<size_t>(blob_size)
-                            });
+                            })));
                             break;
                         }
                             
@@ -353,7 +353,7 @@ BridgeResult sqliteExecute(std::string const dbName,
                             // Intentionally left blank
 
                         default:
-                            row->fields[column_name] = jsVal(NULL);
+                            row->fields.push_back(std::make_pair(column_name, jsVal(NULL)));
                             break;
                     }
                     i++;
@@ -371,9 +371,9 @@ BridgeResult sqliteExecute(std::string const dbName,
                         column_name = sqlite3_column_name(statement, i);
                         const char *type = sqlite3_column_decltype(statement, i);
                         auto metadata = std::make_shared<DynamicHostObject>();
-                        metadata->fields["name"] = column_name;
-                        metadata->fields["index"] = i;
-                        metadata->fields["type"] = type;
+                        metadata->fields.push_back(std::make_pair("name", column_name));
+                        metadata->fields.push_back(std::make_pair("index", i));
+                        metadata->fields.push_back(std::make_pair("type", type));
                         
                         i++;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",