fix: Avoid a bunch of heap allocations (shared_ptr/unique_ptr) (#130)

* fix: Avoid a bunch of heap allocations (shared_ptr/unique_ptr)

* fix: Avoid shared_ptr allocation for vector

* fix: Specs

* fix: `HybridNitroSQLiteOnLoad` implementation in nitrogen generated directory

* fix: remove old file

* fix: std::nullopt not callable

* fix: pass std::nullopt instead of NULL pointer to BatchQuery

* fix: make insertId optional again

* fix: pointer access

* fix: missing HybridObject base constructor call

* chore: update Podfile.lock

---------

Co-authored-by: Christoph Pader <chris@margelo.com>

Author: mrousavy

example/ios/Podfile.lock

@@ -1906,14 +1906,14 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 1dca942403ed9342f98334bf4c3621f011aa7946
-  DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
+  boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
+  DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 6fe148afcef2e3213e484758e3459609d40d57f5
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
-  glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
+  glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
   hermes-engine: b417d2b2aee3b89b58e63e23a51e02be91dc876d
-  NitroModules: 30b9dd66a1fffca12828563c9a3648c62758da65
+  NitroModules: 32f6f1111b1c77b51e7907aa92f4de3b1a1764bc
   RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809
   RCTDeprecation: b2eecf2d60216df56bc5e6be5f063826d3c1ee35
   RCTRequired: 78522de7dc73b81f3ed7890d145fa341f5bb32ea
@@ -1936,7 +1936,7 @@ SPEC CHECKSUMS:
   React-idlecallbacksnativemodule: dd2af19cdd3bc55149d17a2409ed72b694dfbe9c
   React-ImageManager: a77dde8d5aa6a2b6962c702bf3a47695ef0aa32b
   React-jserrorhandler: 9c14e89f12d5904257a79aaf84a70cd2e5ac07ba
-  React-jsi: f25e8fac296fc696d7f2a5275ef35e43c84e38c0
+  React-jsi: 0775a66820496769ad83e629f0f5cce621a57fc7
   React-jsiexecutor: 2cf5ba481386803f3c88b85c63fa102cba5d769e
   React-jsinspector: 8052d532bb7a98b6e021755674659802fb140cc5
   React-jsinspectortracing: bdd8fd0adcb4813663562e7874c5842449df6d8a

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt renamed to package/android/src/main/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt

@@ -5,6 +5,7 @@
 #include <cmath>
 #include <ctime>
 #include <iostream>
+#include <optional>
 #include <map>
 #include <sqlite3.h>
 #include <sstream>
@@ -143,8 +144,8 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
   std::string column_name;
   ColumnType column_declared_type;
   SQLiteQueryResultRow row;
-  auto results = std::make_unique<SQLiteQueryResults>();
-  auto metadata = new SQLiteQueryTableMetadata();
+  SQLiteQueryResults results;
+  std::optional<SQLiteQueryTableMetadata> metadata = std::nullopt;
 
   while (isConsuming) {
     result = sqlite3_step(statement);
@@ -192,7 +193,7 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
           }
           i++;
         }
-        results->push_back(std::move(row));
+        results.push_back(std::move(row));
         break;
       case SQLITE_DONE:
           i = 0;
@@ -202,6 +203,10 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
             const char* tp = sqlite3_column_decltype(statement, i);
             column_declared_type = mapSQLiteTypeToColumnType(tp);
             auto columnMeta = SQLiteQueryColumnMetadata(std::move(column_name), std::move(column_declared_type), i);
+
+            if (!metadata) {
+              metadata = std::make_optional<SQLiteQueryTableMetadata>();
+            }
             metadata->insert({column_name, columnMeta});
             i++;
           }
@@ -221,16 +226,11 @@ SQLiteExecuteQueryResult sqliteExecute(const std::string& dbName, const std::str
 
   int rowsAffected = sqlite3_changes(db);
   long long latestInsertRowId = sqlite3_last_insert_rowid(db);
-  auto meta = std::make_unique<std::optional<SQLiteQueryTableMetadata>>(
-    metadata && metadata->size() > 0
-    ? std::make_optional(std::move(*metadata))
-    : std::nullopt
-  );
   return {
     .rowsAffected = rowsAffected,
     .insertId = static_cast<double>(latestInsertRowId),
     .results = std::move(results),
-    .metadata = std::move(meta)
+    .metadata = std::move(metadata)
   };
 }
 

package/cpp/operations.cpp

@@ -3,19 +3,19 @@
 namespace margelo::nitro::rnnitrosqlite {
 
 std::optional<double> HybridNativeQueryResult::getInsertId() {
-  return this->_insertId;
+  return _result.insertId;
 }
 
 double HybridNativeQueryResult::getRowsAffected() {
-  return this->_rowsAffected;
+  return _result.rowsAffected;
 }
 
 SQLiteQueryResults HybridNativeQueryResult::getResults() {
-  return this->_results;
+  return _result.results;
 };
 
 std::optional<SQLiteQueryTableMetadata> HybridNativeQueryResult::getMetadata() {
-  return this->_metadata;
+  return _result.metadata;
 }
 
 } // namespace margelo::nitro::rnnitrosqlite

