MonetDB: default - Use more const
Changeset: 52235158eb64 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/52235158eb64
Modified Files:
gdk/gdk_unique.c
Branch: default
Log Message:
Use more const
diffs (96 lines):
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -31,7 +31,7 @@ BATunique(BAT *b, BAT *s)
const char *vals;
const char *vars;
int width;
- oid i, o;
+ oid i, o, hseq;
const char *nme;
Hash *hs = NULL;
BUN hb;
@@ -102,6 +102,7 @@ BATunique(BAT *b, BAT *s)
vars = NULL;
width = bi.width;
cmp = ATOMcompare(bi.type);
+ hseq = b->hseqbase;
if (ATOMbasetype(bi.type) == TYPE_bte ||
(bi.width == 1 &&
@@ -114,7 +115,7 @@ BATunique(BAT *b, BAT *s)
memset(seen, 0, sizeof(seen));
TIMEOUT_LOOP_IDX(i, cnt, timeoffset) {
o = canditer_next(&ci);
- val = ((const uint8_t *) vals)[o - b->hseqbase];
+ val = ((const uint8_t *) vals)[o - hseq];
uint32_t m = UINT32_C(1) << (val & 0x1F);
if (!(seen[val >> 5] & m)) {
seen[val >> 5] |= m;
@@ -140,7 +141,7 @@ BATunique(BAT *b, BAT *s)
memset(seen, 0, sizeof(seen));
TIMEOUT_LOOP_IDX(i, cnt, timeoffset) {
o = canditer_next(&ci);
- val = ((const uint16_t *) vals)[o - b->hseqbase];
+ val = ((const uint16_t *) vals)[o - hseq];
uint32_t m = UINT32_C(1) << (val & 0x1F);
if (!(seen[val >> 5] & m)) {
seen[val >> 5] |= m;
@@ -160,7 +161,7 @@ BATunique(BAT *b, BAT *s)
algomsg = "unique: sorted";
TIMEOUT_LOOP_IDX(i, cnt, timeoffset) {
o = canditer_next(&ci);
- v = VALUE(o - b->hseqbase);
+ v = VALUE(o - hseq);
if (prev == NULL || (*cmp)(v, prev) != 0) {
if (bunfastappTYPE(oid, bn, &o) != GDK_SUCCEED)
goto bunins_failed;
@@ -174,13 +175,11 @@ BATunique(BAT *b, BAT *s)
cnt == bi.count &&
BAThash(b) == GDK_SUCCEED)) {
BUN lo = 0;
- oid seq;
/* we already have a hash table on b, or b is
* persistent and we could create a hash table, or b
* is a view on a bat that already has a hash table */
algomsg = "unique: existing hash";
- seq = b->hseqbase;
MT_rwlock_rdlock(&b->thashlock);
hs = b->thash;
if (hs == NULL) {
@@ -191,14 +190,14 @@ BATunique(BAT *b, BAT *s)
BUN p;
o = canditer_next(&ci);
- p = o - seq;
+ p = o - hseq;
v = VALUE(p);
for (hb = HASHgetlink(hs, p + lo);
hb != BUN_NONE && hb >= lo;
hb = HASHgetlink(hs, hb)) {
assert(hb < p + lo);
if (cmp(v, BUNtail(bi, hb)) == 0 &&
- canditer_contains(&ci, hb - lo + seq)) {
+ canditer_contains(&ci, hb - lo + hseq)) {
/* we've seen this value
* before */
break;
@@ -251,7 +250,7 @@ BATunique(BAT *b, BAT *s)
}
TIMEOUT_LOOP_IDX(i, cnt, timeoffset) {
o = canditer_next(&ci);
- v = VALUE(o - b->hseqbase);
+ v = VALUE(o - hseq);
prb = HASHprobe(hs, v);
for (hb = HASHget(hs, prb);
hb != BUN_NONE;
@@ -260,7 +259,7 @@ BATunique(BAT *b, BAT *s)
break;
}
if (hb == BUN_NONE) {
- p = o - b->hseqbase;
+ p = o - hseq;
if (bunfastappTYPE(oid, bn, &o) != GDK_SUCCEED)
goto bunins_failed;
/* enter into hash table */
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Use more const char *.
Changeset: 251a9dca7b2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=251a9dca7b2c
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_pipes.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/server/sql_env.c
sql/server/sql_env.h
Branch: default
Log Message:
Use more const char *.
diffs (truncated from 458 to 300 lines):
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
@@ -1928,8 +1928,8 @@ str XMLxmltext(str *s, xml *x);
str abortRef;
str actionRef;
void addMalException(MalBlkPtr mb, str msg);
-str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-str addPipeDefinition(Client cntxt, str name, str pipe);
+str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
+str addPipeDefinition(Client cntxt, const char *name, const char *pipe);
void addtoMalBlkHistory(MalBlkPtr mb);
str affectedRowsRef;
str aggrRef;
@@ -2016,7 +2016,7 @@ str columnBindRef;
str columnRef;
str commitRef;
str compileAllOptimizers(Client cntxt);
-str compileOptimizer(Client cntxt, str name);
+str compileOptimizer(Client cntxt, const char *name);
str compileString(Symbol *fcn, Client c, str s);
str connectRef;
str convertConstant(malType type, ValPtr vr);
@@ -2223,7 +2223,7 @@ int isMatLeftJoinOp(InstrPtr q);
int isMultiplex(InstrPtr q);
int isNotUsedIn(InstrPtr p, int start, int a);
int isOptimizerEnabled(MalBlkPtr mb, str opt);
-int isOptimizerPipe(str name);
+int isOptimizerPipe(const char *name);
int isOrderby(InstrPtr q);
int isSample(InstrPtr q);
int isSealedFunction(InstrPtr q);
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -241,7 +241,7 @@ optPipeInit(void)
/* the session_pipe is the one defined by the user */
str
-addPipeDefinition(Client cntxt, str name, str pipe)
+addPipeDefinition(Client cntxt, const char *name, const char *pipe)
{
int i;
str msg;
@@ -292,7 +292,7 @@ addPipeDefinition(Client cntxt, str name
}
int
-isOptimizerPipe(str name)
+isOptimizerPipe(const char *name)
{
int i;
@@ -426,7 +426,7 @@ validateOptimizerPipes(void)
* then copy the statements to the end of the MAL plan
*/
str
-compileOptimizer(Client cntxt, str name)
+compileOptimizer(Client cntxt, const char *name)
{
int i, j;
char buf[2048];
@@ -472,7 +472,7 @@ compileAllOptimizers(Client cntxt)
return msg;
}
str
-addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name)
+addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name)
{
int i, j, k;
InstrPtr p,q;
diff --git a/monetdb5/optimizer/opt_pipes.h b/monetdb5/optimizer/opt_pipes.h
--- a/monetdb5/optimizer/opt_pipes.h
+++ b/monetdb5/optimizer/opt_pipes.h
@@ -13,10 +13,10 @@
mal_export str getPipeDefinition(str name);
mal_export str getPipeCatalog(bat *nme, bat *def, bat *stat);
-mal_export str addPipeDefinition(Client cntxt, str name, str pipe);
-mal_export int isOptimizerPipe(str name);
-mal_export str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-mal_export str compileOptimizer(Client cntxt, str name);
+mal_export str addPipeDefinition(Client cntxt, const char *name, const char
*pipe);
+mal_export int isOptimizerPipe(const char *name);
+mal_export str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
+mal_export str compileOptimizer(Client cntxt, const char *name);
mal_export str compileAllOptimizers(Client cntxt);
mal_export void opt_pipes_reset(void);
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
@@ -533,7 +533,7 @@ setVariable(Client cntxt, MalBlkPtr mb,
int *res = getArgReference_int(stk, pci, 0);
mvc *m = NULL;
str msg;
- str varname = *getArgReference_str(stk, pci, 2);
+ const char *varname = *getArgReference_str(stk, pci, 2);
int mtype = getArgType(mb, pci, 3);
ValRecord *src;
char buf[BUFSIZ];
@@ -547,7 +547,7 @@ setVariable(Client cntxt, MalBlkPtr mb,
if (mtype < 0 || mtype >= 255)
throw(SQL, "sql.setVariable", SQLSTATE(42100) "Variable type
error");
if (strcmp("optimizer", varname) == 0) {
- str newopt = *getArgReference_str(stk, pci, 3);
+ const char *newopt = *getArgReference_str(stk, pci, 3);
if (newopt) {
if (!isOptimizerPipe(newopt) && strchr(newopt, (int)
';') == 0) {
throw(SQL, "sql.setVariable", SQLSTATE(42100)
"optimizer '%s' unknown", newopt);
@@ -589,7 +589,7 @@ getVariable(Client cntxt, MalBlkPtr mb,
int mtype = getArgType(mb, pci, 0);
mv
MonetDB: default - Use more const char * instead of str/char*.
Changeset: b557364da382 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b557364da382
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_interprocess.c
gdk/gdk_interprocess.h
gdk/gdk_private.h
gdk/gdk_storage.c
monetdb5/modules/mal/tablet.h
monetdb5/optimizer/opt_bincopyfrom.c
sql/backends/monet5/sql.c
Branch: default
Log Message:
Use more const char * instead of str/char*.
diffs (193 lines):
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
@@ -6,7 +6,7 @@ uint8_t ATOMelmshift(int sz) __attribute
char *ATOMformat(int id, const void *val);
int ATOMindex(const char *nme);
size_t ATOMlen(int id, const void *v);
-str ATOMname(int id);
+const char *ATOMname(int id);
void *ATOMnil(int id) __attribute__((__malloc__));
int ATOMprint(int id, const void *val, stream *fd);
BAT *BATall_grp(BAT *l, BAT *g, BAT *e, BAT *s);
@@ -303,7 +303,7 @@ size_t GDKmallocated(const void *s);
size_t GDKmem_cursize(void);
gdk_return GDKmergeidx(BAT *b, BAT **a, int n_ar);
void *GDKmmap(const char *path, int mode, size_t len)
__attribute__((__warn_unused_result__));
-gdk_return GDKmmapfile(str buffer, size_t max, size_t id);
+gdk_return GDKmmapfile(char *buffer, size_t max, size_t id);
int GDKms(void);
gdk_return GDKmunmap(void *addr, size_t len);
int GDKnr_threads;
@@ -1125,8 +1125,8 @@ MT_Lock mal_delayLock;
_Noreturn void mal_exit(int status);
int mal_init(char *modules[], int embedded);
void mal_instruction_reset(void);
-void mal_module(str name, mel_atom *atoms, mel_func *funcs);
-void mal_module2(str name, mel_atom *atoms, mel_func *funcs, mel_init
initfunc, const char *code);
+void mal_module(const char *name, mel_atom *atoms, mel_func *funcs);
+void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init
initfunc, const char *code);
MT_Lock mal_profileLock;
str mal_quote(const char *msg, size_t size);
MT_Lock mal_remoteLock;
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -230,7 +230,7 @@ ATOMindex(const char *nme)
return -j;
}
-char *
+const char *
ATOMname(int t)
{
return t >= 0 && t < GDKatomcnt && *BATatoms[t].name ? BATatoms[t].name
: "null";
@@ -1693,7 +1693,7 @@ ATOMunknown_find(const char *nme)
return -j;
}
-str
+const char *
ATOMunknown_name(int i)
{
assert(i < 0);
diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -68,7 +68,7 @@ gdk_export int GDKatomcnt;
gdk_export int ATOMallocate(const char *nme);
gdk_export int ATOMindex(const char *nme);
-gdk_export str ATOMname(int id);
+gdk_export const char *ATOMname(int id);
gdk_export size_t ATOMlen(int id, const void *v);
gdk_export void *ATOMnil(int id)
__attribute__((__malloc__));
diff --git a/gdk/gdk_interprocess.c b/gdk/gdk_interprocess.c
--- a/gdk/gdk_interprocess.c
+++ b/gdk/gdk_interprocess.c
@@ -130,7 +130,7 @@ GDKreleasemmap(void *ptr, size_t size, s
* id: Identifier of the file
*/
gdk_return
-GDKmmapfile(str buffer, size_t max, size_t id)
+GDKmmapfile(char *buffer, size_t max, size_t id)
{
snprintf(buffer, max, "pymmap%zu", id);
return GDK_SUCCEED;
diff --git a/gdk/gdk_interprocess.h b/gdk/gdk_interprocess.h
--- a/gdk/gdk_interprocess.h
+++ b/gdk/gdk_interprocess.h
@@ -31,7 +31,7 @@ gdk_export void *GDKinitmmap(size_t id,
//! Release a memory mapped file that was created through GDKinitmmap
gdk_export gdk_return GDKreleasemmap(void *ptr, size_t size, size_t id);
//! snprintf the file name of a memory mapped file (as created by GDKinitmmap)
-gdk_export gdk_return GDKmmapfile(str buffer, size_t max, size_t id);
+gdk_export gdk_return GDKmmapfile(char *buffer, size_t max, size_t id);
/*
* Interprocess-Semaphores, used for cross process lock operations
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -40,7 +40,7 @@ bool ATOMisdescendant(int id, int parent
int ATOMunknown_find(const char *nme)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
-str ATOMunknown_name(int a)
+const char *ATOMunknown_name(int a)
__attribute__((__visibility__("hidden")));
void ATOMunknown_clean(void)
__attribute__((__visibility__("hidden")));
@@ -268,7 +268,7 @@ var_t strLocate(Heap *h, const char *v)
__attribute__((__visibility__("hidden")));
var_t strPut(BAT *b, var_t *dst, const void *v)
__attribute__((__visibility__("hidden")));
-str strRead(str a, size_t *dstlen, stream *s, size_t cnt)
+char *strRead(str a, size_t *dstlen, stream *s, size_t cnt)
__attribute__((__visibility__("hidden")));
ssize_t strToStr(char **restrict dst, size_t *restrict len, const char
*restrict src, bool external)
__
