MonetDB: Oct2020 - Updated non_updatable_index macro and typo

[Pedro Ferreira]

Changeset: b55b870f6b97 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b55b870f6b97
Modified Files:
        sql/backends/monet5/sql.c
        sql/include/sql_catalog.h
        sql/test/SQLancer/Tests/sqlancer06.stable.out
Branch: Oct2020
Log Message:

Updated non_updatable_index macro and typo


diffs (42 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3871,7 +3871,7 @@ sql_rowid(Client cntxt, MalBlkPtr mb, Ma
        /* HACK, get insert bat */
        b = store_funcs.bind_col(m->session->tr, c, RD_INS);
        if( b == NULL)
-               throw(SQL,"sql.rowid", SQLSTATE(HY005) "Canot access column 
descriptor");
+               throw(SQL,"sql.rowid", SQLSTATE(HY005) "Cannot access column 
descriptor");
        /* UGH (move into storage backends!!) */
        d = c->data;
        *rid = d->ibase + BATcount(b);
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -491,7 +491,7 @@ typedef enum idx_type {
 #define hash_index(t)          (t == hash_idx || t == oph_idx )
 #define idx_has_column(t)      (hash_index(t) || t == join_idx)
 #define oid_index(t)           (t == join_idx)
-#define non_updatable_index(t) (t == ordered_idx || t == no_idx)
+#define non_updatable_index(t) (t == ordered_idx || t == no_idx || 
!idx_has_column(t))
 
 typedef struct sql_idx {
        sql_base base;
diff --git a/sql/test/SQLancer/Tests/sqlancer06.stable.out 
b/sql/test/SQLancer/Tests/sqlancer06.stable.out
--- a/sql/test/SQLancer/Tests/sqlancer06.stable.out
+++ b/sql/test/SQLancer/Tests/sqlancer06.stable.out
@@ -44,6 +44,14 @@ stdout of test 'sqlancer06` in directory
 % smallint # type
 % 1 # length
 #ROLLBACK;
+#CREATE TABLE t2(c1 bigint UNIQUE PRIMARY KEY NOT NULL);
+#CREATE IMPRINTS INDEX i0 ON t2 (c1);
+#INSERT INTO t2(c1) VALUES(68055641); 
+[ 1    ]
+#CREATE INDEX i1 ON t2 (c1);
+#INSERT INTO t2(c1) VALUES(1807763525);
+[ 1    ]
+#DROP TABLE t2;
 
 # 19:38:32 >  
 # 19:38:32 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list