add limit clause

Author: jfeser

.gitignore

@@ -1,6 +1,7 @@
 .ipynb_checkpoints/
 
 _build/
+_opam/
 
 config-*sh
 config.ini

bin/dune

@@ -34,23 +34,23 @@
   (pps ppx_sexp_conv ppx_let))
  (modules sample_tpch))
 
-(executable
- (package castor)
- (public_name sql-to-castor)
- (name parse_sql)
- (libraries core core_unix.command_unix sqlgg castor yojson)
- (preprocess
-  (pps ppx_sexp_conv ppx_let))
- (modules parse_sql))
+; (executable
+;  (package castor)
+;  (public_name sql-to-castor)
+;  (name parse_sql)
+;  (libraries core core_unix.command_unix sqlgg castor yojson)
+;  (preprocess
+;   (pps ppx_sexp_conv ppx_let))
+;  (modules parse_sql))
 
-(executable
- (package castor)
- (public_name cozy-to-castor)
- (name parse_cozy)
- (libraries core core_unix.command_unix castor)
- (preprocess
-  (pps ppx_sexp_conv ppx_let))
- (modules parse_cozy))
+; (executable
+;  (package castor)
+;  (public_name cozy-to-castor)
+;  (name parse_cozy)
+;  (libraries core core_unix.command_unix castor)
+;  (preprocess
+;   (pps ppx_sexp_conv ppx_let))
+;  (modules parse_cozy))
 
 (executable
  (package castor)
@@ -61,23 +61,23 @@
   (pps ppx_sexp_conv ppx_let))
  (modules combine))
 
-(executable
- (package castor)
- (name opt)
- (public_name opt.exe)
- (libraries core core_unix.command_unix castor logs logs.fmt fmt fmt.tty)
- (preprocess
-  (pps ppx_sexp_conv ppx_let ppx_sexp_conv ppx_compare ppx_hash))
- (modules opt))
+; (executable
+;  (package castor)
+;  (name opt)
+;  (public_name opt.exe)
+;  (libraries core core_unix.command_unix castor logs logs.fmt fmt fmt.tty)
+;  (preprocess
+;   (pps ppx_sexp_conv ppx_let ppx_sexp_conv ppx_compare ppx_hash))
+;  (modules opt))
 
-(executable
- (package castor)
- (name xform)
- (public_name xform.exe)
- (libraries core core_unix.command_unix castor logs logs.fmt fmt fmt.tty)
- (preprocess
-  (pps ppx_sexp_conv ppx_let ppx_sexp_conv ppx_compare ppx_hash))
- (modules xform))
+; (executable
+;  (package castor)
+;  (name xform)
+;  (public_name xform.exe)
+;  (libraries core core_unix.command_unix castor logs logs.fmt fmt fmt.tty)
+;  (preprocess
+;   (pps ppx_sexp_conv ppx_let ppx_sexp_conv ppx_compare ppx_hash))
+;  (modules xform))
 
 (executable
  (package castor)
@@ -87,3 +87,10 @@
  (preprocess
   (pps ppx_sexp_conv ppx_let ppx_sexp_conv ppx_compare ppx_hash))
  (modules sql))
+
+(executable
+ (package castor)
+ (public_name sql2code)
+ (libraries core fmt iter sql2code)
+ (preprocess (pps ppx_compare ppx_sexp_message ppx_sexp_conv ppx_let))
+ (modules sql2code))

flake.nix

@@ -9,25 +9,6 @@ module A = Constructors.Annot
 
 let pp = Abslayout_pp.pp
 
