Changeset: 7926afef3866 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7926afef3866
Removed Files:
sql/test/BugTracker-2022/Tests/index-function-query.Bug-7238.test
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
sql/ChangeLog
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/common/sql_types.c
sql/test/BugTracker-2022/Tests/All
sql/test/SQLancer/Tests/sqlancer08.test
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Remove functions sys.index and sys.strings.
diffs (truncated from 31529 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -44458,21 +44458,6 @@ pattern batsql.get_value(X_0:bat[:str],
mvc_get_value_bulk;
return the current value of the sequence (ie the next to be used value)
batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:bte]
-BATSTRindex_bte;
-Return the offsets as an index bat
-batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:int]
-BATSTRindex_int;
-Return the offsets as an index bat
-batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:sht]
-BATSTRindex_sht;
-Return the offsets as an index bat
-batsql
lag
pattern batsql.lag(X_0:any_1, X_1:any, X_2:bat[:any_1], X_3:any_2,
X_4:any_3):bat[:any_1]
SQLlag;
@@ -44803,11 +44788,6 @@ pattern batsql.str_group_concat(X_0:str,
SQLstrgroup_concat;
return the string concatenation of groups with a custom separator
batsql
-strings
-command batsql.strings(X_0:bat[:str]):bat[:str]
-BATSTRstrings;
-Return the strings
-batsql
sum
pattern batsql.sum(X_0:bat[:bte], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:hge]
SQLsum;
@@ -63298,21 +63278,6 @@ unsafe pattern sql.include(X_0:str):void
SQLinclude;
Compile and execute a sql statements on the file
sql
-index
-command sql.index(X_0:str, X_1:bit):bte
-STRindex_bte;
-Return the offsets as an index bat
-sql
-index
-command sql.index(X_0:str, X_1:bit):int
-STRindex_int;
-Return the offsets as an index bat
-sql
-index
-command sql.index(X_0:str, X_1:bit):sht
-STRindex_sht;
-Return the offsets as an index bat
-sql
lag
pattern sql.lag(X_0:any_1, X_1:any, X_2:any_1, X_3:bit, X_4:bit):any_1
SQLlag;
@@ -63753,11 +63718,6 @@ pattern sql.str_group_concat(X_0:str, X_
SQLstrgroup_concat;
return the string concatenation of groups with a custom separator
sql
-strings
-command sql.strings(X_0:str):str
-STRstrings;
-Return the strings
-sql
subdelta
command sql.subdelta(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:oid]):bat[:oid]
DELTAsub;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -31753,21 +31753,6 @@ pattern batsql.get_value(X_0:bat[:str],
mvc_get_value_bulk;
return the current value of the sequence (ie the next to be used value)
batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:bte]
-BATSTRindex_bte;
-Return the offsets as an index bat
-batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:int]
-BATSTRindex_int;
-Return the offsets as an index bat
-batsql
-index
-command batsql.index(X_0:bat[:str], X_1:bit):bat[:sht]
-BATSTRindex_sht;
-Return the offsets as an index bat
-batsql
lag
pattern batsql.lag(X_0:any_1, X_1:any, X_2:bat[:any_1], X_3:any_2,
X_4:any_3):bat[:any_1]
SQLlag;
@@ -32063,11 +32048,6 @@ pattern batsql.str_group_concat(X_0:str,
SQLstrgroup_concat;
return the string concatenation of groups with a custom separator
batsql
-strings
-command batsql.strings(X_0:bat[:str]):bat[:str]
-BATSTRstrings;
-Return the strings
-batsql
sum
pattern batsql.sum(X_0:bat[:bte], X_1:any, X_2:any, X_3:int, X_4:any,
X_5:any):bat[:lng]
SQLsum;
@@ -46773,21 +46753,6 @@ unsafe pattern sql.include(X_0:str):void
SQLinclude;
Compile and execute a sql statements on the file
sql
-index
-command sql.index(X_0:str, X_1:bit):bte
-STRindex_bte;
-Return the offsets as an index bat
-sql
-index
-command sql.index(X_0:str, X_1:bit):int
-STRindex_int;
-Return the offsets as an index bat
-sql
-index
-command sql.index(X_0:str, X_1:bit):sht
-STRindex_sht;
-Return the offsets as an index bat
-sql
lag
pattern sql.lag(X_0:any_1, X_1:any, X_2:any_1, X_3:bit, X_4:bit):any_1
SQLlag;
@@ -47193,11 +47158,6 @@ pattern sql.str_group_concat(X_0:str, X_
SQLstrgroup_concat;
return the string concatenation of groups with a custom separator
sql
-strings
-command sql.strings(X_0:str):str
-STRstrings;
-Return the strings
-sql
subdelta
command sql.subdelta(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:oid]):bat[:oid]
DELTAsub;
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,3 +1,6 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Feb 4 2022 Sjoerd Mullender <sjo...@acm.org>
+- Removed functions sys.index and sys.strings.
+
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
@@ -4176,197 +4176,6 @@ freeVariables(Client c, MalBlkPtr mb, Ma
}
str
-STRindex_int(int *i, const str *src, const bit *u)
-{
- (void)src; (void)u;
- *i = 0;
- return MAL_SUCCEED;
-}
-
-str
-BATSTRindex_int(bat *res, const bat *src, const bit *u)
-{
- BAT *s, *r;
-
- if ((s = BATdescriptor(*src)) == NULL)
- throw(SQL, "calc.index", SQLSTATE(HY005) "Cannot access column
descriptor");
-
- (void) u;
-
- Heap *h = s->tvheap;
- size_t pad, pos;
- int v;
-
- r = COLnew(0, TYPE_int, 1024, TRANSIENT);
- if (r == NULL) {
- BBPunfix(s->batCacheid);
- throw(SQL, "calc.index", SQLSTATE(HY013) MAL_MALLOC_FAIL);
- }
- pos = GDK_STRHASHSIZE;
- while (pos < h->free) {
- const char *p;
-
- pad = GDK_VARALIGN - (pos & (GDK_VARALIGN - 1));
- if (pad < sizeof(stridx_t))
- pad += GDK_VARALIGN;
- pos += pad;
- p = h->base + pos;
- v = (int) (pos - GDK_STRHASHSIZE);
- if (BUNappend(r, &v, false) != GDK_SUCCEED) {
- BBPreclaim(r);
- BBPunfix(s->batCacheid);
- throw(SQL, "calc.index", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
- pos += strLen(p);
- }
- BBPunfix(s->batCacheid);
- BBPkeepref((*res = r->batCacheid));
- return MAL_SUCCEED;
-}
-
-str
-STRindex_sht(sht *i, const str *src, const bit *u)
-{
- (void)src; (void)u;
- *i = 0;
- return MAL_SUCCEED;
-}
-
-str
-BATSTRindex_sht(bat *res, const bat *src, const bit *u)
-{
- BAT *s, *r;
-
- if ((s = BATdescriptor(*src)) == NULL)
- throw(SQL, "calc.index", SQLSTATE(HY005) "Cannot access column
descriptor");
-
- (void) u;
-
- Heap *h = s->tvheap;
- size_t pad, pos;
- sht v;
-
- r = COLnew(0, TYPE_sht, 1024, TRANSIENT);
- if (r == NULL) {
- BBPunfix(s->batCacheid);
- throw(SQL, "calc.index", SQLSTATE(HY013) MAL_MALLOC_FAIL);
- }
- pos = GDK_STRHASHSIZE;
- while (pos < h->free) {
- const char *s;
-
- pad = GDK_VARALIGN - (pos & (GDK_VARALIGN - 1));
- if (pad < sizeof(stridx_t))
- pad += GDK_VARALIGN;
- pos += pad;
- s = h->base + pos;
- v = (sht) (pos - GDK_STRHASHSIZE);
- if (BUNappend(r, &v, false) != GDK_SUCCEED) {
- BBPreclaim(r);
- throw(SQL, "calc.index", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
- pos += strLen(s);
- }
- BBPunfix(s->batCacheid);
- BBPkeepref((*res = r->batCacheid));
- return MAL_SUCCEED;
-}
-
-str
-STRindex_bte(bte *i, const str *src, const bit *u)
-{
- (void)src; (void)u;
- *i = 0;
- return MAL_SUCCEED;
-}
-
-str
-BATSTRindex_bte(bat *res, const bat *src, const bit *u)
-{
- BAT *s, *r;
-
- if ((s = BATdescriptor(*src)) == NULL)
- throw(SQL, "calc.index", SQLSTATE(HY005) "Cannot access column
descriptor");
-
- (void) u;
-
- Heap *h = s->tvheap;
- size_t pad, pos;
- bte v;
-
- r = COLnew(0, TYPE_bte, 64, TRANSIENT);
- if (r == NULL) {
- BBPunfix(s->batCacheid);
- throw(SQL, "calc.index", SQLSTATE(HY013) MAL_MALLOC_FAIL);
- }
- pos = GDK_STRHASHSIZE;
- while (pos < h->free) {
- const char *p;
-
- pad = GDK_VARALIGN - (pos & (GDK_VARALIGN - 1));
- if (pad < sizeof(stridx_t))
- pad += GDK_VARALIGN;
- pos += pad;
- p = h->base + pos;
- v = (bte) (pos - GDK_STRHASHSIZE);
- if (BUNappend(r, &v, false) != GDK_SUCCEED) {
- BBPreclaim(r);
- BBPunfix(s->batCacheid);
- throw(SQL, "calc.index", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
- pos += strLen(p);
- }
- BBPunfix(s->batCacheid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
