*)
module M = MathQL
+module I = M.I
+module U = AvsUtil
module P = MQIPostgres
module C = MQIConn
-module U = MQIUtil
+module A = MQIMap
let not_supported s =
raise (Failure ("MQIProperty: feature not supported: " ^ s))
| [head] -> f head
| head :: tail -> f head ^ sep ^ iter f sep tail
in
+ let avs_iter f sep v =
+ let aux a s = function
+ | true -> a ^ (f s) ^ sep
+ | false -> a ^ (f s)
+ in
+ I.iter aux "" v
+ in
let pg_cols = iter (fun x -> x) ", " cols in
- let pg_msval v = iter P.quote ", " v in
+ let pg_msval v = avs_iter P.quote ", " v in
let pg_con (pat, col, v) =
if col <> "" then
let f s = col ^ " ~ " ^ P.quote ("^" ^ s ^ "$") in
- if pat then "(" ^ iter f " or " v ^ ")"
- else match v with
- | [s] -> col ^ " = " ^ (P.quote s)
- | v -> col ^ " in (" ^ pg_msval v ^ ")"
+ if pat then "(" ^ avs_iter f " or " v ^ ")"
+ else match I.single v with
+ | Some s -> col ^ " = " ^ (P.quote s)
+ | None -> col ^ " in (" ^ pg_msval v ^ ")"
else "true"
in
let pg_cons l = iter pg_con " and " l in
| _ -> []
else
exec ("select " ^ pg_cols ^ " from " ^ table ^ pg_where ^
- " order by " ^ List.hd cols ^ " asc")
+ " order by " ^ List.hd cols ^ " asc") (* desc *)
(* Galax backend ***********************************************************)
(* Common functions ********************************************************)
-let pg_result distinct subj el res =
- let compose = if distinct then List.map else fun f -> U.mql_iter (fun x -> [f x]) in
+let pg_result subj el res =
let get_name = function (p, None) -> p | (_, Some p) -> p in
let names = List.map get_name el in
- let mk_grp l =
- let grp = U.mql_iter2 (fun p s -> [(p, [s])]) names l in
- if grp = [] then [] else [grp]
- in
- let mk_avs l =
- if subj = "" then ("", mk_grp l) else (List.hd l, mk_grp (List.tl l))
+ let mk_grp l = U.grp_iter2 I.grp_make names l in
+ let mk_avs l =
+ if subj = "" then I.make "" (mk_grp l)
+ else I.make (List.hd l) (mk_grp (List.tl l))
in
- compose mk_avs res
-
-let get_table mc ct cfl el =
- let fst = function
- | [] -> None
- | head :: tail -> Some head
- in
- let comp n1 n2 = match n1, n2 with
- | None, _ -> n2
- | Some h, Some k when h = k -> n2
- | _, None -> n1
- | _ -> not_supported "comp"
- in
- let rec get_c prev = function
- | [] -> prev
- | (_, p, _) :: tail -> get_c (comp prev (fst p)) tail
- in
- let rec get_e prev = function
- | [] -> prev
- | (p, _) :: tail -> get_e (comp prev (fst p)) tail
- in
- get_e (get_c (get_c (fst mc) ct) (List.concat cfl)) el
-
-let rec decolon s =
- let l = String.length s in
- try
- let i = String.index s ':' in
- String.sub s 0 i ^ "_" ^ decolon (String.sub s (succ i) (l - succ i))
- with Not_found -> s
-
-let conv_bp = function
- | [] -> "h_occurrence"
- | [t] -> ""
- | [_; "h:occurrence"] -> "source"
- | [_; t] -> decolon t
- | _ -> not_supported "conv_bp"
-
-let conv_gen = function
- | [] -> "source"
- | ["objectName"] -> "value"
- | [t] -> ""
- | [_; t] -> decolon t
- | _ -> not_supported "conv"
-
-let exec_single h mc ct cfl el t =
- let table = match t with Some t -> decolon t | None -> "objectName" in
- let table, conv =
- if table = "backPointer" then "refObj", conv_bp else table, conv_gen
- in
+ U.iter mk_avs res
+
+let get_table h mc ct cfl el =
+ let aux_c ts (_, p, _) = A.refine_tables ts (C.tables h p) in
+ let aux_e ts (p, _) = A.refine_tables ts (C.tables h p) in
+ let fst = C.tables h mc in
+ let snd = List.fold_left aux_c fst (ct @ (List.concat cfl)) in
+ let trd = List.fold_left aux_e snd el in
+ A.default_table trd
+
+let exec_single h mc ct cfl el table =
+ let conv p = C.field h p table in
let first = conv mc in
let mk_con l = List.map (fun (pat, p, v) -> (pat, conv p, v)) l in
let cons_true = mk_con ct in
let other_cols = List.map (fun (p, _) -> conv p) el in
let cols = if first = "" then other_cols else first :: other_cols in
let low_level = if C.set h C.Galax then gx_query else pg_query in
- pg_result false first el (low_level h table cols cons_true cons_false)
+ let result = low_level h (C.resolve h table) cols cons_true cons_false in
+ pg_result first el result
let deadline = 100
let exec h refine mc ct cfl el =
if refine <> M.RefineExact then not_supported "exec";
- let table = get_table mc ct cfl el in
+ let table = get_table h mc ct cfl el in
let rec exec_aux ct = match ct with
- | (pat, p, v) :: tail when List.length v > deadline ->
- let single s = exec_aux ((pat, p, [s]) :: tail) in
- U.mql_iter single v
+ | (pat, p, v) :: tail when U.count v > deadline ->
+ let single a s _ = I.union a (exec_aux ((pat, p, I.make s I.grp_empty) :: tail)) in
+ I.iter single U.val_false v
| _ ->
exec_single h mc ct cfl el table
in exec_aux ct
| _ -> ""
let get_id b = if b then ["B"] else ["F"]
+
projects / helm.git / blobdiff