Fixes for recent Mz changes

Author: def-

expr.cc

@@ -323,7 +323,7 @@ const_expr::const_expr(prod *p, sqltype *type_constraint)
   else if (type->name[0] == '_')
     expr = "array[null, null]::" + type->name.substr(1, type->name.size()) + "[]";
   else
-    if (d6() == 1) {
+    if (d6() < 4) {
       if (type->name == "int2")
         expr = "-32768::int2";
       else if (type->name == "int4")
@@ -337,12 +337,12 @@ const_expr::const_expr(prod *p, sqltype *type_constraint)
       else if (type->name == "uint8")
         expr = "0::uint8";
       else if (type->name == "float4")
-        expr = "1E-37::float4";
+        expr = "'inf'::float4";
       else if (type->name == "float8")
-        expr = "'1E-307'::float8";
+        expr = "'inf'::float8";
       else
         expr = "cast(0 as " + type->name + ")";
-    } else if (d6() == 1) {
+    } else if (d6() < 4) {
       if (type->name == "int2")
         expr = "32767::int2";
       else if (type->name == "int4")
@@ -356,9 +356,9 @@ const_expr::const_expr(prod *p, sqltype *type_constraint)
       else if (type->name == "uint8")
         expr = "18446744073709551615::uint8";
       else if (type->name == "float4")
-        expr = "1E+37::float4";
+        expr = "'nan'::float4";
       else if (type->name == "float8")
-        expr = "'1E+307'::float8";
+        expr = "'nan'::float8";
       else
         expr = "1::" + type->name;
     } else if (d6() == 1) {

grammar.cc

@@ -255,10 +255,6 @@ void query_spec::out(std::ostream &out) {
   indent(out);
   out << "where ";
   out << *search;
-  indent(out);
-  out << "limit coalesce(";
-  out << *limit;
-  out << ", " << d100() + d100() << ")";
 }
 
 struct for_update_verify : prod_visitor {
@@ -327,15 +323,12 @@ query_spec::query_spec(prod *p, struct scope *s, bool lateral) :
   if (lateral)
     scope->refs = s->refs;
 
-  limit = value_expr::factory(this, scope->schema->inttype, false);
-  
   from_clause = make_shared<struct from_clause>(this);
   select_list = make_shared<struct select_list>(this);
 
   set_quantifier = (d100() == 1) ? "distinct" : "";
 
   search = bool_expr::factory(this);
-  //limit = make_shared<column_reference>(this, scope->schema->inttype);
 }
 
 long prepare_stmt::seq;

grammar.hh

@@ -134,13 +134,11 @@ struct query_spec : prod {
   shared_ptr<struct from_clause> from_clause;
   shared_ptr<struct select_list> select_list;
   shared_ptr<bool_expr> search;
-  shared_ptr<value_expr> limit;
   struct scope myscope;
   virtual void out(std::ostream &out);
   query_spec(prod *p, struct scope *s, bool lateral = 0);
   virtual void accept(prod_visitor *v) {
     v->visit(this);
-    limit->accept(v);
     select_list->accept(v);
     from_clause->accept(v);
     search->accept(v);

postgres.cc

@@ -85,7 +85,6 @@ void dut_pqxx::test(const std::string &stmt)
   try {
     pqxx::work w(c);
     w.exec("SET TRANSACTION_ISOLATION TO 'SERIALIZABLE'");
-    //w.exec("SET CLUSTER_REPLICA = default.r1");
     w.exec(stmt.c_str());
     if (d6() < 4)
       w.abort();
@@ -334,6 +333,8 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
       "WHERE array_length(mz_operators.argument_type_ids, 1) = 2 "
       "AND mz_operators.name <> '<@' " // type system insufficient
       "AND mz_operators.name <> '@>' " // type system insufficient
+      "AND mz_operators.name <> '<<' " // unknown operator for uint
+      "AND mz_operators.name <> '>>' " // unknown operator for uint
       "UNION SELECT "
       "mz_operators.name AS oprname, "
       "0 as oprleft, "
@@ -342,7 +343,8 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
       "FROM mz_catalog.mz_operators "
       "JOIN mz_catalog.mz_types AS ret_type ON mz_operators.return_type_id = ret_type.id "
       "JOIN mz_catalog.mz_types AS right_type ON mz_operators.argument_type_ids[1] = right_type.id "
-      "WHERE array_length(mz_operators.argument_type_ids, 1) = 1");
+      "WHERE array_length(mz_operators.argument_type_ids, 1) = 1 "
+      );
 
     if (dump_state) {
       data["operators"] = json::array();
@@ -417,6 +419,8 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
       "AND (mz_functions.name <> 'sum' OR mz_functions.return_type_id <> (select id from mz_types where name = 'interval'))" // sum(interval) not yet supported, see https://github.com/MaterializeInc/materialize/issues/18043
       "AND (mz_functions.name <> 'timezone' OR mz_functions.argument_type_ids[2] <> (select id from mz_types where name = 'time'))" // timezone with time type is intentionally not supported, see https://github.com/MaterializeInc/materialize/pull/22960
       "AND mz_functions.name <> 'pretty_sql' " // Expected a keyword at the beginning of a statement, found ...
+      "AND mz_functions.name <> 'map_build' " // map_build(text list) does not exist
+      "AND mz_functions.name <> 'mz_any' " // https://github.com/MaterializeInc/database-issues/issues/9298
       "AND NOT (" + procedure_is_aggregate + " or " + procedure_is_window + ") ");
 
     if (dump_state) {
@@ -520,7 +524,6 @@ schema_pqxx::schema_pqxx(std::string &conninfo, bool no_catalog, bool dump_state
       "AND NOT (mz_functions.name in ('sum', 'avg', 'avg_internal_v1') AND ret_type.oid = 1186) " // https://github.com/MaterializeInc/materialize/issues/18043
       "AND mz_functions.name <> 'array_agg' " // https://github.com/MaterializeInc/materialize/issues/18044
       "AND NOT (mz_functions.name = 'string_agg' AND ret_type.oid = 17) " // string_agg on BYTEA not yet supported
-      "AND NOT mz_functions.name in ('mz_all', 'mz_any') " // https://github.com/MaterializeInc/materialize/issues/18057
       "AND " + procedure_is_aggregate + " AND NOT " + procedure_is_window);
     for (auto row : r) {
       routine proc(row[0].as<string>(),