fixup! Return row counts for SQL ingestion (storage.sql.ingest()).

cloudflare · Apr 29, 2024 · f583865 · f583865
1 parent 9e1f75e
commit f583865
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/src/workerd/api/sql-test.js b/src/workerd/api/sql-test.js
@@ -120,7 +120,7 @@ async function test(storage) {
         // Ingest any complete statements and snip those chars off the buffer
         let result = sql.ingest(buffer);
         buffer = result.remainder;
-        totalRowsWritten += result.meta.rowsWritten;
+        totalRowsWritten += result.rowsWritten;
 
         // Simulate awaiting next chunk
         await scheduler.wait(1)

diff --git a/src/workerd/api/sql.c++ b/src/workerd/api/sql.c++
@@ -300,14 +300,9 @@ SqlStorage::IngestResult::IngestResult(kj::String remainder, uint64_t rowsRead,
 
 kj::StringPtr SqlStorage::IngestResult::getRemainder() { return remainder; }
 
-jsg::Ref<SqlStorage::IngestResult::Meta>  SqlStorage::IngestResult::getMeta() { return jsg::alloc<Meta>(rowsRead, rowsWritten); }
+double SqlStorage::IngestResult::getRowsRead() { return rowsRead; }
 
-
-SqlStorage::IngestResult::Meta::Meta(uint64_t rowsRead, uint64_t rowsWritten)  : rowsRead(rowsRead), rowsWritten(rowsWritten) {}
-
-double SqlStorage::IngestResult::Meta::getRowsRead() { return rowsRead; }
-
-double SqlStorage::IngestResult::Meta::getRowsWritten() { return rowsWritten; }
+double SqlStorage::IngestResult::getRowsWritten() { return rowsWritten; }
 
 
 }  // namespace workerd::api
diff --git a/src/workerd/api/sql.h b/src/workerd/api/sql.h
@@ -254,48 +254,31 @@ class SqlStorage::Statement final: public jsg::Object {
 
 class SqlStorage::IngestResult final : public jsg::Object {
 public:
-  class Meta;
 
   IngestResult(kj::String remainder, uint64_t rowsRead, uint64_t rowsWritten);
 
   JSG_RESOURCE_TYPE(IngestResult) {
-    JSG_READONLY_PROTOTYPE_PROPERTY(meta, getMeta);
-    JSG_READONLY_PROTOTYPE_PROPERTY(remainder, getRemainder);
-    JSG_NESTED_TYPE(Meta);
-  }
-
-  jsg::Ref<Meta> getMeta();
-  kj::StringPtr getRemainder();
-
-private:
-  kj::String remainder;
-  uint64_t rowsRead;
-  uint64_t rowsWritten;
-};
-
-class SqlStorage::IngestResult::Meta final : public jsg::Object {
-public:
-  Meta(uint64_t rowsRead, uint64_t rowsWritten);
-
-  JSG_RESOURCE_TYPE(Meta) {
     JSG_READONLY_PROTOTYPE_PROPERTY(rowsRead, getRowsRead);
     JSG_READONLY_PROTOTYPE_PROPERTY(rowsWritten, getRowsWritten);
+    JSG_READONLY_PROTOTYPE_PROPERTY(remainder, getRemainder);
   }
 
+  kj::StringPtr getRemainder();
   double getRowsRead();
   double getRowsWritten();
 
 private:
+  kj::String remainder;
   uint64_t rowsRead;
   uint64_t rowsWritten;
 };
 
+
 #define EW_SQL_ISOLATE_TYPES                    \
   api::SqlStorage,                              \
   api::SqlStorage::Statement,                   \
   api::SqlStorage::Cursor,                      \
   api::SqlStorage::IngestResult,                \
-  api::SqlStorage::IngestResult::Meta,          \
   api::SqlStorage::Cursor::RowIterator,         \
   api::SqlStorage::Cursor::RowIterator::Next,   \
   api::SqlStorage::Cursor::RawIterator,         \