minor

xiaodaigh · Apr 12, 2021 · 9e8c6f6 · 9e8c6f6 · xiaodaigh · Apr 12, 2021
1 parent e9b64bd
commit 9e8c6f6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 46 deletions.
diff --git a/src/JDF.jl b/src/JDF.jl
@@ -55,20 +55,13 @@ include("type-writer-loader/substring.jl")
 include("column_loader.jl")
 include("compress_then_write.jl")
 
-<<<<<<< Updated upstream
 include("load-columns.jl")
-=======
->>>>>>> Stashed changes
 include("loadjdf.jl")
 include("savejdf.jl")
 include("type_compress.jl")
 
 include("metadata.jl")
 include("eachcol.jl")
-<<<<<<< Updated upstream
-=======
-include("getindex-view.jl")
->>>>>>> Stashed changes
 include("Tables.jl")
 
 # Blosc.set_num_threads(6)

diff --git a/src/JDFFile.jl b/src/JDFFile.jl
@@ -1,22 +1,14 @@
-<<<<<<< Updated upstream
 export JDFFile, @jdf_str, path, getindex
 
 import Base: getindex, view
 
-=======
-export JDFFile, @jdf_str, path
->>>>>>> Stashed changes
 
 """
     jdf"path/to/JDFfile.jdf"
 
     JDFFile("path/to/JDFfile.jdf")
 
-<<<<<<< Updated upstream
 Define a JDF file, which you use with methods like  `names` and `size`.
-=======
-Define a JDF file, which you can apply `names` and `size`.
->>>>>>> Stashed changes
 
 ## Example
 using JDF, DataFrames
@@ -70,7 +62,6 @@ end
 Return the path of the JDF
 """
 path(jdf) = getfield(jdf, :path)
-<<<<<<< Updated upstream
 
 
 function Base.getindex(file::JDFFile, rows, col::String)
@@ -85,5 +76,3 @@ end
 Base.view(file::JDFFile, rows, cols) = getindex(file, rows, cols)
 
 getindex(file::JDFFile, rows, cols) = JDF.load(file)[rows, cols]
-=======
->>>>>>> Stashed changes
diff --git a/src/Tables.jl b/src/Tables.jl
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 import Tables: rows, columns, istable, rowaccess, columnaccess, schema, Schema
 
 import Base: propertynames, getproperty
@@ -38,30 +37,3 @@ ncol(t::Table) = length(t.columns)
 Tables.columns(t::Table) = t.columns
 
 Tables.istable(t::Table) = true
-=======
-import Tables: rows, columns, istable, rowaccess, columnaccess, schema, Schema
-
-import Base: propertynames, getproperty
-
-export istable
-
-istable(::Type{JDFFile}) = true
-istable(::JDFFile) = true
-
-rowaccess(::JDFFile) = false
-columnaccess(::JDFFile) = true
-
-rowaccess(::Type{<:JDFFile}) = false
-columnaccess(::Type{<:JDFFile}) = true
-
-propertynames(jdf::JDFFile) = names(jdf)
-
-getproperty(jdf::JDFFile, col::Symbol) = jdf[!, col]
-
-schema(jdf::JDFFile) = begin
-    meta = metadata(jdf)
-    Schema(meta.names, map(x -> x.type, meta.metadatas))
-end
-
-columns(jdf::JDFFile) = jdf
->>>>>>> Stashed changes