From 9800df245e1d46d724adc27d31dc87afcfd7405b Mon Sep 17 00:00:00 2001 From: maxence Date: Fri, 11 Apr 2025 16:18:56 +0200 Subject: [PATCH] fix: remove batch concurrency support --- src/parsers/command-options.lisp | 7 ++----- test/csv-districts-env.load | 1 - test/csv-districts-stdin.load | 1 - test/csv-districts.load | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/parsers/command-options.lisp b/src/parsers/command-options.lisp index b2155218..eb0cc82d 100644 --- a/src/parsers/command-options.lisp +++ b/src/parsers/command-options.lisp @@ -73,13 +73,10 @@ (bind (((_ _ _ val) batch-size)) (cons :batch-size val)))) -;;; deprecated, but still accept it in the parsing -(defrule option-prefetch-rows (and (or (and kw-batch kw-concurrency) - (and kw-prefetch kw-rows)) - equal-sign +(defrule option-prefetch-rows (and kw-prefetch kw-rows equal-sign (+ (digit-char-p character))) (:lambda (prefetch-rows) - (bind (((_ _ nb) prefetch-rows)) + (bind (((_ _ _ nb) prefetch-rows)) (cons :prefetch-rows (parse-integer (text nb)))))) (defrule option-rows-per-range (and kw-rows kw-per kw-range diff --git a/test/csv-districts-env.load b/test/csv-districts-env.load index c31cdbc3..5c69f99d 100644 --- a/test/csv-districts-env.load +++ b/test/csv-districts-env.load @@ -35,7 +35,6 @@ LOAD CSV skip header = 1, batch rows = 200, batch size = 1024 kB, - batch concurrency = 3, fields terminated by '\t' BEFORE LOAD DO diff --git a/test/csv-districts-stdin.load b/test/csv-districts-stdin.load index 5b6818f8..02daaf9e 100644 --- a/test/csv-districts-stdin.load +++ b/test/csv-districts-stdin.load @@ -30,7 +30,6 @@ LOAD CSV skip header = 1, batch rows = 200, batch size = 1024 kB, - batch concurrency = 3, fields terminated by '\t' BEFORE LOAD DO diff --git a/test/csv-districts.load b/test/csv-districts.load index 8eab0fa1..12918840 100644 --- a/test/csv-districts.load +++ b/test/csv-districts.load @@ -34,7 +34,6 @@ LOAD CSV skip header = 1, batch rows = 200, batch size = 1024 kB, - batch concurrency = 3, fields terminated by '\t' BEFORE LOAD DO