Remove // comments.

diff --git a/pcp/pcp.c b/pcp/pcp.c
index e252bae0368b20e4d209bb23acec62ede67b16bb..de83b4b71e6692d7040edc9175bb88207aef0feb 100644 (file)
--- a/pcp/pcp.c
+++ b/pcp/pcp.c
@@ -481,8 +481,8 @@ pcp_node_info(int nid)
                                free(buf);
                                return NULL;
                        }
-                       // FIXME
-//                     rsize -= strlen("CommandComplete") + 1;
+                       /* FIXME */
+                       /* rsize -= strlen("CommandComplete") + 1; */
 
                        index = (char *) memchr(buf, '\0', rsize) + 1;
                        if (index != NULL)

diff --git a/pool_process_query.c b/pool_process_query.c
index 04d8be24f9e9155bf90115e4fb3020b08651a566..1ffceb11ac8dc75a6f78775188000cfc6ed1b452 100644 (file)
--- a/pool_process_query.c
+++ b/pool_process_query.c
@@ -355,10 +355,13 @@ POOL_STATUS pool_process_query(POOL_CONNECTION *frontend,
                                        if (status != POOL_CONTINUE)
                                                return status;
 
-//                                     continue;
+#ifdef NOT_USED
+                                       continue;
+                               }
+                               if (kind == 0)
+                                       continue;
+#endif
                                }
-//                             if (kind == 0)
-//                                     continue;
                        }
 
                        if (FD_ISSET(MASTER(backend)->fd, &exceptmask))
@@ -384,7 +387,9 @@ POOL_STATUS pool_process_query(POOL_CONNECTION *frontend,
                                if (status != POOL_CONTINUE)
                                        return status;
 
-//                             continue;
+#ifdef NOT_USED
+                               continue;
+#endif
                        }
                }
 
