sqlite-executor 4.0.1 → 4.0.2

package/dist/cjs/index.cjs

@@ -465,6 +465,7 @@ function createRowStreamParser(onRow) {
 }
 var TOKEN_COLUMN = "__sqlite_executor_token__";
 var DEFAULT_BATCH_SIZE = 10;
+var DEFAULT_MAX_INFLIGHT = 50;
 function stream_check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) throw new TypeError("Cannot initialize the same private elements twice on an object");
 }
@@ -1703,9 +1704,13 @@ function buildPayload(sql, token) {
     var suffix = normalized.endsWith(";") ? "" : ";";
     return "".concat(normalized).concat(suffix, "\nSELECT '").concat(token, "' AS ").concat(TOKEN_COLUMN, ";\n");
 }
+function isTransactionControl(sql) {
+    var s = sql.trim().toUpperCase();
+    return "BEGIN" === s || "BEGIN TRANSACTION" === s || "COMMIT" === s || "COMMIT TRANSACTION" === s || "ROLLBACK" === s || "ROLLBACK TRANSACTION" === s || s.startsWith("BEGIN ") || s.startsWith("COMMIT ") || s.startsWith("ROLLBACK ");
+}
 function buildBatchPayload(batch) {
     var useWalBatch = batch.length > 1 && batch.every(function(t) {
-        return "execute" === t.kind;
+        return "execute" === t.kind && !isTransactionControl(t.sql);
     });
     if (useWalBatch) {
         var parts = [
@@ -1924,12 +1929,12 @@ function taskWorker_unsupported_iterable_to_array(o, minLen) {
     if ("Map" === n || "Set" === n) return Array.from(n);
     if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return taskWorker_array_like_to_array(o, minLen);
 }
-var _processManager = /*#__PURE__*/ new WeakMap(), _pendingQueue = /*#__PURE__*/ new WeakMap(), _inflightTasks = /*#__PURE__*/ new WeakMap(), _pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _scheduledFinalize = /*#__PURE__*/ new WeakMap(), _valueParser = /*#__PURE__*/ new WeakMap(), _statementTimeout = /*#__PURE__*/ new WeakMap(), _logger = /*#__PURE__*/ new WeakMap(), _name = /*#__PURE__*/ new WeakMap(), _batchSize = /*#__PURE__*/ new WeakMap(), _metrics = /*#__PURE__*/ new WeakMap(), _startProcess = /*#__PURE__*/ new WeakSet(), _pumpQueue = /*#__PURE__*/ new WeakSet(), _handleParsedValue = /*#__PURE__*/ new WeakSet(), _scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), _handleStderrChunk = /*#__PURE__*/ new WeakSet(), _handleTaskTimeout = /*#__PURE__*/ new WeakSet(), _settleTask = /*#__PURE__*/ new WeakSet(), _rejectAll = /*#__PURE__*/ new WeakSet();
+var _processManager = /*#__PURE__*/ new WeakMap(), _pendingQueue = /*#__PURE__*/ new WeakMap(), _inflightTasks = /*#__PURE__*/ new WeakMap(), _pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _scheduledFinalize = /*#__PURE__*/ new WeakMap(), _valueParser = /*#__PURE__*/ new WeakMap(), _statementTimeout = /*#__PURE__*/ new WeakMap(), _logger = /*#__PURE__*/ new WeakMap(), _name = /*#__PURE__*/ new WeakMap(), _batchSize = /*#__PURE__*/ new WeakMap(), _maxInflight = /*#__PURE__*/ new WeakMap(), _metrics = /*#__PURE__*/ new WeakMap(), _startProcess = /*#__PURE__*/ new WeakSet(), _pumpQueue = /*#__PURE__*/ new WeakSet(), _handleParsedValue = /*#__PURE__*/ new WeakSet(), _scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), _handleStderrChunk = /*#__PURE__*/ new WeakSet(), _handleTaskTimeout = /*#__PURE__*/ new WeakSet(), _settleTask = /*#__PURE__*/ new WeakSet(), _rejectAll = /*#__PURE__*/ new WeakSet();
 var taskWorker_TaskWorker = /*#__PURE__*/ function() {
     "use strict";
     function TaskWorker(param) {
         var _this = this;
-        var binary = param.binary, database = param.database, statementTimeout = param.statementTimeout, logger = param.logger, name = param.name, initMode = param.initMode, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, metrics = param.metrics;
+        var binary = param.binary, database = param.database, statementTimeout = param.statementTimeout, logger = param.logger, name = param.name, initMode = param.initMode, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, metrics = param.metrics;
         taskWorker_class_call_check(this, TaskWorker);
         taskWorker_class_private_method_init(this, _startProcess);
         taskWorker_class_private_method_init(this, _pumpQueue);
@@ -1979,6 +1984,10 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
             writable: true,
             value: void 0
         });
+        taskWorker_class_private_field_init(this, _maxInflight, {
+            writable: true,
+            value: void 0
+        });
         taskWorker_class_private_field_init(this, _metrics, {
             writable: true,
             value: void 0
@@ -1987,6 +1996,7 @@ var taskWorker_TaskWorker = /*#__PURE__*/ function() {
         taskWorker_class_private_field_set(this, _statementTimeout, statementTimeout);
         taskWorker_class_private_field_set(this, _logger, logger);
         taskWorker_class_private_field_set(this, _batchSize, batchSize);
+        taskWorker_class_private_field_set(this, _maxInflight, maxInflight);
         taskWorker_class_private_field_set(this, _metrics, metrics);
         taskWorker_class_private_field_set(this, _processManager, new process_ProcessManager({
             binary: binary,
@@ -2076,8 +2086,9 @@ function startProcess() {
 function pumpQueue() {
     var _this = this;
     var _$_class_private_field_get;
+    if (taskWorker_class_private_field_get(this, _inflightTasks).length >= taskWorker_class_private_field_get(this, _maxInflight)) return;
     var batch = [];
-    while(batch.length < taskWorker_class_private_field_get(this, _batchSize) && !taskWorker_class_private_field_get(this, _pendingQueue).isEmpty()){
+    while(batch.length < taskWorker_class_private_field_get(this, _batchSize) && !taskWorker_class_private_field_get(this, _pendingQueue).isEmpty() && taskWorker_class_private_field_get(this, _inflightTasks).length + batch.length < taskWorker_class_private_field_get(this, _maxInflight)){
         var task = taskWorker_class_private_field_get(this, _pendingQueue).peek();
         if ("stream" === task.kind && (batch.length > 0 || taskWorker_class_private_field_get(this, _inflightTasks).length > 0)) break;
         taskWorker_class_private_field_get(this, _pendingQueue).dequeue();
@@ -2958,12 +2969,12 @@ function pipelineEngine_unsupported_iterable_to_array(o, minLen) {
     if ("Map" === n || "Set" === n) return Array.from(n);
     if ("Arguments" === n || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return pipelineEngine_array_like_to_array(o, minLen);
 }
-var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
+var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflightTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduledFinalize = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), pipelineEngine_handleParsedValue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
 var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
     "use strict";
     function PipelineEngine(processManager, param) {
         var _this = this;
-        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, onTaskTimeout = param.onTaskTimeout;
+        var metrics = param.metrics, statementTimeout = param.statementTimeout, logger = param.logger, _param_batchSize = param.batchSize, batchSize = void 0 === _param_batchSize ? DEFAULT_BATCH_SIZE : _param_batchSize, _param_maxInflight = param.maxInflight, maxInflight = void 0 === _param_maxInflight ? DEFAULT_MAX_INFLIGHT : _param_maxInflight, onTaskTimeout = param.onTaskTimeout;
         pipelineEngine_class_call_check(this, PipelineEngine);
         pipelineEngine_class_private_method_init(this, core_pipelineEngine_pumpQueue);
         pipelineEngine_class_private_method_init(this, pipelineEngine_handleParsedValue);
@@ -3009,6 +3020,10 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             writable: true,
             value: void 0
         });
+        pipelineEngine_class_private_field_init(this, pipelineEngine_maxInflight, {
+            writable: true,
+            value: void 0
+        });
         pipelineEngine_class_private_field_init(this, _onTaskTimeout, {
             writable: true,
             value: void 0
@@ -3022,6 +3037,7 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
         pipelineEngine_class_private_field_set(this, pipelineEngine_statementTimeout, statementTimeout);
         pipelineEngine_class_private_field_set(this, pipelineEngine_logger, logger);
         pipelineEngine_class_private_field_set(this, pipelineEngine_batchSize, batchSize);
+        pipelineEngine_class_private_field_set(this, pipelineEngine_maxInflight, maxInflight);
         pipelineEngine_class_private_field_set(this, _onTaskTimeout, null != onTaskTimeout ? onTaskTimeout : function() {});
         pipelineEngine_class_private_field_set(this, _sharedValueParser, createJsonValueParser(function(raw) {
             return pipelineEngine_class_private_method_get(_this, pipelineEngine_handleParsedValue, core_pipelineEngine_handleParsedValue).call(_this, raw);
@@ -3158,8 +3174,9 @@ function pipelineEngine_pumpQueue() {
     var _this = this;
     var _$_class_private_field_get;
     if (!pipelineEngine_class_private_field_get(this, _active)) return;
+    if (pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length >= pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)) return;
     var batch = [];
-    while(batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_batchSize) && !pipelineEngine_class_private_field_get(this, _queue).isEmpty()){
+    while(batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_batchSize) && !pipelineEngine_class_private_field_get(this, _queue).isEmpty() && pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length + batch.length < pipelineEngine_class_private_field_get(this, pipelineEngine_maxInflight)){
         var task = pipelineEngine_class_private_field_get(this, _queue).peek();
         if ("stream" === task.kind && (batch.length > 0 || pipelineEngine_class_private_field_get(this, pipelineEngine_inflightTasks).length > 0)) break;
         pipelineEngine_class_private_field_get(this, _queue).dequeue();