Skip to content

Commit

Permalink
Update to latest FileIO naming convention
Browse files Browse the repository at this point in the history
  • Loading branch information
davidanthoff committed May 26, 2018
1 parent 2b9fa73 commit 65e9a30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Parquet 0.1.0
IteratorInterfaceExtensions 0.0.2
TableTraits 0.0.3
NamedTuples 4.0.0
FileIO 0.6.1
FileIO 0.9.0
IterableTables 0.6.0
8 changes: 5 additions & 3 deletions src/ParquetFiles.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
module ParquetFiles

using Parquet, IteratorInterfaceExtensions, TableTraits, NamedTuples
import FileIO
using Parquet, IteratorInterfaceExtensions, TableTraits, NamedTuples,
FileIO
import IterableTables

export load

struct ParquetFile
filename::String
end
Expand Down Expand Up @@ -38,7 +40,7 @@ function Base.done(itr::ParquetNamedTupleIterator, state)
return done(itr.rc, state)
end

function load(f::FileIO.File{FileIO.format"Parquet"})
function fileio_load(f::FileIO.File{FileIO.format"Parquet"})
return ParquetFile(f.filename)
end

Expand Down
4 changes: 1 addition & 3 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using ParquetFiles
using FileIO
using NamedTuples
import IterableTables
using Base.Test

@testset "ParquetFiles" begin
Expand All @@ -12,7 +10,7 @@ include(joinpath(parquet_pkg_dir, "test", "get_parcompat.jl"))

test_filename = joinpath(parquet_pkg_dir, "test", "parquet-compatibility", "parquet-testdata", "impala", "1.1.1-NONE", "nation.impala.parquet")

pqf = ParquetFiles.load( File{format"Parquet"}(test_filename))
pqf = load(test_filename)

@test IteratorInterfaceExtensions.isiterable(pqf) == true
@test TableTraits.isiterabletable(pqf) == true
Expand Down

0 comments on commit 65e9a30

Please sign in to comment.