@@ -1060,8 +1065,6 @@ POOL_STATUS SimpleForwardToFrontend(char kind, POOL_CONNECTION *frontend,
        int i;
        int command_ok_row_count = 0;
        int delete_or_update = 0;
-//     char kind1;
-//     POOL_STATUS ret;
        POOL_SESSION_CONTEXT *session_context;
        bool mismatch_ntuples = false;
 
@@ -1414,10 +1417,6 @@ POOL_STATUS SimpleForwardToBackend(char kind, POOL_CONNECTION *frontend,
 {
        int sendlen;
        int i;
-//     char *rewrite_msg = NULL;
-//     POOL_STATUS ret;
-//     PreparedStatement *pstmt;
-//     Portal *portal;
        POOL_SESSION_CONTEXT *session_context;
 
        /* Get session context */
@@ -1475,10 +1474,8 @@ POOL_STATUS SimpleForwardToBackend(char kind, POOL_CONNECTION *frontend,
                        {
                                if (VALID_BACKEND(i) && !IS_MASTER_NODE_ID(i))
                                {
-//#ifdef NOT_USED
                                        snprintf(msgbuf, sizeof(msgbuf), "%c message", kind);
                                        per_node_statement_log(backend, i, msgbuf);
-//#endif
 
                                        /* Forward to other nodes */
                                        if (send_extended_protocol_message(backend, i, &kind, len, contents))
@@ -1501,22 +1498,28 @@ POOL_STATUS SimpleForwardToBackend(char kind, POOL_CONNECTION *frontend,
 
                                if (pool_write(CONNECTION(backend, i), &kind, 1))
                                {
-//                                     if (rewrite_msg)
-//                                             free(rewrite_msg);
+#ifdef NOT_USED
+                                       if (rewrite_msg)
+                                               free(rewrite_msg);
+#endif
                                        return POOL_END;
                                }
 
                                if (pool_write(CONNECTION(backend,i), &sendlen, sizeof(sendlen)))
                                {
-//                                     if (rewrite_msg)
-//                                             free(rewrite_msg);
+#ifdef NOT_USED
+                                       if (rewrite_msg)
+                                               free(rewrite_msg);
+#endif
                                        return POOL_END;
                                }
 
                                if (pool_write_and_flush(CONNECTION(backend, i), contents, len))
                                {
-//                                     if (rewrite_msg)
-//                                             free(rewrite_msg);
+#ifdef NOT_USED
+                                       if (rewrite_msg)
+                                               free(rewrite_msg);
+#endif
                                        return POOL_END;
                                }
                        }
@@ -1824,7 +1827,9 @@ static int reset_backend(POOL_CONNECTION_POOL *backend, int qcnt)
                         * were executed.  The latter causes call to
                         * reset_prepared_list which removes all prepared objects.
                         */
-//                     reset_prepared_list(&prepared_list);
+#ifdef NOT_USED
+                       reset_prepared_list(&prepared_list);
+#endif
                        return 2;
                }
 
@@ -1836,7 +1841,9 @@ static int reset_backend(POOL_CONNECTION_POOL *backend, int qcnt)
                        /* Deallocate failed. We are in unknown state. Ask caller
                         * to reset backend connection.
                         */
-//                     reset_prepared_list(&prepared_list);
+#ifdef NOT_USED
+                       reset_prepared_list(&prepared_list);
+#endif
                        pool_remove_prepared_statement_by_pstmt_name(name);
                        return -1;
                }
@@ -1848,7 +1855,9 @@ static int reset_backend(POOL_CONNECTION_POOL *backend, int qcnt)
                 * del_prepared_list() again. This is harmless since trying to
                 * remove same prepared object will be ignored.
                 */
-//             del_prepared_list(&prepared_list, prepared_list.portal_list[0]);
+#ifdef NOT_USED
+               del_prepared_list(&prepared_list, prepared_list.portal_list[0]);
+#endif
                pool_remove_prepared_statement_by_pstmt_name(name);
                return 1;
        }
@@ -3259,7 +3268,9 @@ static int is_cache_empty(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backe
        if (pool_ssl_pending(frontend))
                return 0;
 
-//     if (!pool_read_buffer_is_empty(frontend) && !pool_is_query_in_progress())
+#ifdef NOT_USED
+       if (!pool_read_buffer_is_empty(frontend) && !pool_is_query_in_progress())
+#endif
        if (!pool_read_buffer_is_empty(frontend))
                return 0;
 

diff --git a/pool_proto_modules.c b/pool_proto_modules.c
index 922575ced9fddfab13788b02c95457f76f7600e7..9e2bc367c8a0116215128eaa0e5b0e914fff4609 100644 (file)
--- a/pool_proto_modules.c
+++ b/pool_proto_modules.c
@@ -499,15 +499,10 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
 POOL_STATUS Execute(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                                        int len, char *contents)
 {
-//     char kind;
-//     int status;
        int commit = 0;
-//     PreparedStatement *ps;
        Portal *portal;
        char *query = NULL;
        Node *node;
-//     PrepareStmt *p_stmt;
-//     POOL_STATUS ret;
        int specific_error = 0;
        POOL_SESSION_CONTEXT *session_context;
        POOL_QUERY_CONTEXT *query_context;
@@ -550,7 +545,9 @@ POOL_STATUS Execute(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        pool_debug("Execute: query: %s", query);
        strncpy(query_string_buffer, query, sizeof(query_string_buffer));
 
-//     pool_set_query_in_progress();
+#ifdef NOT_USED
+       pool_set_query_in_progress();
+#endif
 
        /*
         * Decide where to send query
@@ -620,11 +617,15 @@ POOL_STATUS Execute(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                        if (pool_send_and_wait(query_context, msg, len, -1, MASTER_NODE_ID, "E") != POOL_CONTINUE)
                                return POOL_END;
                }
-//             else
-//             {
+#ifdef NOT_USED
+               else
+               {
+#endif
                        if (pool_send_and_wait(query_context, contents, len, -1, MASTER_NODE_ID, "E") != POOL_CONTINUE)
                                return POOL_END;
-//             }
+#ifdef NOT_USED
+               }
+#endif
                
                /* send "COMMIT" or "ROLLBACK" to only master node if query is "COMMIT" or "ROLLBACK" */
                if (commit)
@@ -684,7 +685,6 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        char *stmt;
        List *parse_tree_list;
        Node *node = NULL;
-//     PrepareStmt *p_stmt;
        PreparedStatement *ps;
        POOL_STATUS status;
        POOL_MEMORY_POOL *old_context;
@@ -801,13 +801,13 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                        kind = pool_read_kind(backend);
                        if (kind != 'Z')
                        {
-//                             free_parser();
+                               /* free_parser(); */
                                return POOL_END;
                        }
 
                        if (ReadyForQuery(frontend, backend, 0) != POOL_CONTINUE)
                        {
-//                             free_parser();
+                               /* free_parser(); */
                                return POOL_END;
                        }
                }
@@ -821,7 +821,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                        status = insert_lock(frontend, backend, stmt, (InsertStmt *)query_context->parse_tree);
                        if (status != POOL_CONTINUE)
                        {
-//                             free_parser();
+                               /* free_parser(); */
                                return status;
                        }
                }
@@ -841,7 +841,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                pool_debug("Parse: waiting for master completing the query");
                if (pool_send_and_wait(query_context, contents, len, 1, MASTER_NODE_ID, "P") != POOL_CONTINUE)
                {
-//                     free_parser();
+                       /* free_parser(); */
                        return POOL_END;
                }
 
@@ -854,7 +854,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                deadlock_detected = detect_deadlock_error(MASTER(backend), MAJOR(backend));
                if (deadlock_detected < 0)
                {
-//                     free_parser();
+                       /* free_parser(); */
                        return POOL_END;
                }
                else
@@ -875,7 +875,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                                                                   strlen(POOL_ERROR_QUERY)+1, -1,
                                                                   MASTER_NODE_ID, "") != POOL_CONTINUE)
                        {
-//                             free_parser();
+                               /* free_parser(); */
                                return POOL_END;
                        }
                }
@@ -883,7 +883,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
                {
                        if (pool_send_and_wait(query_context, contents, len, -1, MASTER_NODE_ID, "P") != POOL_CONTINUE)
                        {
-//                             free_parser();
+                               /* free_parser(); */
                                return POOL_END;
                        }
                }
@@ -892,7 +892,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        {
                if (pool_send_and_wait(query_context, contents, len, 1, MASTER_NODE_ID, "P") != POOL_CONTINUE)
                {
-//                     free_parser();
+                       /* free_parser(); */
                        return POOL_END;
                }
        }
@@ -900,7 +900,7 @@ POOL_STATUS Parse(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        /*
         * Ok. we are safe to call free_parser();
         */
-//     free_parser();
+       /* free_parser(); */
 
 #ifdef NOT_USED
        for (;;)
@@ -998,21 +998,27 @@ POOL_STATUS Bind(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *backend,
        if (pool_send_and_wait(query_context, contents, len, 1, MASTER_NODE_ID, "B")
                != POOL_CONTINUE)
        {
-//             if (rewrite_msg != NULL)
-//                     free(rewrite_msg);
+#ifdef NOT_USED
+               if (rewrite_msg != NULL)
+                       free(rewrite_msg);
+#endif
                return POOL_END;
        }
 
        if (pool_send_and_wait(query_context, contents, len, -1, MASTER_NODE_ID, "B")
                != POOL_CONTINUE)
        {
-//             if (rewrite_msg != NULL)
-//                     free(rewrite_msg);
+#ifdef NOT_USED
+               if (rewrite_msg != NULL)
+                       free(rewrite_msg);
+#endif
                return POOL_END;
        }
 
-//     if (rewrite_msg != NULL)
-//             free(rewrite_msg);
+#ifdef NOT_USED
+       if (rewrite_msg != NULL)
+               free(rewrite_msg);
+#endif
 
        return POOL_CONTINUE;
 }
@@ -1304,7 +1310,7 @@ POOL_STATUS ReadyForQuery(POOL_CONNECTION *frontend,
         * if a transaction is started for insert lock, we need to close
         * the transaction.
         */
-//     if (pool_is_query_in_progress() && allow_close_transaction)
+       /* if (pool_is_query_in_progress() && allow_close_transaction) */
        if (allow_close_transaction)
        {
                if (end_internal_transaction(frontend, backend) != POOL_CONTINUE)
@@ -1595,12 +1601,7 @@ POOL_STATUS CommandComplete(POOL_CONNECTION *frontend, POOL_CONNECTION_POOL *bac
 POOL_STATUS ErrorResponse3(POOL_CONNECTION *frontend,
                                                   POOL_CONNECTION_POOL *backend)
 {
-//     int i;
        int ret;
-//     int res1;
-//     int status;
-//     char *p1;
-//     char kind1;
 
        /* An error occurred with PREPARE or DEALLOCATE command.
         * Free pending portal object.
@@ -1799,10 +1800,8 @@ POOL_STATUS ProcessFrontendResponse(POOL_CONNECTION *frontend,
                                                                        POOL_CONNECTION_POOL *backend)
 {
        char fkind;
-//     char kind;
        char *contents = NULL;
        POOL_STATUS status;
-//     int i;
        int len;
        POOL_SESSION_CONTEXT *session_context;
 

diff --git a/pool_session_context.c b/pool_session_context.c
index ae50ec85141386c595223c14247096e102cc0747..29d6c2d268446aeeb47e740725aef46addd125b0 100644 (file)
--- a/pool_session_context.c
+++ b/pool_session_context.c
@@ -579,7 +579,6 @@ PreparedStatement *pool_create_prepared_statement(const char *name,
                                                                                                  POOL_QUERY_CONTEXT *qc)
 {
        PreparedStatement *ps;
-//     POOL_QUERY_CONTEXT *q;
 
        if (!session_context)
        {