package/cpp/specs/HybridNativeQueryResult.cpp

@@ -11,27 +11,16 @@ namespace margelo::nitro::rnnitrosqlite {
 class HybridNativeQueryResult : public HybridNativeQueryResultSpec {
 public:
   HybridNativeQueryResult() : HybridObject(TAG) {}
-  HybridNativeQueryResult(std::optional<double> insertId, int rowsAffected, SQLiteQueryResults& results, std::optional<SQLiteQueryTableMetadata>& metadata)
-      : HybridObject(TAG),
-        _insertId(insertId),
-        _rowsAffected(rowsAffected),
-        _results(std::move(results)),
-        _metadata(std::move(metadata)) {}
+  HybridNativeQueryResult(SQLiteExecuteQueryResult&& result): HybridObject(TAG), _result(std::move(result)) {}
 
 private:
-  std::optional<double> _insertId;
-  int _rowsAffected;
-  SQLiteQueryResults _results;
-  std::optional<SQLiteQueryTableMetadata> _metadata;
+  SQLiteExecuteQueryResult _result;
 
 public:
   // Properties
   std::optional<double> getInsertId() override;
-  
   double getRowsAffected() override;
-  
   SQLiteQueryResults getResults() override;
-  
   std::optional<SQLiteQueryTableMetadata> getMetadata() override;
 };
 

package/cpp/specs/HybridNativeQueryResult.hpp

@@ -54,8 +54,8 @@ using ExecuteQueryResult = std::shared_ptr<HybridNativeQueryResultSpec>;
 
 ExecuteQueryResult HybridNitroSQLite::execute(const std::string& dbName, const std::string& query,
                                              const std::optional<SQLiteQueryParams>& params) {
-  auto result = sqliteExecute(dbName, query, params);
-  return std::make_shared<HybridNativeQueryResult>(result.insertId, result.rowsAffected, *result.results, *result.metadata);
+  SQLiteExecuteQueryResult result = sqliteExecute(dbName, query, params);
+  return std::make_shared<HybridNativeQueryResult>(std::move(result));
 };
 
 std::shared_ptr<Promise<std::shared_ptr<HybridNativeQueryResultSpec>>> HybridNitroSQLite::executeAsync(const std::string& dbName, const std::string& query,

package/cpp/specs/HybridNitroSQLite.cpp

@@ -19,13 +19,13 @@ std::vector<BatchQuery> batchParamsToCommands(const std::vector<BatchQueryComman
       if (std::holds_alternative<NestedParamsVec>(*command.params)) {
         // This arguments is an array of arrays, like a batch update of a single sql command.
         for (const auto& params : std::get<NestedParamsVec>(*command.params)) {
-          commands.push_back(BatchQuery{command.query, std::make_shared<ParamsVec>(params)});
+          commands.push_back(BatchQuery{command.query, ParamsVec(params)});
         }
       } else {
-        commands.push_back(BatchQuery{command.query, std::make_shared<ParamsVec>(std::move(std::get<ParamsVec>(*command.params)))});
+        commands.push_back(BatchQuery{command.query, std::move(std::get<ParamsVec>(*command.params))});
       }
     } else {
-      commands.push_back(BatchQuery{command.query, NULL});
+      commands.push_back(BatchQuery{command.query, std::nullopt});
     }
   }
 
@@ -48,7 +48,7 @@ SQLiteOperationResult sqliteExecuteBatch(const std::string& dbName, const std::v
       auto results = SQLiteQueryResults();
       auto metadata = std::optional<SQLiteQueryTableMetadata>(std::nullopt);
       try {
-        auto result = sqliteExecute(dbName, command.sql, *command.params.get());
+        auto result = sqliteExecute(dbName, command.sql, command.params);
         rowsAffected += result.rowsAffected;
       } catch (NitroSQLiteException& e) {
         sqliteExecuteLiteral(dbName, "ROLLBACK");

package/cpp/sqliteExecuteBatch.cpp

@@ -13,7 +13,7 @@ namespace margelo::rnnitrosqlite {
 
 struct BatchQuery {
   std::string sql;
-  std::shared_ptr<SQLiteQueryParams> params;
+  std::optional<SQLiteQueryParams> params;
 };
 
 /**

package/cpp/sqliteExecuteBatch.hpp

@@ -27,8 +27,8 @@ struct SQLiteExecuteQueryResult {
   int rowsAffected;
   double insertId;
 
-  std::unique_ptr<SQLiteQueryResults> results;
-  std::unique_ptr<std::optional<SQLiteQueryTableMetadata>> metadata;
+  SQLiteQueryResults results;
+  std::optional<SQLiteQueryTableMetadata> metadata;
 };
 
 // constexpr function that maps SQLiteColumnType to string literals