Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rel v0.2] Migrate api.jl to the new language standard #126

Merged
merged 1 commit into from
Aug 26, 2024
Merged

[Rel v0.2] Migrate api.jl to the new language standard #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/api.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,15 +542,15 @@ completed, and returns a Dict holding the Transaction resource and its results a

# Examples:
```julia
julia> exec(ctx, "my_database", "my_engine", "2 + 2")
julia> exec(ctx, "my_database", "my_engine", "def output {2 + 2}")
Dict{String, Any} with 4 entries:
"metadata" => Union{}[]
"problems" => Union{}[]
"results" => Pair{String, Arrow.Table}["/:output/Int64"=>Arrow.Table with 1 r…
"transaction" => {…

julia> exec(ctx, "my_database", "my_engine", \"""
def insert:my_relation = 1, 2, 3
def insert[:my_relation]: (1, 2, 3)
\""",
readonly = false,
)
Expand Down Expand Up @@ -712,7 +712,7 @@ function _gen_literal(value)
end

function _gen_literal(value::Dict)
items = ["$(_gen_literal(v)),$(_gen_literal(k))" for (k, v) in value]
items = ["($(_gen_literal(v)),$(_gen_literal(k)))" for (k, v) in value]
return "{" + join(items, ";") + "}"
end

Expand All @@ -725,12 +725,12 @@ _gen_literal(value::Symbol) = ":$value"

function _gen_literal(value::Vector)
items = [_gen_literal(item) for item in value]
return "{" + join(items, ",") + "}"
return "{(" + join(items, ",") + ")}"
end

function _gen_config(name, value)
isnothing(value) && return ""
return "def config:syntax:$name=$(_gen_literal(value))"
return "def config[:syntax, :$name]: $(_gen_literal(value))"
end

function _gen_config(syntax::Dict)
Expand Down Expand Up @@ -761,8 +761,8 @@ function load_csv(
"escapechar" => escapechar,
"quotechar" => quotechar)
source = _gen_config(syntax)
source *= """def config:data = data
def insert:$relation = load_csv[config]"""
source *= """def config[:data]: data
def insert[:$relation]: load_csv[config]"""
return exec(ctx, database, engine, source; inputs = inputs, readonly = false, kw...)
end

Expand All @@ -771,8 +771,8 @@ end
# todo: data should be string or io
function load_json(ctx::Context, database::AbstractString, engine::AbstractString, relation::AbstractString, data; kw...)
inputs = Dict("data" => _read_data(data))
source = """def config:data = data\n
def insert:$relation = load_json[config]"""
source = """def config[:data]: data\n
def insert[:$relation]: load_json[config]"""
return exec(ctx, database, engine, source; inputs = inputs, readonly = false, kw...)
end

Expand All @@ -785,8 +785,8 @@ function load_models(ctx::Context, database::AbstractString, engine::AbstractStr
for (name, value) in models
input_name = string("input_", rand_uint, "_", index)
push!(queries, """
def delete:rel:catalog:model["$name"] = rel:catalog:model["$name"]
def insert:rel:catalog:model["$name"] = $input_name
def delete[:rel, :catalog, :model, "$name"]: rel[:catalog, :model, "$name"]
def insert[:rel, :catalog, :model, "$name"]: $input_name
""")

queries_inputs[input_name] = value
Expand All @@ -805,8 +805,8 @@ function load_models_async(ctx::Context, database::AbstractString, engine::Abstr
for (name, value) in models
input_name = string("input_", rand_uint, "_", index)
push!(queries, """
def delete:rel:catalog:model["$name"] = rel:catalog:model["$name"]
def insert:rel:catalog:model["$name"] = $input_name
def delete[:rel, :catalog, :model, "$name"]: rel[:catalog, :model, "$name"]
def insert[:rel, :catalog, :model, "$name"]: $input_name
""")

queries_inputs[input_name] = value
Expand All @@ -818,7 +818,7 @@ end

function list_models(ctx::Context, database::AbstractString, engine::AbstractString; kw...)
out_name = "model$(rand(UInt64))"
query = """ def output:$out_name[name] = rel:catalog:model(name, _) """
query = """ def output(:$out_name, name): rel(:catalog, :model, name, _) """
resp = exec(ctx, database, engine, query)
for result in resp.results
if occursin("/:output/:$out_name", result.first)
Expand All @@ -829,7 +829,7 @@ end

function get_model(ctx::Context, database::AbstractString, engine::AbstractString, name::AbstractString; kw...)
out_name = "model$(rand(UInt64))"
query = """def output:$out_name = rel:catalog:model[$(_escape_string_for_rel(name))]"""
query = """def output[:$out_name]: rel[:catalog, :model, $(_escape_string_for_rel(name))]"""
resp = exec(ctx, database, engine, query)
for result in resp.results
if occursin("/:output/:$out_name", result.first)
Expand All @@ -841,14 +841,14 @@ end

function delete_models(ctx::Context, database::AbstractString, engine::AbstractString, models::Vector{String}; kw...)
queries = ["""
def delete:rel:catalog:model[$(_escape_string_for_rel(model))] = rel:catalog:model[$(_escape_string_for_rel(model))]
def delete[:rel, :catalog, :model, $(_escape_string_for_rel(model))]: rel[:catalog, :model, $(_escape_string_for_rel(model))]
""" for model in models]
return exec(ctx, database, engine, join(queries, "\n"); readonly=false, kw...)
end

function delete_models_async(ctx::Context, database::AbstractString, engine::AbstractString, model::AbstractString; kw...)
queries = ["""
def delete:rel:catalog:model[$(_escape_string_for_rel(model))] = rel:catalog:model[$(_escape_string_for_rel(model))
def delete[:rel, :catalog, :model, $(_escape_string_for_rel(model))]: rel[:catalog, :model, $(_escape_string_for_rel(model))]
""" for model in models]
return exec_async(ctx, database, engine, join(queries, "\n"); readonly=false, kw...)
end
Expand Down
Loading