Changeset: 54b601679ec7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/54b601679ec7
Modified Files:
sql/backends/monet5/vaults/parquet/parquet.c
Branch: default
Log Message:
Fix throw arguments.
diffs (59 lines):
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -421,7 +421,7 @@ pqc_relation(mvc *sql, sql_subfunc *f, c
if (filename && strchr(filename, '*')) {
glob_t pglob = {};
if (glob(filename, GLOB_ERR, NULL, &pglob) < 0)
- throw(SQL, SQLSTATE(42000), "parquet" "Could not open
parquet file %s", filename);
+ throw(SQL, "parquet", SQLSTATE(42000) "Could not open
parquet file %s", filename);
if (pglob.gl_pathc)
filename = ma_strdup(sql->sa, pglob.gl_pathv[0]);
if (est)
@@ -430,7 +430,7 @@ pqc_relation(mvc *sql, sql_subfunc *f, c
}
#endif
if (pqc_open(&pq, filename) < 0)
- throw(SQL, SQLSTATE(42000), "parquet" "Could not open parquet
file %s", filename);
+ throw(SQL, "parquet", SQLSTATE(42000) "Could not open parquet
file %s", filename);
allocator *ma = MT_thread_getallocator();
if (pqc_read_schema(pq) < 0) {
@@ -439,8 +439,8 @@ pqc_relation(mvc *sql, sql_subfunc *f, c
err = ma_strdup(ma, err);
pqc_close(pq);
if (err)
- throw(SQL, SQLSTATE(42000), "parquet" "Could not read
parquet file %s schema data, %s", filename, err);
- throw(SQL, SQLSTATE(42000), "parquet" "Could not read parquet
file %s schema data", filename);
+ throw(SQL, "parquet", SQLSTATE(42000) "Could not read
parquet file %s schema data, %s", filename, err);
+ throw(SQL, "parquet", SQLSTATE(42000) "Could not read parquet
file %s schema data", filename);
}
pqc_filemetadata *fmd = pqc_get_filemetadata(pq);
@@ -452,7 +452,7 @@ pqc_relation(mvc *sql, sql_subfunc *f, c
if (0)
if (pse->nchildren != (nr-1)) {
pqc_close(pq);
- throw(SQL, SQLSTATE(42000), "parquet" "Data in file %s
is not tabular", filename);
+ throw(SQL, "parquet", SQLSTATE(42000) "Data in file %s
is not tabular", filename);
}
f->tname = tname;
if (0)
@@ -462,7 +462,7 @@ pqc_relation(mvc *sql, sql_subfunc *f, c
if (e->nchildren || e->repetition == 2) {
char *nme = e->name?ma_strdup(ma, e->name):NULL;
pqc_close(pq);
- throw(SQL, SQLSTATE(42000), "parquet" "Data in
file %s is not tabular (column %s has repetition)", filename, nme);
+ throw(SQL, "parquet", SQLSTATE(42000) "Data in
file %s is not tabular (column %s has repetition)", filename, nme);
}
}
list *types = sa_list(sql->sa), *names = sa_list(sql->sa);
@@ -932,7 +932,7 @@ PARQUETopen(Client cntxt, MalBlkPtr mb,
glob_t pglob = {};
if (glob(f, GLOB_ERR, NULL, &pglob) < 0) {
BBPreclaim(b);
- throw(SQL, SQLSTATE(42000), "parquet" "Could not open
parquet file %s", f);
+ throw(SQL, "parquet", SQLSTATE(42000) "Could not open
parquet file %s", f);
}
b->pl_io = (struct pipeline_io*)pqcmc_create(&pglob, nrows);
} else
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