-let name r =
-  match r.node with
-  | Select _ -> "select"
-  | Filter _ -> "filter"
-  | DepJoin _ -> "depjoin"
-  | Join _ -> "join"
-  | GroupBy _ -> "group_by"
-  | Dedup _ -> "dedup"
-  | OrderBy _ -> "order_by"
-  | Relation _ -> "scan"
-  | AEmpty -> "empty"
-  | AScalar _ -> "scalar"
-  | AList _ -> "list"
-  | ATuple _ -> "tuple"
-  | AHashIdx _ -> "hash_idx"
-  | AOrderedIdx _ -> "ordered_idx"
-  | Range _ -> "range"
-  | Call _ -> "call"
-
 type error = [ `Parse_error of string * int * int ] [@@deriving sexp]
 
 let pp_err f fmt = function

lib/abslayout.ml

@@ -12,7 +12,6 @@ include Comparator.S with type t := t
 module O : Comparable.Infix with type t := t
 
 val pp : _ annot Fmt.t
-val name : t -> string
 
 val names : t -> Set.M(Name).t
 (** The set of names in a `t`. *)

lib/abslayout.mli

@@ -104,6 +104,7 @@ type ('p, 'r) query =
   | Dedup of 'r
   | Relation of Relation.t
   | Range of ('p * 'p)
+  | Limit of int
   | AEmpty
   | AScalar of 'p scalar
   | AList of 'r list_

lib/ast.ml

@@ -252,7 +252,7 @@ module Iter = struct
     | `First q | `Exists q -> annot q
 
   let query annot pred = function
-    | Relation _ | AEmpty | Call _ -> ()
+    | Relation _ | AEmpty | Call _ | Limit _ -> ()
     | Select (ps, q) | GroupBy (ps, _, q) ->
         List.iter ~f:(fun (p, _) -> pred p) (Select_list.to_list ps);
         annot q

lib/visitors.ml

@@ -281,6 +281,10 @@ class virtual ['self] base_endo =
       let r0 = self#visit_string env c0 in
       if c0 == r0 then this else Call r0
 
+    method visit_Limit env this c0 =
+      let r0 = self#visit_int env c0 in
+      if c0 == r0 then this else Limit r0
+
     method visit_query env this =
       match this with
       | Select c0 as this -> self#visit_Select env this c0
@@ -299,6 +303,7 @@ class virtual ['self] base_endo =
       | AHashIdx c0 as this -> self#visit_AHashIdx env this c0
       | AOrderedIdx c0 as this -> self#visit_AOrderedIdx env this c0
       | Call c0 as this -> self#visit_Call env this c0
+      | Limit c0 as this -> self#visit_Limit env this c0
 
     method visit_annot env this =
       let r0 = self#visit_query env this.node in
@@ -574,6 +579,10 @@ class virtual ['self] base_map =
       let r0 = self#visit_string env c0 in
       Call r0
 
+    method visit_Limit env c0 =
+      let r0 = self#visit_int env c0 in
+      Limit r0
+
     method visit_query env this =
       match this with
       | Select c0 -> self#visit_Select env c0
@@ -592,6 +601,7 @@ class virtual ['self] base_map =
       | AHashIdx c0 -> self#visit_AHashIdx env c0
       | AOrderedIdx c0 -> self#visit_AOrderedIdx env c0
       | Call c0 -> self#visit_Call env c0
+      | Limit c0 -> self#visit_Limit env c0
 
     method visit_annot env this =
       let r0 = self#visit_query env this.node in
@@ -863,6 +873,7 @@ class virtual ['self] base_iter =
       ()
 
     method visit_Call env c0 = self#visit_string env c0
+    method visit_Limit env c0 = self#visit_int env c0
 
     method visit_query env this =
       match this with
@@ -882,6 +893,7 @@ class virtual ['self] base_iter =
       | AHashIdx c0 -> self#visit_AHashIdx env c0
       | AOrderedIdx c0 -> self#visit_AOrderedIdx env c0
       | Call c0 -> self#visit_Call env c0
+      | Limit c0 -> self#visit_Limit env c0
 
     method visit_annot env this =
       let r0 = self#visit_query env this.node in
@@ -1153,6 +1165,7 @@ class virtual ['self] base_reduce =
       s0
 
     method visit_Call env c0 = self#visit_string env c0
+    method visit_Limit env c0 = self#visit_int env c0
 
     method visit_query env this =
       match this with
@@ -1172,6 +1185,7 @@ class virtual ['self] base_reduce =
       | AHashIdx c0 -> self#visit_AHashIdx env c0
       | AOrderedIdx c0 -> self#visit_AOrderedIdx env c0
       | Call c0 -> self#visit_Call env c0
+      | Limit c0 -> self#visit_Limit env c0
 
     method visit_annot env this =
       let s0 = self#visit_query env this.node in
@@ -1452,6 +1466,10 @@ class virtual ['self] base_mapreduce =
       let r0, s0 = self#visit_string env c0 in
       (Call r0, s0)
 
+    method visit_Limit env c0 =
+      let r0, s0 = self#visit_int env c0 in
+      (Limit r0, s0)
+
     method visit_query env this =
       match this with
       | Select c0 -> self#visit_Select env c0
@@ -1470,6 +1488,7 @@ class virtual ['self] base_mapreduce =
       | AHashIdx c0 -> self#visit_AHashIdx env c0
       | AOrderedIdx c0 -> self#visit_AOrderedIdx env c0
       | Call c0 -> self#visit_Call env c0
+      | Limit c0 -> self#visit_Limit env c0
 
     method visit_annot env this =
       let r0, s0 = self#visit_query env this.node in