aboutsummaryrefslogtreecommitdiff
path: root/src/datastore
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-06-06 07:54:01 +0200
committerChristian Grothoff <christian@grothoff.org>2018-06-06 07:54:01 +0200
commitf651dba097585be06d05592a6246c71e5cb1c936 (patch)
tree65ae839a748a78637f98dd3aed4d2a386b4d16b5 /src/datastore
parent73ab0f26d0fcd47b7b4d6f4faf5bf143a2d06743 (diff)
downloadgnunet-f651dba097585be06d05592a6246c71e5cb1c936.tar.gz
gnunet-f651dba097585be06d05592a6246c71e5cb1c936.zip
better indentation, nicer formatting of SQL
Diffstat (limited to 'src/datastore')
-rw-r--r--src/datastore/plugin_datastore_postgres.c32
-rw-r--r--src/datastore/plugin_datastore_sqlite.c8
2 files changed, 23 insertions, 17 deletions
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 0dc22b0f2..30013ef76 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -96,23 +96,23 @@ init_connection (struct Plugin *plugin)
96#define RESULT_COLUMNS "repl, type, prio, anonLevel, expire, hash, value, oid" 96#define RESULT_COLUMNS "repl, type, prio, anonLevel, expire, hash, value, oid"
97 struct GNUNET_PQ_PreparedStatement ps[] = { 97 struct GNUNET_PQ_PreparedStatement ps[] = {
98 GNUNET_PQ_make_prepare ("get", 98 GNUNET_PQ_make_prepare ("get",
99 "SELECT " RESULT_COLUMNS " FROM gn090 " 99 "SELECT " RESULT_COLUMNS " FROM gn090"
100 "WHERE oid >= $1::bigint AND " 100 " WHERE oid >= $1::bigint AND"
101 "(rvalue >= $2 OR 0 = $3::smallint) AND " 101 " (rvalue >= $2 OR 0 = $3::smallint) AND"
102 "(hash = $4 OR 0 = $5::smallint) AND " 102 " (hash = $4 OR 0 = $5::smallint) AND"
103 "(type = $6 OR 0 = $7::smallint) " 103 " (type = $6 OR 0 = $7::smallint)"
104 "ORDER BY oid ASC LIMIT 1", 104 " ORDER BY oid ASC LIMIT 1",
105 7), 105 7),
106 GNUNET_PQ_make_prepare ("put", 106 GNUNET_PQ_make_prepare ("put",
107 "INSERT INTO gn090 (repl, type, prio, anonLevel, expire, rvalue, hash, vhash, value) " 107 "INSERT INTO gn090 (repl, type, prio, anonLevel, expire, rvalue, hash, vhash, value) "
108 "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)", 108 "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
109 9), 109 9),
110 GNUNET_PQ_make_prepare ("update", 110 GNUNET_PQ_make_prepare ("update",
111 "UPDATE gn090 " 111 "UPDATE gn090"
112 "SET prio = prio + $1, " 112 " SET prio = prio + $1,"
113 "repl = repl + $2, " 113 " repl = repl + $2,"
114 "expire = GREATEST(expire, $3) " 114 " expire = GREATEST(expire, $3)"
115 "WHERE hash = $4 AND vhash = $5", 115 " WHERE hash = $4 AND vhash = $5",
116 5), 116 5),
117 GNUNET_PQ_make_prepare ("decrepl", 117 GNUNET_PQ_make_prepare ("decrepl",
118 "UPDATE gn090 SET repl = GREATEST (repl - 1, 0) " 118 "UPDATE gn090 SET repl = GREATEST (repl - 1, 0) "
@@ -136,11 +136,13 @@ init_connection (struct Plugin *plugin)
136 "ORDER BY repl DESC,RANDOM() LIMIT 1", 136 "ORDER BY repl DESC,RANDOM() LIMIT 1",
137 0), 137 0),
138 GNUNET_PQ_make_prepare ("delrow", 138 GNUNET_PQ_make_prepare ("delrow",
139 "DELETE FROM gn090 " "WHERE oid=$1", 139 "DELETE FROM gn090 "
140 "WHERE oid=$1",
140 1), 141 1),
141 GNUNET_PQ_make_prepare ("remove", "DELETE FROM gn090 " 142 GNUNET_PQ_make_prepare ("remove",
142 "WHERE hash = $1 AND " 143 "DELETE FROM gn090"
143 "value = $2", 144 " WHERE hash = $1 AND"
145 " value = $2",
144 2), 146 2),
145 GNUNET_PQ_make_prepare ("get_keys", 147 GNUNET_PQ_make_prepare ("get_keys",
146 "SELECT hash FROM gn090", 148 "SELECT hash FROM gn090",
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 331b9f7f1..862977b9a 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -704,12 +704,16 @@ sqlite_plugin_put (void *cls,
704 break; 704 break;
705 case SQLITE_BUSY: 705 case SQLITE_BUSY:
706 GNUNET_break (0); 706 GNUNET_break (0);
707 LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 707 LOG_SQLITE_MSG (plugin,
708 &msg,
709 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
708 "sqlite3_step"); 710 "sqlite3_step");
709 ret = GNUNET_SYSERR; 711 ret = GNUNET_SYSERR;
710 break; 712 break;
711 default: 713 default:
712 LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 714 LOG_SQLITE_MSG (plugin,
715 &msg,
716 GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
713 "sqlite3_step"); 717 "sqlite3_step");
714 GNUNET_SQ_reset (plugin->dbh, 718 GNUNET_SQ_reset (plugin->dbh,
715 stmt); 719 stmt);