![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 923f000743db5f3694698ffbecdb9a0a033ec4b4..ce16a8b900085ecbac3eb5ef82b4af466400dcca 100644 (file)
#include "core/object.h"
#include "core/plugin.h"
#include "frontend/connection-private.h"
-#include "frontend/parser.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
+ conn->skip_len = 0;
/* update the object name */
snprintf(obj->name + strlen(CONN_FD_PREFIX),
int status = -1;
assert(conn && (conn->cmd != CONNECTION_IDLE));
+ assert(! conn->skip_len);
sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
conn->cmd, conn->cmd_len);
- if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
- const char *errmsg = "Authentication required";
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)strlen(errmsg), errmsg);
- return -1;
- }
-
- switch (conn->cmd) {
- case CONNECTION_PING:
- status = sdb_connection_ping(conn);
- break;
- case CONNECTION_STARTUP:
- status = sdb_fe_session_start(conn);
- break;
-
- case CONNECTION_QUERY:
- {
- sdb_llist_t *parsetree;
- sdb_conn_node_t *node = NULL;
-
- parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
- (int)conn->cmd_len);
- if (! parsetree) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
- sdb_strbuf_string(conn->buf));
- status = -1;
- break;
- }
-
- switch (sdb_llist_len(parsetree)) {
- case 0:
- /* skipping empty command */
- break;
- case 1:
- node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
- break;
-
- default:
- sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %d command%s "
- "in multi-statement query '%s'",
- sdb_llist_len(parsetree) - 1,
- sdb_llist_len(parsetree) == 2 ? "" : "s",
- sdb_strbuf_string(conn->buf));
- node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
- }
-
- if (node) {
- status = sdb_fe_exec(conn, node);
- sdb_object_deref(SDB_OBJ(node));
- }
-
- sdb_llist_destroy(parsetree);
- break;
- }
-
- case CONNECTION_FETCH:
- status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
- break;
- case CONNECTION_LIST:
- status = sdb_fe_list(conn);
- break;
- case CONNECTION_LOOKUP:
- {
- sdb_store_matcher_t *m;
-
- m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
- (int)conn->cmd_len);
- if (! m) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to parse expression '%s'",
- sdb_strbuf_string(conn->buf));
- status = -1;
- break;
- }
-
- status = sdb_fe_lookup(conn, m);
- sdb_object_deref(SDB_OBJ(m));
- break;
- }
-
- default:
- {
- sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
- conn->cmd);
- sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
- status = -1;
- break;
- }
+ if (conn->cmd == CONNECTION_PING)
+ status = sdb_connection_ping(conn);
+ else if (conn->cmd == CONNECTION_STARTUP)
+ status = sdb_fe_session_start(conn);
+ else if (conn->cmd == CONNECTION_QUERY)
+ status = sdb_fe_query(conn);
+ else if (conn->cmd == CONNECTION_FETCH)
+ status = sdb_fe_fetch(conn);
+ else if (conn->cmd == CONNECTION_LIST)
+ status = sdb_fe_list(conn);
+ else if (conn->cmd == CONNECTION_LOOKUP)
+ status = sdb_fe_lookup(conn);
+ else {
+ sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
+ conn->cmd);
+ sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
+ status = -1;
}
if (status)
static int
command_init(sdb_conn_t *conn)
{
- size_t len;
+ const char *errmsg = NULL;
assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+ if (conn->skip_len)
+ return -1;
+
/* reset */
- sdb_strbuf_sprintf(conn->errbuf, "");
+ sdb_strbuf_clear(conn->errbuf);
conn->cmd = connection_get_int32(conn, 0);
conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
- len = 2 * sizeof(uint32_t);
- if (conn->cmd == CONNECTION_IDLE) {
- const char *errmsg = "Invalid command 0";
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
+ sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+ if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+ errmsg = "Authentication required";
+ else if (conn->cmd == CONNECTION_IDLE)
+ errmsg = "Invalid command 0";
+
+ if (errmsg) {
+ size_t len = sdb_strbuf_len(conn->buf);
+
+ sdb_strbuf_sprintf(conn->errbuf, "%s", errmsg);
sdb_connection_send(conn, CONNECTION_ERROR,
(uint32_t)strlen(errmsg), errmsg);
- len += conn->cmd_len;
+ conn->skip_len += conn->cmd_len;
+ conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
+
+ if (len > conn->skip_len)
+ len = conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ /* connection_read will handle anything else */
}
- sdb_strbuf_skip(conn->buf, 0, len);
return 0;
} /* command_init */
else if (! status) /* EOF */
break;
+ if (conn->skip_len) {
+ size_t len = (size_t)status < conn->skip_len
+ ? (size_t)status : conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ }
+
n += status;
+
+ /* give the main loop a chance to execute commands (and free up buffer
+ * space) on large amounts of incoming traffic */
+ if (n > 1024 * 1024)
+ break;
}
return n;