Don't abuse some Parsers APIs as much (#1038)

* Don't abuse some Parsers APIs as much

* fix

* fix 1.6 issue w/ Dict?

Author: quinnj

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
+          - '1.6'
           - '1' # automatically expands to the latest stable 1.x release of Julia
           - 'nightly'
         os:

Project.toml

@@ -26,7 +26,7 @@ PooledArrays = "0.5, 1.0"
 SentinelArrays = "1.2"
 Tables = "1.1"
 WeakRefStrings = "1.4"
-julia = "1.3"
+julia = "1.6"
 SnoopPrecompile = "1"
 
 [extras]

src/context.jl

@@ -459,7 +459,7 @@ end
         end
 
         # step 4b: generate or parse column names
-        names = detectcolumnnames(buf, headerpos, datapos, len, options, header, normalizenames)
+        names = detectcolumnnames(buf, headerpos, datapos, len, options, header, normalizenames, oq, eq, cq, cmt, ignoreemptyrows)
         ncols = length(names)
     else
         # transpose

src/detection.jl

@@ -161,7 +161,7 @@ function incr!(c::ByteValueCounter, b::UInt8)
 end
 
 # given the various header and normalization options, figure out column names for a file
-function detectcolumnnames(buf, headerpos, datapos, len, options, @nospecialize(header), normalizenames)::Vector{Symbol}
+function detectcolumnnames(buf, headerpos, datapos, len, options, @nospecialize(header), normalizenames, oq, eq, cq, cmt, ignoreemptyrows)::Vector{Symbol}
     if header isa Union{AbstractVector{Symbol}, AbstractVector{String}}
         fields, pos = readsplitline(buf, datapos, len, options)
         isempty(header) && return [Symbol(:Column, i) for i = 1:length(fields)]
@@ -175,7 +175,7 @@ function detectcolumnnames(buf, headerpos, datapos, len, options, @nospecialize(
     elseif header isa AbstractVector{<:Integer}
         names, pos = readsplitline(buf, headerpos, len, options)
         for row = 2:length(header)
-            pos = skiptorow(buf, pos, len, options.oq, options.e, options.cq, options.cmt, options.ignoreemptylines, 1, header[row] - header[row - 1])
+            pos = skiptorow(buf, pos, len, oq, eq, cq, cmt, ignoreemptyrows, 1, header[row] - header[row - 1])
             fields, pos = readsplitline(buf, pos, len, options)
             for (i, x) in enumerate(fields)
                 names[i] *= "_" * x

src/workload.jl

@@ -15,7 +15,7 @@ const PRECOMPILE_DATA = """"int,float,date,datetime,bool,null,str,catg,int_float
 
     CSV.read(
         joinpath(dirname(pathof(CSV)), "..", "test", "testfiles", "precompile_small.csv"),
-        Dict
+        Tables.dictcolumntable
     )
 
     table = Tables.dictcolumntable(Dict(

src/write.jl

@@ -1,3 +1,5 @@
+import Base: Ryu
+
 """
     CSV.write(file, table; kwargs...) => file
     table |> CSV.write(file; kwargs...) => file
@@ -460,8 +462,8 @@ function writecell(buf, pos, len, io, x::AbstractFloat, opts)
 end
 
 function writecell(buf, pos, len, io, x::T, opts) where {T <: Base.IEEEFloat}
-    @check Parsers.neededdigits(T)
-    return Parsers.writeshortest(buf, pos, x, false, false, true, -1, UInt8('e'), false, opts.decimal)
+    @check Ryu.neededdigits(T)
+    return Ryu.writeshortest(buf, pos, x, false, false, true, -1, UInt8('e'), false, opts.decimal)
 end
 
 getvalue(x::T, df) where {T <: Dates.TimeType} = Dates.format(x, df === nothing ? Dates.default_format(T) : df)