Changeset: fd190a8bbc22 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fd190a8bbc22
Modified Files:
clients/mapiclient/dotmonetdb.c
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
ctest/monetdb5/mal/test_malEmbeddedBoot.c
ctest/tools/monetdbe/cmocka_test.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_cand.c
gdk/gdk_sample.c
monetdb5/mal/mal.h
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/pcre.c
monetdb_config.h.in
sql/backends/monet5/UDF/udf/udf.h
sql/backends/monet5/UDF/udf/udf_impl.h
sql/backends/monet5/dict.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/include/sql_catalog.h
sql/server/rel_exp.c
sql/server/rel_propagate.h
sql/server/rel_rewriter.h
Branch: default
Log Message:
Fix some indentation.
diffs (truncated from 586 to 300 lines):
diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c
--- a/clients/mapiclient/dotmonetdb.c
+++ b/clients/mapiclient/dotmonetdb.c
@@ -117,7 +117,7 @@ parse_dotmonetdb(DotMonetdb *dotfile)
} else if (strcmp(buf, "database") == 0) {
dotfile->dbname = strdup(q);
q = NULL;
- } else if (strcmp(buf, "host") == 0) {
+ } else if (strcmp(buf, "host") == 0) {
dotfile->host = strdup(q);
q = NULL;
} else if (strcmp(buf, "language") == 0) {
@@ -146,7 +146,7 @@ parse_dotmonetdb(DotMonetdb *dotfile)
} else if (strcmp(buf, "width") == 0) {
dotfile->pagewidth = atoi(q);
q = NULL;
- } else if (strcmp(buf, "port") == 0) {
+ } else if (strcmp(buf, "port") == 0) {
dotfile->port = atoi(q);
q = NULL;
}
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3256,14 +3256,14 @@ main(int argc, char **argv)
/* parse config file first, command line options override */
parse_dotmonetdb(&dotfile);
- user = dotfile.user;
- passwd = dotfile.passwd;
+ user = dotfile.user;
+ passwd = dotfile.passwd;
dbname = dotfile.dbname;
- language = dotfile.language;
+ language = dotfile.language;
host = dotfile.host;
save_history = dotfile.save_history;
- output = dotfile.output;
- pagewidth = dotfile.pagewidth;
+ output = dotfile.output;
+ pagewidth = dotfile.pagewidth;
port = dotfile.port;
pagewidthset = pagewidth != 0;
if (language) {
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -106,9 +106,9 @@ main(int argc, char **argv)
#endif
parse_dotmonetdb(&dotfile);
- user = dotfile.user;
- passwd = dotfile.passwd;
- dbname = dotfile.dbname;
+ user = dotfile.user;
+ passwd = dotfile.passwd;
+ dbname = dotfile.dbname;
host = dotfile.host;
port = dotfile.port;
diff --git a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
--- a/ctest/monetdb5/mal/test_malEmbeddedBoot.c
+++ b/ctest/monetdb5/mal/test_malEmbeddedBoot.c
@@ -19,9 +19,9 @@ main(void)
gdk_res = GDKinit(NULL, 0, true);
if (gdk_res != GDK_SUCCEED) {
msg = createException(MAL, "embedded.monetdb_startup",
"GDKinit() failed");
- return 1;
+ return 1;
}
if ((msg = malEmbeddedBoot(0, 0, 0, 0, false)) != MAL_SUCCEED)
- return 1;
+ return 1;
return 0;
}
diff --git a/ctest/tools/monetdbe/cmocka_test.c
b/ctest/tools/monetdbe/cmocka_test.c
--- a/ctest/tools/monetdbe/cmocka_test.c
+++ b/ctest/tools/monetdbe/cmocka_test.c
@@ -132,7 +132,7 @@ int
main(void)
{
const struct CMUnitTest tests[] = {
- cmocka_unit_test(create_table_test),
+ cmocka_unit_test(create_table_test),
cmocka_unit_test(populate_table_test),
cmocka_unit_test(query_table_test),
cmocka_unit_test(query_table_test2),
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -2512,7 +2512,7 @@ BATcalcxor(BAT *b1, BAT *b2, BAT *s1, BA
return NULL;
}
- bn = COLnew(ci1.hseq, b1->ttype, ci1.ncand, TRANSIENT);
+ bn = COLnew(ci1.hseq, b1->ttype, ci1.ncand, TRANSIENT);
if (bn == NULL)
return NULL;
if (ci1.ncand == 0)
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -849,7 +849,7 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s1, BAT
if ((is_oid_nil(b1->tseqbase) || is_oid_nil(b2->tseqbase))
#ifdef NIL_MATCHES_FLAG
- && !nil_matches
+ && !nil_matches
#endif
)
res = TPE_nil;
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1316,7 +1316,7 @@ BATnegcands(BUN nr, BAT *odels)
HEAPalloc(dels, hi - lo + (sizeof(ccand_t)/sizeof(oid)),
sizeof(oid)) != GDK_SUCCEED) {
GDKfree(dels);
BBPreclaim(bn);
- return NULL;
+ return NULL;
}
ATOMIC_INIT(&dels->refs, 1);
c = (ccand_t *) dels->base;
@@ -1385,7 +1385,7 @@ BATmaskedcands(oid hseq, BUN nr, BAT *ma
HEAPalloc(msks, nmask + (sizeof(ccand_t)/sizeof(uint32_t)),
sizeof(uint32_t)) != GDK_SUCCEED) {
GDKfree(msks);
BBPreclaim(bn);
- return NULL;
+ return NULL;
}
c = (ccand_t *) msks->base;
*c = (ccand_t) {
diff --git a/gdk/gdk_sample.c b/gdk/gdk_sample.c
--- a/gdk/gdk_sample.c
+++ b/gdk/gdk_sample.c
@@ -83,16 +83,16 @@ OIDTreeToBATAntiset(struct oidtreenode *
oid noid;
if (node->left != NULL)
- OIDTreeToBATAntiset(node->left, bn, start, node->o);
+ OIDTreeToBATAntiset(node->left, bn, start, node->o);
else
for (noid = start; noid < node->o; noid++)
((oid *) bn->theap->base)[bn->batCount++] = noid;
- if (node->right != NULL)
+ if (node->right != NULL)
OIDTreeToBATAntiset(node->right, bn, node->o + 1, stop);
else
for (noid = node->o+1; noid < stop; noid++)
- ((oid *) bn->theap->base)[bn->batCount++] = noid;
+ ((oid *) bn->theap->base)[bn->batCount++] = noid;
}
static BAT *
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -118,13 +118,12 @@ typedef struct VARRECORD {
char kind; /* Could be either _, X or C to
stamp the variable type */
malType type; /* internal type signature */
bool constant:1,
- typevar:1,
- fixedtype:1,
- //FREE SPOT NOW:1,
- cleanup:1,
- initialized:1,
- used:1,
- disabled:1;
+ typevar:1,
+ fixedtype:1,
+ cleanup:1,
+ initialized:1,
+ used:1,
+ disabled:1;
short depth; /* scope block depth, set to -1
if not used */
ValRecord value;
int declared; /* pc index when it was first
assigned */
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -176,7 +176,7 @@ malEmbeddedReset(void) //remove extra mo
stopProfiler(0);
AUTHreset();
if (!GDKinmemory(0) && !GDKembedded()) {
- str err = 0;
+ str err = 0;
if ((err = msab_wildRetreat()) != NULL) {
TRC_ERROR(MAL_SERVER, "%s\n", err);
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -198,17 +198,18 @@ mal_export malType destinationType(MalBl
mal_export void setPolymorphic(InstrPtr p, int tpe, int force);
/* Utility macros to inspect an instruction */
#define functionStart(X) ((X)->token == FUNCTIONsymbol || \
- (X)->token == COMMANDsymbol || \
- (X)->token == FACTORYsymbol )
+ (X)->token == COMMANDsymbol
|| \
+ (X)->token == FACTORYsymbol )
#define patternStart(X) ((X)->token == PATTERNsymbol)
#define functionExit(X) ((X)->token == ENDsymbol)
#define blockStart(X) ((X)->barrier && (((X)->barrier == BARRIERsymbol || \
- (X)->barrier == CATCHsymbol )))
+
(X)->barrier == CATCHsymbol )))
#define blockExit(X) ((X)->barrier == EXITsymbol)
#define blockReturn(X) ((X)->barrier == RETURNsymbol)
-#define blockCntrl(X) ( (X)->barrier== LEAVEsymbol || \
- (X)->barrier== REDOsymbol || (X)->barrier== RETURNsymbol )
+#define blockCntrl(X) ((X)->barrier== LEAVEsymbol || \
+ (X)->barrier== REDOsymbol ||
\
+ (X)->barrier== RETURNsymbol )
#define isLinearFlow(X) (!(blockStart(X) || blockExit(X) || \
(X)->barrier== LEAVEsymbol || (X)->barrier==
REDOsymbol ))
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -39,11 +39,11 @@ lastline(Client cntxt)
{
str s = CURRENT(cntxt);
if (NL(*s))
- s++;
+ s++;
while (s > cntxt->fdin->buf && !NL(*s))
- s--;
+ s--;
if (NL(*s))
- s++;
+ s++;
return s;
}
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1732,30 +1732,30 @@ BATPCREnotlike(Client cntxt, MalBlkPtr m
}
/* scan select loop with or without candidates */
-#define pcrescanloop(TEST, KEEP_NULLS) \
- do { \
- TRC_DEBUG(ALGO, \
- "PCREselect(b=%s#"BUNFMT",anti=%d): "
\
- "scanselect %s\n", BATgetId(b), BATcount(b),
\
- anti, #TEST); \
- if (!s || BATtdense(s)) { \
- for (; p < q; p++) { \
- GDK_CHECK_TIMEOUT(timeoffset, counter,
\
- GOTO_LABEL_TIMEOUT_HANDLER(bailout));
\
- const char *restrict v = BUNtvar(bi, p - off);
\
- if ((TEST) || ((KEEP_NULLS) && *v == '\200'))
\
- vals[cnt++] = p; \
- } \
- } else { \
- for (; p < ncands; p++) { \
- GDK_CHECK_TIMEOUT(timeoffset, counter,
\
- GOTO_LABEL_TIMEOUT_HANDLER(bailout));
\
- oid o = canditer_next(ci); \
- const char *restrict v = BUNtvar(bi, o - off);
\
- if ((TEST) || ((KEEP_NULLS) && *v == '\200'))
\
- vals[cnt++] = o; \
- } \
- } \
+#define pcrescanloop(TEST, KEEP_NULLS)
\
+ do {
\
+ TRC_DEBUG(ALGO,
\
+ "PCREselect(b=%s#"BUNFMT",anti=%d): "
\
+ "scanselect %s\n", BATgetId(b), BATcount(b),
\
+ anti, #TEST);
\
+ if (!s || BATtdense(s)) {
\
+ for (; p < q; p++) {
\
+ GDK_CHECK_TIMEOUT(timeoffset, counter,
\
+
GOTO_LABEL_TIMEOUT_HANDLER(bailout)); \
+ const char *restrict v = BUNtvar(bi, p - off);
\
+ if ((TEST) || ((KEEP_NULLS) && *v == '\200'))
\
+ vals[cnt++] = p;
\
+ }
\
+ } else {
\
+ for (; p < ncands; p++) {
\
+ GDK_CHECK_TIMEOUT(timeoffset, counter,
\
+
GOTO_LABEL_TIMEOUT_HANDLER(bailout)); \
+ oid o = canditer_next(ci);
\
+ const char *restrict v = BUNtvar(bi, o - off);
\
+ if ((TEST) || ((KEEP_NULLS) && *v == '\200'))
\
+ vals[cnt++] = o;
\
+ }
\
+ }
\
} while (0)
#ifdef HAVE_LIBPCRE
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -455,19 +455,19 @@ gmtime_r(const time_t *restrict timep, s
#ifdef _MSC_VER
#define _LIB_STARTUP_FUNC_(f,q) \
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
