Skip to content

Commit dceae89

Browse files
committed
Don't build quoted_fields array when not needed
1 parent 4534f35 commit dceae89

File tree

12 files changed

+30
-11
lines changed

12 files changed

+30
-11
lines changed

benchmark/convert_nil.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ contexts:
44
csv: 3.0.1
55
- gems:
66
csv: 3.0.2
7+
- gems:
8+
csv: 3.3.0
79
- name: "master"
810
prelude: |
911
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/parse.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ contexts:
44
csv: 3.0.1
55
- gems:
66
csv: 3.0.2
7+
- gems:
8+
csv: 3.3.0
79
- name: "master"
810
prelude: |
911
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/parse_liberal_parsing.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ loop_count: 100
22
contexts:
33
- gems:
44
csv: 3.0.2
5+
- gems:
6+
csv: 3.3.0
57
- name: "master"
68
prelude: |
79
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/parse_quote_char_nil.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
loop_count: 100
22
contexts:
3+
- gems:
4+
csv: 3.3.0
35
- name: "master"
46
prelude: |
57
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/parse_strip.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
loop_count: 100
22
contexts:
3+
- gems:
4+
csv: 3.3.0
35
- name: "master"
46
prelude: |
57
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/read.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ contexts:
44
csv: 3.0.1
55
- gems:
66
csv: 3.0.2
7+
- gems:
8+
csv: 3.3.0
79
- name: "master"
810
prelude: |
911
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/shift.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ contexts:
44
csv: 3.0.1
55
- gems:
66
csv: 3.0.2
7+
- gems:
8+
csv: 3.3.0
79
- name: "master"
810
prelude: |
911
$LOAD_PATH.unshift(File.expand_path("lib"))

benchmark/write.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ contexts:
44
csv: 3.0.1
55
- gems:
66
csv: 3.0.2
7+
- gems:
8+
csv: 3.3.0
79
- name: "master"
810
prelude: |
911
$LOAD_PATH.unshift(File.expand_path("lib"))

lib/csv.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,12 @@ def initialize(encoding, line_number)
959959
write_empty_value: "",
960960
}.freeze
961961

962+
module NoQuotedFields # :nodoc:
963+
def self.[](_index)
964+
false
965+
end
966+
end
967+
962968
class << self
963969
# :call-seq:
964970
# instance(string, **options)

lib/csv/fields_converter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def empty?
4444
@converters.empty?
4545
end
4646

47-
def convert(fields, headers, lineno, quoted_fields)
47+
def convert(fields, headers, lineno, quoted_fields = NoQuotedFields)
4848
return fields unless need_convert?
4949

5050
fields.collect.with_index do |field, index|

0 commit comments

Comments
 (0)