Code clean up.

diff --git a/src/context/pool_session_context.c b/src/context/pool_session_context.c
index 7702552cdd871ee3e835e8a73d9892bc47ca4376..becc317281e541cb834df9027c7124d6f04a0f83 100644 (file)
--- a/src/context/pool_session_context.c
+++ b/src/context/pool_session_context.c
@@ -1228,7 +1228,6 @@ POOL_PENDING_MESSAGE *pool_pending_message_pull_out(void)
 POOL_PENDING_MESSAGE *pool_pending_message_get(POOL_MESSAGE_TYPE type)
 {
        ListCell   *cell;
-       ListCell   *prev;
        ListCell   *next;
        POOL_PENDING_MESSAGE *msg;
        MemoryContext old_context;
@@ -1239,7 +1238,6 @@ POOL_PENDING_MESSAGE *pool_pending_message_get(POOL_MESSAGE_TYPE type)
 
        old_context = MemoryContextSwitchTo(session_context->memory_context);
 
-       prev = NULL;
        msg = NULL;
 
        for (cell = list_head(session_context->pending_messages); cell; cell = next)
@@ -1253,8 +1251,6 @@ POOL_PENDING_MESSAGE *pool_pending_message_get(POOL_MESSAGE_TYPE type)
                        msg = copy_pending_message(m);
                        break;
                }
-               else
-                       prev = cell;
        }
 
        MemoryContextSwitchTo(old_context);

diff --git a/src/include/context/pool_session_context.h b/src/include/context/pool_session_context.h
index 1a31b9df43625a7d6ad1f1fcea7c5f688a553f1d..2b119483f5b9fc735469ed38d715d64de3103f3d 100644 (file)
--- a/src/include/context/pool_session_context.h
+++ b/src/include/context/pool_session_context.h
@@ -274,14 +274,6 @@ extern void pool_set_command_success(void);
 extern bool pool_is_command_success(void);
 extern void pool_copy_prep_where(bool *src, bool *dest);
 extern bool can_query_context_destroy(POOL_QUERY_CONTEXT *qc);
-extern void pool_set_sync_map(int node_id);
-extern bool pool_is_set_sync_map(int node_id);
-extern int pool_get_nth_sync_map(int nth);
-extern void pool_clear_sync_map(void);
-extern bool pool_use_sync_map(void);
-extern void pool_set_pending_response(void);
-extern void pool_unset_pending_response(void);
-extern bool pool_is_pending_response(void);
 extern void pool_pending_messages_init (void);
 extern void pool_pending_messages_destroy(void);
 extern POOL_PENDING_MESSAGE *pool_pending_message_create(char kind, int len, char *contents);

diff --git a/src/protocol/CommandComplete.c b/src/protocol/CommandComplete.c
index 8e8915a761c702703fe6d23847f443cbe81a63dc..8974c9e830a8c789e597f50d5b29863960fd1180 100644 (file)
--- a/src/protocol/CommandComplete.c
+++ b/src/protocol/CommandComplete.c
@@ -53,6 +53,9 @@ POOL_STATUS CommandComplete(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *bac
        POOL_SESSION_CONTEXT *session_context;
        POOL_CONNECTION *con;
 
+       p1 = NULL;
+       len1 = 0;
+
        /* Get session context */
        session_context = pool_get_session_context(false);
 

diff --git a/src/protocol/pool_process_query.c b/src/protocol/pool_process_query.c
index cbf6cb2bca7e1447e6c0118f92cdf305ce0f72bb..74afd8373d58de7179416dc5c63f5a17889cba4f 100644 (file)
--- a/src/protocol/pool_process_query.c
+++ b/src/protocol/pool_process_query.c
@@ -72,7 +72,6 @@
 
 static int reset_backend(POOL_CONNECTION_POOL *backend, int qcnt);
 static char *get_insert_command_table_name(InsertStmt *node);
-static int send_deallocate(POOL_CONNECTION_POOL *backend, POOL_SENT_MESSAGE_LIST msglist, int n);
 static bool is_cache_empty(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend);
 static bool is_panic_or_fatal_error(const char *message, int major);
 static int detect_error(POOL_CONNECTION *master, char *error_code, int major, char class, bool unread);
@@ -3621,35 +3620,6 @@ void read_kind_from_backend(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *bac
        return;
 }
 
-/*
- * Send DEALLOCATE message to backend by using SimpleQuery.
- */
-static int send_deallocate(POOL_CONNECTION_POOL *backend,
-                                                  POOL_SENT_MESSAGE_LIST msglist, int n)
-{
-       int len;
-       char *name;
-       char *query;
-
-       if (msglist.size <= n)
-               return 1;
-
-       name = msglist.sent_messages[n]->name;
-
-       len = strlen(name) + 14; /* "DEALLOCATE \"" + "\"" + '\0' */
-       query = palloc(len);
-       sprintf(query, "DEALLOCATE \"%s\"", name);
-
-       if (SimpleQuery(NULL, backend, strlen(query)+1, query) != POOL_CONTINUE)
-       {
-               pfree(query);
-               return 1;
-       }
-       pfree(query);
-
-       return 0;
-}
-
 /*
  * parse_copy_data()
  *   Parses CopyDataRow string.