author | Tero Marttila <terom@fixme.fi> |
Thu, 20 Nov 2008 01:16:24 +0200 | |
branch | new-evsql |
changeset 44 | 9e76ee9729b6 |
parent 38 | 1fd4da071575 |
child 45 | 424ce5ab82fd |
permissions | -rw-r--r-- |
34
460f995d3769
fix readdir to use ORDER BY, rename
Tero Marttila <terom@fixme.fi>
parents:
31
diff
changeset
|
1 |
#include <stdlib.h> |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include <assert.h> |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
4 |
#include "evsql.h" |
31 | 5 |
#include "../lib/log.h" |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
6 |
#include "../lib/misc.h" |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
|
31 | 8 |
#define _PARAM_TYPE_CASE(typenam) case EVSQL_PARAM_ ## typenam: return #typenam |
9 |
||
10 |
#define _PARAM_VAL_BUF_MAX 120 |
|
11 |
#define _PARAM_VAL_CASE(typenam, ...) case EVSQL_PARAM_ ## typenam: if (param->data_raw) ret = snprintf(buf, _PARAM_VAL_BUF_MAX, __VA_ARGS__); else return "(null)"; break |
|
12 |
||
13 |
const char *evsql_param_type (const struct evsql_query_param *param) { |
|
14 |
switch (param->type) { |
|
15 |
_PARAM_TYPE_CASE (INVALID ); |
|
16 |
_PARAM_TYPE_CASE (NULL_ ); |
|
17 |
_PARAM_TYPE_CASE (BINARY ); |
|
18 |
_PARAM_TYPE_CASE (STRING ); |
|
19 |
_PARAM_TYPE_CASE (UINT16 ); |
|
20 |
_PARAM_TYPE_CASE (UINT32 ); |
|
21 |
_PARAM_TYPE_CASE (UINT64 ); |
|
22 |
default: return "???"; |
|
23 |
} |
|
24 |
} |
|
25 |
||
26 |
||
27 |
static const char *evsql_param_val (const struct evsql_query_param *param) { |
|
28 |
static char buf[_PARAM_VAL_BUF_MAX]; |
|
29 |
int ret; |
|
30 |
||
31 |
switch (param->type) { |
|
32 |
_PARAM_VAL_CASE (INVALID, "???" ); |
|
33 |
_PARAM_VAL_CASE (NULL_, "(null)" ); |
|
34 |
_PARAM_VAL_CASE (BINARY, "%zu:%s", param->length, "..." ); |
|
35 |
_PARAM_VAL_CASE (STRING, "%s", param->data_raw ); |
|
36 |
_PARAM_VAL_CASE (UINT16, "%hu", (unsigned short int) ntohs(param->data.uint16) ); |
|
37 |
_PARAM_VAL_CASE (UINT32, "%lu", (unsigned long int) ntohl(param->data.uint32) ); |
|
38 |
_PARAM_VAL_CASE (UINT64, "%llu", (unsigned long long int) ntohq(param->data.uint64) ); |
|
39 |
default: return "???"; |
|
40 |
} |
|
41 |
||
42 |
return buf; |
|
43 |
} |
|
44 |
||
45 |
int evsql_params_clear (struct evsql_query_params *params) { |
|
46 |
struct evsql_query_param *param; |
|
47 |
||
48 |
for (param = params->list; param->type; param++) |
|
49 |
param->data_raw = NULL; |
|
50 |
||
51 |
return 0; |
|
52 |
} |
|
53 |
||
38
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
54 |
int evsql_param_null (struct evsql_query_params *params, size_t param) { |
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
55 |
struct evsql_query_param *p = ¶ms->list[param]; |
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
56 |
|
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
57 |
p->data_raw = NULL; |
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
58 |
|
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
59 |
return 0; |
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
60 |
} |
1fd4da071575
rework/hack parent to be a FOREIGN KEY (add a dir_ino col), implement dbfs_link
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
61 |
|
31 | 62 |
int evsql_param_binary (struct evsql_query_params *params, size_t param, const char *ptr, size_t len) { |
63 |
struct evsql_query_param *p = ¶ms->list[param]; |
|
64 |
||
65 |
assert(p->type == EVSQL_PARAM_BINARY); |
|
66 |
||
67 |
p->data_raw = ptr; |
|
68 |
p->length = len; |
|
69 |
||
70 |
return 0; |
|
71 |
} |
|
72 |
||
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
73 |
int evsql_param_string (struct evsql_query_params *params, size_t param, const char *ptr) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
74 |
struct evsql_query_param *p = ¶ms->list[param]; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
75 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
76 |
assert(p->type == EVSQL_PARAM_STRING); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
77 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
78 |
p->data_raw = ptr; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
79 |
p->length = 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
80 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
81 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
82 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
83 |
|
31 | 84 |
int evsql_param_uint16 (struct evsql_query_params *params, size_t param, uint16_t uval) { |
85 |
struct evsql_query_param *p = ¶ms->list[param]; |
|
86 |
||
87 |
assert(p->type == EVSQL_PARAM_UINT16); |
|
88 |
||
89 |
p->data.uint16 = htons(uval); |
|
90 |
p->data_raw = (const char *) &p->data.uint16; |
|
91 |
p->length = sizeof(uval); |
|
92 |
||
93 |
return 0; |
|
94 |
} |
|
95 |
||
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
96 |
int evsql_param_uint32 (struct evsql_query_params *params, size_t param, uint32_t uval) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
97 |
struct evsql_query_param *p = ¶ms->list[param]; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
98 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
99 |
assert(p->type == EVSQL_PARAM_UINT32); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
100 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
101 |
p->data.uint32 = htonl(uval); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
102 |
p->data_raw = (const char *) &p->data.uint32; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
103 |
p->length = sizeof(uval); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
104 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
105 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
106 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
107 |
|
31 | 108 |
void evsql_query_debug (const char *sql, const struct evsql_query_params *params) { |
109 |
const struct evsql_query_param *param; |
|
110 |
size_t param_count = 0, idx = 0; |
|
111 |
||
112 |
// count the params |
|
113 |
for (param = params->list; param->type; param++) |
|
114 |
param_count++; |
|
115 |
||
116 |
DEBUG("sql: %s", sql); |
|
117 |
DEBUG("params: %zu", param_count); |
|
118 |
||
119 |
for (param = params->list; param->type; param++) { |
|
120 |
DEBUG("\t%2zu : %8s = %s", ++idx, evsql_param_type(param), evsql_param_val(param)); |
|
121 |
} |
|
122 |
} |
|
123 |
||
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
124 |
int evsql_result_binary (const struct evsql_result *res, size_t row, size_t col, const char **ptr, size_t *size, int nullok) { |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
125 |
*ptr = NULL; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
126 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
127 |
switch (res->evsql->type) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
128 |
case EVSQL_EVPQ: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
129 |
if (PQgetisnull(res->result.pq, row, col)) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
130 |
if (nullok) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
131 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
132 |
else |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
133 |
ERROR("[%zu:%zu] field is null", row, col); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
134 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
135 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
136 |
if (PQfformat(res->result.pq, col) != 1) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
137 |
ERROR("[%zu:%zu] PQfformat is not binary: %d", row, col, PQfformat(res->result.pq, col)); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
138 |
|
30
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
139 |
*size = PQgetlength(res->result.pq, row, col); |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
140 |
*ptr = PQgetvalue(res->result.pq, row, col); |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
141 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
142 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
143 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
144 |
default: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
145 |
FATAL("res->evsql->type"); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
146 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
147 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
148 |
error: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
149 |
return -1; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
150 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
151 |
|
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
152 |
int evsql_result_binlen (const struct evsql_result *res, size_t row, size_t col, const char **ptr, size_t size, int nullok) { |
31 | 153 |
size_t real_size = 0; |
30
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
154 |
|
31 | 155 |
if (evsql_result_binary(res, row, col, ptr, &real_size, nullok)) |
30
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
156 |
goto error; |
31 | 157 |
|
158 |
if (*ptr == NULL) { |
|
159 |
assert(nullok); |
|
160 |
return 0; |
|
161 |
} |
|
30
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
162 |
|
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
163 |
if (size && real_size != size) |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
164 |
ERROR("[%zu:%zu] field size mismatch: %zu -> %zu", row, col, size, real_size); |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
165 |
|
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
166 |
return 0; |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
167 |
|
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
168 |
error: |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
169 |
return -1; |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
170 |
} |
d8fabd347a8e
working open+read+flush+release
Tero Marttila <terom@fixme.fi>
parents:
29
diff
changeset
|
171 |
|
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
172 |
int evsql_result_string (const struct evsql_result *res, size_t row, size_t col, const char **ptr, int nullok) { |
31 | 173 |
size_t real_size; |
174 |
||
175 |
if (evsql_result_binary(res, row, col, ptr, &real_size, nullok)) |
|
176 |
goto error; |
|
177 |
||
178 |
assert(real_size == strlen(*ptr)); |
|
179 |
||
180 |
return 0; |
|
181 |
||
182 |
error: |
|
183 |
return -1; |
|
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
184 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
185 |
|
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
186 |
int evsql_result_uint16 (const struct evsql_result *res, size_t row, size_t col, uint16_t *uval, int nullok) { |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
187 |
const char *data; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
188 |
int16_t sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
189 |
|
31 | 190 |
if (evsql_result_binlen(res, row, col, &data, sizeof(*uval), nullok)) |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
191 |
goto error; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
192 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
193 |
if (!data) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
194 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
195 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
196 |
sval = ntohs(*((int16_t *) data)); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
197 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
198 |
if (sval < 0) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
199 |
ERROR("negative value for unsigned: %d", sval); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
200 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
201 |
*uval = sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
202 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
203 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
204 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
205 |
error: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
206 |
return nullok ? 0 : -1; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
207 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
208 |
|
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
209 |
int evsql_result_uint32 (const struct evsql_result *res, size_t row, size_t col, uint32_t *uval, int nullok) { |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
210 |
const char *data; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
211 |
int32_t sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
212 |
|
31 | 213 |
if (evsql_result_binlen(res, row, col, &data, sizeof(*uval), nullok)) |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
214 |
goto error; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
215 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
216 |
if (!data) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
217 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
218 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
219 |
sval = ntohl(*(int32_t *) data); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
220 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
221 |
if (sval < 0) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
222 |
ERROR("negative value for unsigned: %d", sval); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
223 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
224 |
*uval = sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
225 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
226 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
227 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
228 |
error: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
229 |
return nullok ? 0 : -1; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
230 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
231 |
|
44
9e76ee9729b6
more work on the new evsql interface
Tero Marttila <terom@fixme.fi>
parents:
38
diff
changeset
|
232 |
int evsql_result_uint64 (const struct evsql_result *res, size_t row, size_t col, uint64_t *uval, int nullok) { |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
233 |
const char *data; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
234 |
int64_t sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
235 |
|
31 | 236 |
if (evsql_result_binlen(res, row, col, &data, sizeof(*uval), nullok)) |
29
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
237 |
goto error; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
238 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
239 |
if (!data) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
240 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
241 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
242 |
sval = ntohq(*(int64_t *) data); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
243 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
244 |
if (sval < 0) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
245 |
ERROR("negative value for unsigned: %ld", sval); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
246 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
247 |
*uval = sval; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
248 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
249 |
return 0; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
250 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
251 |
error: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
252 |
return nullok ? 0 : -1; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
253 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
254 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
255 |
const char *evsql_conn_error (struct evsql_conn *conn) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
256 |
switch (conn->evsql->type) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
257 |
case EVSQL_EVPQ: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
258 |
if (!conn->engine.evpq) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
259 |
return "unknown error (no conn)"; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
260 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
261 |
return evpq_error_message(conn->engine.evpq); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
262 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
263 |
default: |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
264 |
FATAL("res->evsql->type"); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
265 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
266 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
267 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
268 |
const char *evsql_trans_error (struct evsql_trans *trans) { |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
269 |
if (trans->conn == NULL) |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
270 |
return "unknown error (no trans conn)"; |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
271 |
|
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
272 |
return evsql_conn_error(trans->conn); |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
273 |
} |
5de62ca9a5aa
reorganize evsql into a separate dir, rename dbfs slightly, and split dbfs_op out from dirop (in prep for fileop)
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
274 |