Changeset: edc58b57a7f3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/edc58b57a7f3
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
clients/Tests/exports.stable.out
cmake/monetdb-toolchain.cmake
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_utils.c
monetdb5/mal/mal_embedded.c
monetdb5/modules/mal/manifold.c
sql/backends/monet5/bin_partition_by_slice.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_physical.c
sql/backends/monet5/rel_pphash.c
sql/backends/monet5/rel_pptopn.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_pp_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/vaults/parquet/parquet.c
sql/include/sql_relation.h
sql/server/rel_exp.c
sql/server/rel_optimize_others.c
sql/server/rel_optimize_proj.c
sql/server/rel_optimize_sel.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/server/rel_statistics.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/storage/bat/bat_storage.c
sql/test/emptydb/Tests/check.stable.out.32bit
testing/sqllogictest.py
Branch: nested
Log Message:
merged with default
diffs (truncated from 39372 to 300 lines):
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml
b/.github/ISSUE_TEMPLATE/bug_report.yml
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -78,8 +78,11 @@ body:
attributes:
label: Please indicate if any LLM tools were used in preparing this
report.
options:
- - label: Yes, fully LLM generated
- - label: Yes, LLM assisted
+ - label: LLM generated
+ - label: LLM assisted
+ - label: None
+ validations:
+ required: true
- type: markdown
attributes:
value: |
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -630,6 +630,7 @@ used from the MAL level.
Summary: MonetDB SQL server modules
Group: Applications/Databases
Requires(pre): %{name}-server%{?_isa} = %{version}-%{release}
+Requires(pre): %{name}-selinux%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB-SQL-server5 < 11.50.0
Provides: %{name}-SQL-server5 = %{version}-%{release}
Provides: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
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
@@ -50554,15 +50554,15 @@ command netcdf.test(X_0:str):int
NCDFtest
Returns number of variables in a given NetCDF dataset (file)
oahash
-build_combined_table
-command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:any_1])
-OAHASHbuild_tbl_cmbd
-Add the `key`-s with a `parent_slotid` to the hash table. Returns the
`slot_id` per `key` and the updated `ht_sink`
+build
+pattern oahash.build(X_0:bat[:any_1], X_1:bat[:oid], X_2:bit) (X_3:bat[:oid],
X_4:bat[:any_1])
+OAHASHbuild
+Add `keys` with `parents` to the `hashtable`. If `need_has_nil`, denote if
`keys` contains NULL. Returns corresponding `gids` of the `keys` and the
updated `hashtable`
oahash
-build_table
-command oahash.build_table(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:any_1])
-OAHASHbuild_tbl
-Add the `key`-s to the hash table. Returns the `slot_id` per `key` and the
updated `ht_sink`
+build
+pattern oahash.build(X_0:bat[:any_1], X_1:bit) (X_2:bat[:oid], X_3:bat[:any_1])
+OAHASHbuild
+Add `keys` to the `hashtable`. If `need_has_nil`, denote if `keys` contains
NULL. Returns corresponding `gids` of the `keys` and the updated `hashtable`
oahash
combined_mprobe
command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
@@ -50595,9 +50595,9 @@ OAHASHprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
expand
-command oahash.expand(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:lng],
X_3:bit):bat[:oid]
+pattern oahash.expand(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:lng],
X_3:bit):bat[:oid]
OAHASHexpand
-Expand the selected keys according to their frequencies in the hash table. If
'left_outer' is true, append the not 'selected' keys
+Expand the probe-side OIDs according to their matching hash-side GIDs and
frequencies. If 'leftouter' is true, append the not matched OIDs
oahash
expand_cartesian
command oahash.expand_cartesian(X_0:bat[:any_1], X_1:bat[:any_2],
X_2:bit):bat[:oid]
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
@@ -38739,15 +38739,15 @@ command netcdf.test(X_0:str):int
NCDFtest
Returns number of variables in a given NetCDF dataset (file)
oahash
-build_combined_table
-command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:any_1])
-OAHASHbuild_tbl_cmbd
-Add the `key`-s with a `parent_slotid` to the hash table. Returns the
`slot_id` per `key` and the updated `ht_sink`
+build
+pattern oahash.build(X_0:bat[:any_1], X_1:bat[:oid], X_2:bit) (X_3:bat[:oid],
X_4:bat[:any_1])
+OAHASHbuild
+Add `keys` with `parents` to the `hashtable`. If `need_has_nil`, denote if
`keys` contains NULL. Returns corresponding `gids` of the `keys` and the
updated `hashtable`
oahash
-build_table
-command oahash.build_table(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:any_1])
-OAHASHbuild_tbl
-Add the `key`-s to the hash table. Returns the `slot_id` per `key` and the
updated `ht_sink`
+build
+pattern oahash.build(X_0:bat[:any_1], X_1:bit) (X_2:bat[:oid], X_3:bat[:any_1])
+OAHASHbuild
+Add `keys` to the `hashtable`. If `need_has_nil`, denote if `keys` contains
NULL. Returns corresponding `gids` of the `keys` and the updated `hashtable`
oahash
combined_mprobe
command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
@@ -38780,9 +38780,9 @@ OAHASHprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
expand
-command oahash.expand(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:lng],
X_3:bit):bat[:oid]
+pattern oahash.expand(X_0:bat[:oid], X_1:bat[:oid], X_2:bat[:lng],
X_3:bit):bat[:oid]
OAHASHexpand
-Expand the selected keys according to their frequencies in the hash table. If
'left_outer' is true, append the not 'selected' keys
+Expand the probe-side OIDs according to their matching hash-side GIDs and
frequencies. If 'leftouter' is true, append the not matched OIDs
oahash
expand_cartesian
command oahash.expand_cartesian(X_0:bat[:any_1], X_1:bat[:any_2],
X_2:bit):bat[:oid]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1,9 +1,9 @@
# gdk
int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMallocate(const char *nme);
-uint8_t ATOMelmshift(uint32_t sz) __attribute__((__const__));
-char *ATOMformat(allocator *ma, int id, const void *val)
__attribute__((__warn_unused_result__));
-gdk_return ATOMheap(int id, Heap *hp, size_t cap)
__attribute__((__warn_unused_result__));
+uint8_t ATOMelmshift(uint32_t sz);
+char *ATOMformat(allocator *ma, int id, const void *val);
+gdk_return ATOMheap(int id, Heap *hp, size_t cap);
int ATOMindex(const char *nme);
size_t ATOMlen(int id, const void *v);
const char *ATOMname(int id);
@@ -14,11 +14,11 @@ BAT *BATallnotequal_grp(BAT *l, BAT *r,
BAT *BATallnotequal_grp2(BAT *l, BAT *r, BAT *rid, BAT *g, BAT *e, BAT *s);
BAT *BATanyequal_grp(BAT *l, BAT *r, BAT *g, BAT *e, BAT *s);
BAT *BATanyequal_grp2(BAT *l, BAT *r, BAT *rid, BAT *g, BAT *e, BAT *s);
-gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force)
__attribute__((__warn_unused_result__));
+gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force);
BAT *BATasciify(BAT *b, BAT *s);
void BATassertProps(BAT *b);
atomDesc BATatoms[MAXATOMS];
-gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
const void *c1, const void *c2, bool li, bool hi, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
+gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
const void *c1, const void *c2, bool li, bool hi, BUN estimate);
BAT *BATcalcabsolute(BAT *b, BAT *s);
BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s1, BAT *s2, int tp);
BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp);
@@ -113,20 +113,20 @@ gdk_return BATclear(BAT *b, bool force);
void BATcommit(BAT *b, BUN size);
BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, role_t role);
BAT *BATconvert(BAT *b, BAT *s, int tp, uint8_t scale1, uint8_t scale2,
uint8_t precision);
-gdk_return BATconvert2ustr(BAT *b, BAT *bu)
__attribute__((__warn_unused_result__));
+gdk_return BATconvert2ustr(BAT *b, BAT *bu);
BUN BATcount_no_nil(BAT *b, BAT *s);
-gdk_return BATdel(BAT *b, BAT *d) __attribute__((__warn_unused_result__));
-BAT *BATdense(oid hseq, oid tseq, BUN cnt)
__attribute__((__warn_unused_result__));
+gdk_return BATdel(BAT *b, BAT *d);
+BAT *BATdense(oid hseq, oid tseq, BUN cnt);
BAT *BATdescriptor(bat i);
BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool not_in,
BUN estimate);
BAT *BATdiffcand(BAT *a, BAT *b);
-gdk_return BATextend(BAT *b, BUN newcap)
__attribute__((__warn_unused_result__));
-gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps,
BUN n, bool asc, bool nilslast, bool distinct)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
-BAT *BATfirstn_offset(BAT *b, BAT *s, BAT *g, BUN n, BUN o, bool asc, bool
nilslast, bool distinct) __attribute__((__warn_unused_result__));
+gdk_return BATextend(BAT *b, BUN newcap);
+gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps,
BUN n, bool asc, bool nilslast, bool distinct);
+BAT *BATfirstn_offset(BAT *b, BAT *s, BAT *g, BUN n, BUN o, bool asc, bool
nilslast, bool distinct);
restrict_t BATgetaccess(BAT *b);
ValPtr BATgetprop(BAT *b, enum prop_t idx);
ValPtr BATgetprop_nolock(BAT *b, enum prop_t idx);
-gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s,
BAT *g, BAT *e, BAT *h) __attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__access__(write_only, 3)))
__attribute__((__warn_unused_result__));
+gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s,
BAT *g, BAT *e, BAT *h);
const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid
*maxp, BUN *ngrpp, struct canditer *ci);
gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s,
int tp, bool skip_nils, int scale);
gdk_return BATgroupavg2(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT
*s, int tp, BUN ngrp, bool skip_nils, int scale);
@@ -136,8 +136,8 @@ BAT *BATgroupcorrelation(BAT *b1, BAT *b
BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils);
BAT *BATgroupcovariance_population(BAT *b1, BAT *b2, BAT *g, BAT *e, BAT *s,
int tp, bool skip_nils);
BAT *BATgroupcovariance_sample(BAT *b1, BAT *b2, BAT *g, BAT *e, BAT *s, int
tp, bool skip_nils);
-BAT *BATgroupedfirstn(BUN n, BAT *s, BAT *g, int nbats, BAT **bats, bool *asc,
bool *nilslast) __attribute__((__warn_unused_result__));
-BAT *BATgroupedfirstn_offset(BUN n, BUN o, BAT *s, BAT *g, int nbats, BAT
**bats, bool *asc, bool *nilslast) __attribute__((__warn_unused_result__));
+BAT *BATgroupedfirstn(BUN n, BAT *s, BAT *g, int nbats, BAT **bats, bool *asc,
bool *nilslast);
+BAT *BATgroupedfirstn_offset(BUN n, BUN o, BAT *s, BAT *g, int nbats, BAT
**bats, bool *asc, bool *nilslast);
BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils);
BAT *BATgroupmedian(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils);
BAT *BATgroupmedian_avg(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool
skip_nils);
@@ -158,10 +158,10 @@ bool BAThasstrimps(BAT *b);
void BAThseqbase(BAT *b, oid o);
BAT *BATintersect(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool
max_one, BUN estimate);
BAT *BATintersectcand(BAT *a, BAT *b);
-gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
+gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate);
gdk_return BATkey(BAT *b, bool onoff);
-gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
-gdk_return BATmarkjoin(BAT **r1p, BAT **r2p, BAT **r3p, BAT *l, BAT *r, BAT
*sl, BAT *sr, bool nil_matches, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__access__(write_only, 3)))
__attribute__((__warn_unused_result__));
+gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate);
+gdk_return BATmarkjoin(BAT **r1p, BAT **r2p, BAT **r3p, BAT *l, BAT *r, BAT
*sl, BAT *sr, bool nil_matches, BUN estimate);
BAT *BATmaskedcands(oid hseq, BUN nr, BAT *masked, bool selected);
void *BATmax(BAT *b, void *aggr);
void *BATmax_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil, bool
inout);
@@ -174,47 +174,47 @@ BAT *BATnil_grp(BAT *l, BAT *g, BAT *e,
bool BATordered(BAT *b);
bool BATordered_rev(BAT *b);
gdk_return BATorderidx(BAT *b, bool stable);
-gdk_return BAToutercross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool max_one) __attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
-gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool nil_matches, bool match_one, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
+gdk_return BAToutercross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool max_one);
+gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, bool nil_matches, bool match_one, BUN estimate);
gdk_return BATprint(stream *s, BAT *b);
gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool
nil_if_empty, bool inout);
BAT *BATproject(BAT *restrict l, BAT *restrict r);
BAT *BATproject2(BAT *restrict l, BAT *restrict r1, BAT *restrict r2);
BAT *BATprojectchain(BAT **bats);
-gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, bool li, bool hi, bool anti, bool symmetric, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
-gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force)
__attribute__((__warn_unused_result__));
+gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, bool li, bool hi, bool anti, bool symmetric, BUN estimate);
+gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force);
void BATrmprop(BAT *b, enum prop_t idx);
void BATrmprop_nolock(BAT *b, enum prop_t idx);
gdk_return BATrtree(BAT *wkb, BAT *mbr);
BAT *BATsample(BAT *b, BUN n);
BAT *BATsample_with_seed(BAT *b, BUN n, uint64_t seed);
-gdk_return BATsave(BAT *b) __attribute__((__warn_unused_result__));
+gdk_return BATsave(BAT *b);
BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, bool li, bool
hi, bool anti, bool nil_matches);
-gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, bool max_one, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
-BAT *BATsetaccess(BAT *b, restrict_t mode)
__attribute__((__warn_unused_result__));
+gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, bool max_one, BUN estimate);
+BAT *BATsetaccess(BAT *b, restrict_t mode);
void BATsetcapacity(BAT *b, BUN cnt);
void BATsetcount(BAT *b, BUN cnt);
ValPtr BATsetprop(BAT *b, enum prop_t idx, int type, const void *v);
ValPtr BATsetprop_nolock(BAT *b, enum prop_t idx, int type, const void *v);
gdk_return BATsetstrimps(BAT *b);
BAT *BATslice(BAT *b, BUN low, BUN high);
-gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, bool reverse, bool nilslast, bool stable)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__access__(write_only, 3)))
__attribute__((__warn_unused_result__));
+gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, bool reverse, bool nilslast, bool stable);
gdk_return BATstr_group_concat(allocator *ma, ValPtr res, BAT *b, BAT *s, BAT
*sep, bool skip_nils, bool nil_if_empty, const char *restrict separator);
-gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool max_one) __attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
+gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool max_one);
BAT *BATsubexist(BAT *l, BAT *g, BAT *e, BAT *s);
BAT *BATsubnot_exist(BAT *l, BAT *g, BAT *e, BAT *s);
gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool
nil_if_empty, bool inout);
const char *BATtailname(const BAT *b);
-gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, bool nil_matches, BUN estimate)
__attribute__((__access__(write_only, 1)))
__attribute__((__access__(write_only, 2)))
__attribute__((__warn_unused_result__));
+gdk_return BATthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, int op, bool nil_matches, BUN estimate);
BAT *BATthetaselect(BAT *b, BAT *s, const void *val, const char *op);
BAT *BATtolower(BAT *b, BAT *s);
BAT *BATtoupper(BAT *b, BAT *s);
void BATtseqbase(BAT *b, oid o);
BAT *BATunique(BAT *b, BAT *s);
BAT *BATunmask(BAT *b);
-gdk_return BATupdate(BAT *b, BAT *p, BAT *n, bool force)
__attribute__((__warn_unused_result__));
-gdk_return BATupdatepos(BAT *b, const oid *positions, BAT *n, bool autoincr,
bool force) __attribute__((__warn_unused_result__));
+gdk_return BATupdate(BAT *b, BAT *p, BAT *n, bool force);
+gdk_return BATupdatepos(BAT *b, const oid *positions, BAT *n, bool autoincr,
bool force);
BBPrec *BBP[N_BBPINIT];
gdk_return BBPaddfarm(const char *dirname, uint32_t rolemask, bool logerror);
void BBPcold(bat i);
@@ -225,7 +225,7 @@ int BBPfix(bat b);
unsigned BBPheader(FILE *fp, int *lineno, bat *bbpsize, lng *logno, bool
allow_hge_upgrade);
bat BBPindex(const char *nme);
gdk_return BBPjson_upgrade(json_storage_conversion);
-void BBPkeepref(BAT *b) __attribute__((__nonnull__(1)));
+void BBPkeepref(BAT *b);
bat BBPlimit;
void BBPlock(void);
BAT *BBPquickdesc(bat b);
@@ -239,88 +239,96 @@ void BBPtmlock(void);
void BBPtmunlock(void);
int BBPunfix(bat b);
void BBPunlock(void);
-gdk_return BUNappend(BAT *b, const void *right, bool force)
__attribute__((__warn_unused_result__));
-gdk_return BUNappendmulti(BAT *b, const void *values, BUN count, bool force)
__attribute__((__warn_unused_result__));
-gdk_return BUNdelete(BAT *b, oid o) __attribute__((__warn_unused_result__));
+gdk_return BUNappend(BAT *b, const void *right, bool force);
+gdk_return BUNappendmulti(BAT *b, const void *values, BUN count, bool force);
+gdk_return BUNdelete(BAT *b, oid o);
BUN BUNfnd(BAT *b, const void *right);
-gdk_return BUNreplace(BAT *b, oid left, const void *right, bool force)
__attribute__((__warn_unused_result__));
-gdk_return BUNreplacemulti(BAT *b, const oid *positions, const void *values,
BUN count, bool force) __attribute__((__warn_unused_result__));
-gdk_return BUNreplacemultiincr(BAT *b, oid position, const void *values, BUN
count, bool force) __attribute__((__warn_unused_result__));
-const void *BUNtpos(BATiter *bi, BUN p) __attribute__((__pure__));
+gdk_return BUNreplace(BAT *b, oid left, const void *right, bool force);
+gdk_return BUNreplacemulti(BAT *b, const oid *positions, const void *values,
BUN count, bool force);
+gdk_return BUNreplacemultiincr(BAT *b, oid position, const void *values, BUN
count, bool force);
+const void *BUNtpos(BATiter *bi, BUN p);
BAT *COLcopy(BAT *b, int tt, bool writable, role_t role);
BAT *COLcopy2(BAT *b, int tt, bool writable, bool mayshare, role_t role);
+<<<<<<< working copy
BAT *COLnew(oid hseq, int tltype, BUN capacity, role_t role)
__attribute__((__warn_unused_result__));
BAT *COLnew2(oid hseq, int tt, BUN cap, role_t role, uint32_t width)
__attribute__((__warn_unused_result__));
+=======
+BAT *COLnew(oid hseq, int tltype, BUN capacity, role_t role);
+BAT *COLnew2(oid hseq, int tt, BUN cap, role_t role, uint16_t width);
+>>>>>>> merge rev
BUN GDKL3_size;
size_t GDK_mem_maxsize;
size_t GDK_vm_maxsize;
-BAT *GDKanalytical_correlation(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s, BAT
*e, int tpe, int frame_type) __attribute__((__warn_unused_result__));
-BAT *GDKanalytical_covariance_pop(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s,
BAT *e, int tpe, int frame_type) __attribute__((__warn_unused_result__));
-BAT *GDKanalytical_covariance_samp(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s,
BAT *e, int tpe, int frame_type) __attribute__((__warn_unused_result__));
-BAT *GDKanalytical_stddev_pop(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tpe,
int frame_type) __attribute__((__warn_unused_result__));
-BAT *GDKanalytical_stddev_samp(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int
tpe, int frame_type) __attribute__((__warn_unused_result__));
+BAT *GDKanalytical_correlation(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s, BAT
*e, int tpe, int frame_type);
+BAT *GDKanalytical_covariance_pop(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s,
BAT *e, int tpe, int frame_type);
+BAT *GDKanalytical_covariance_samp(BAT *p, BAT *o, BAT *b1, BAT *b2, BAT *s,
BAT *e, int tpe, int frame_type);
+BAT *GDKanalytical_stddev_pop(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int tpe,
int frame_type);
+BAT *GDKanalytical_stddev_samp(BAT *p, BAT *o, BAT *b, BAT *s, BAT *e, int
tpe, int frame_type);
BAT *GDKanalytical_str_group_concat(BAT *b, BAT *p, BAT *o, BAT *sep, BAT *s,
BAT *e, const char *restrict separator, int frame_type);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
