author | Tero Marttila <terom@fixme.fi> |
Sat, 13 Dec 2008 18:55:01 +0200 | |
branch | new-evsql |
changeset 52 | f5037572c326 |
parent 50 | 881de320e483 |
permissions | -rw-r--r-- |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
1 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include <string.h> |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
|
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:
28
diff
changeset
|
4 |
#include "dbfs.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:
28
diff
changeset
|
5 |
#include "../lib/log.h" |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
6 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
mode_t _dbfs_mode (const char *type) { |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
8 |
if (!strcmp(type, "DIR")) |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
9 |
return S_IFDIR; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
10 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
11 |
if (!strcmp(type, "REG")) |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
12 |
return S_IFREG; |
32 | 13 |
|
14 |
if (!strcmp(type, "LNK")) |
|
15 |
return S_IFLNK; |
|
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
16 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
17 |
else { |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
18 |
WARNING("[dbfs] weird mode-type: %s", type); |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
19 |
return 0; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
20 |
} |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
21 |
} |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
22 |
|
48
8b019d191353
update dbfs code to work with new evsql
Tero Marttila <terom@fixme.fi>
parents:
41
diff
changeset
|
23 |
int _dbfs_check_res (struct evsql_result *res, size_t rows, size_t cols) { |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
24 |
int err = 0; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
25 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
26 |
// check if it failed |
48
8b019d191353
update dbfs code to work with new evsql
Tero Marttila <terom@fixme.fi>
parents:
41
diff
changeset
|
27 |
if (evsql_result_check(res)) |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
28 |
NERROR(evsql_result_error(res)); |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
29 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
30 |
// not found? |
34
460f995d3769
fix readdir to use ORDER BY, rename
Tero Marttila <terom@fixme.fi>
parents:
32
diff
changeset
|
31 |
if (evsql_result_rows(res) == 0 && evsql_result_affected(res) == 0) |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
32 |
SERROR(err = 1); |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
33 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
34 |
// duplicate rows? |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
35 |
if (rows && evsql_result_rows(res) != rows) |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
36 |
ERROR("wrong number of rows returned"); |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
37 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
38 |
// correct number of columns |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
39 |
if (evsql_result_cols(res) != cols) |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
40 |
ERROR("wrong number of columns: %zu", evsql_result_cols(res)); |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
41 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
42 |
// good |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
43 |
return 0; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
44 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
45 |
error: |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
46 |
if (!err) |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
47 |
err = -1; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
48 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
49 |
return err; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
50 |
} |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
51 |
|
48
8b019d191353
update dbfs code to work with new evsql
Tero Marttila <terom@fixme.fi>
parents:
41
diff
changeset
|
52 |
err_t dbfs_check_result (struct evsql_result *res, size_t rows, size_t cols) { |
41
6abda2fa4579
touch up the Makefile, define err_t as unsigned int in error.h, and add some preliminary interrupt support, although it will always deadlock due to a bug in libfuse
Tero Marttila <terom@fixme.fi>
parents:
36
diff
changeset
|
53 |
err_t err; |
34
460f995d3769
fix readdir to use ORDER BY, rename
Tero Marttila <terom@fixme.fi>
parents:
32
diff
changeset
|
54 |
|
36
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
55 |
// number of rows returned/affected |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
56 |
size_t nrows = evsql_result_rows(res) ? : evsql_result_affected(res); |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
57 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
58 |
// did the query fail outright? |
48
8b019d191353
update dbfs code to work with new evsql
Tero Marttila <terom@fixme.fi>
parents:
41
diff
changeset
|
59 |
if (evsql_result_check(res)) |
36
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
60 |
// dump error message |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
61 |
NXERROR(err = EIO, evsql_result_error(res)); |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
62 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
63 |
// SELECT/DELETE/UPDATE WHERE didn't match any rows -> ENOENT |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
64 |
if (nrows == 0) |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
65 |
XERROR(err = ENOENT, "no rows returned/affected"); |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
66 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
67 |
// duplicate rows where one expected? |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
68 |
if (rows && nrows != rows) |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
69 |
XERROR(err = EIO, "wrong number of rows: %zu -> %zu", rows, nrows); |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
70 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
71 |
// correct number of columns |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
72 |
if (evsql_result_cols(res) != cols) |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
73 |
XERROR(err = EIO, "wrong number of columns: %zu -> %zu", cols, evsql_result_cols(res)); |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
74 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
75 |
// good |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
76 |
return 0; |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
77 |
|
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
78 |
error: |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
79 |
return err; |
56427f22e969
tweak debug/info output, implement dbfs_unlink with slightly improved error macros handling
Tero Marttila <terom@fixme.fi>
parents:
34
diff
changeset
|
80 |
} |
34
460f995d3769
fix readdir to use ORDER BY, rename
Tero Marttila <terom@fixme.fi>
parents:
32
diff
changeset
|
81 |
|
49
bb2ff0d2d343
modify stat-returning dbfs result functions to use new evsql
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
82 |
int _dbfs_stat_info (struct stat *st, struct dbfs_stat_values *values) { |
bb2ff0d2d343
modify stat-returning dbfs result functions to use new evsql
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
83 |
INFO("\tst_mode=S_IF%s | %ho, st_nlink=%llu, st_size=%llu", values->type, values->mode, (long long unsigned int) values->nlink, (long long unsigned int) values->size); |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
84 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
85 |
// convert and store |
49
bb2ff0d2d343
modify stat-returning dbfs result functions to use new evsql
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
86 |
st->st_mode = _dbfs_mode(values->type) | values->mode; |
bb2ff0d2d343
modify stat-returning dbfs result functions to use new evsql
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
87 |
st->st_nlink = values->nlink; |
bb2ff0d2d343
modify stat-returning dbfs result functions to use new evsql
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
88 |
st->st_size = values->size; |
28
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
89 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
90 |
// good |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
91 |
return 0; |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
92 |
} |
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
93 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
94 |
|
e944453ca924
split off dbfs components into a separate dir, improve dirop docs, error handling, etc
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
95 |