prestogres 0.4.5 → 0.4.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ4NzllNzI0M2I1YTJhZTcyODIzOTlkZDY0YjcyMjI2MWM4MmUxYw==
+    MDhmMGY1ZTM1NzgwODg0OWY2MGY4MjZlOWRkYTIxZDA1NDg0ZTEyMg==
   data.tar.gz: !binary |-
-    ODEzZjQzNGE5YTBmOTcxNDhlODlhMmFlNjFmMDJiOTBiMTE1YzZlYQ==
+    YTYyOTUxYjQwM2MzZWE1MjA4NzAzYmNhMDVjZjNjYmNhZTJlMTRiZg==
 SHA512:
   metadata.gz: !binary |-
-    OGQwY2I0MDI5NTU3OGFmNzgzZTExM2NhZGNmYjY3YTkzOWU5MDQzM2UzYjZl
-    YWE1MTkzOGM1Y2U5MWNhMzhhOGUxN2I4NTA2Njk0YjIzOTdkOTlkNDdmYjM2
-    MTAwMTJjMjQ3ZmFiOWRiMjQ5OTVhYzY0YzkyMWU2YjU2OTUwOTQ=
+    ODYxY2FmYWIzYjllNDJmZGRhNTY0ZDM2MzA2NDNhNzUxOGRhMDc3ODgzNGUy
+    MjRhZTU0YTM3Y2VhMDFiMTc0NjdkOTlkMTI4NDRjNTBjNTdlNGYyNmZkMjc2
+    MjRjNDRmNzkzYjg2NzRiOTczMzNhYWUxZTNlNGFjZWRiZWRmN2M=
   data.tar.gz: !binary |-
-    ZWVkOWM1MmRkNWU5NjA4ZjZhZTVhYmJlNGZmNmM4N2IzMGMxNzBhYjJkMjNk
-    MzJhMGYwZDllMTJhODA4Y2VjOGY2YzJlYzg2YWRjNjkzMTdkNzMyMjMwYjEy
-    MmVhMTc1MGEzYjM0NWFiYmU1MTQyMDY2MGI2YjhiNWNhOWYxNWY=
+    YzhlYmVlMzM4NmVmY2U1ZWRiMzhhMTNiZTQwYTllMmIxNDYwOTE2NGQ4NmZh
+    MWM2ZTFmMzNmZjc5NzFmMWZhZTcyMzA4ZDFkOGYwODc0ZGMyMzFmYmVlYjcz
+    YzQxYTM5MmI2ZWMyM2Q5MzFjYTM0MDVmOWRjNjlhY2JhZWQwOGM=

data/ChangeLog

@@ -1,4 +1,12 @@
 
+2014-06-25 version 0.4.6:
+
+* Supports python-2.6 and CentOS 6 (@wyukawa++)
+* Ignores "invalid session state" error which was causing exception before
+* Ignores BEGIN and COMMIT commands which were causing exception before
+* Fixed error handling with protocol version 2 to send message back to clients
+
+
 2014-06-11 version 0.4.5:
 
 * Added prestogres_trust auth method

data/README.md

@@ -52,8 +52,9 @@ In fact there're some other tricks. See [pgsql/prestogres.py](pgsql/prestogres.p
 
 * Extended query is not supported ([PostgreSQL Frontend/Backend Protocol](http://www.postgresql.org/docs/9.3/static/protocol.html))
   * ODBC driver needs to set:
-     * **UseServerSidePrepare=0** (Server side prepare: no) property
-     * **UseDeclareFetch=0** (Use Declare/Fetch: no) property
+     * **Server side prepare = no** property (UseServerSidePrepare=0 at .ini file)
+     * **Use Declare/Fetch = no** property (UseDeclareFetch=0 at .ini file)
+     * **Level of rollback on errors = Nop** property (Protocol=7.4-0 or Protocol=6.4 at .ini file)
      * **Unicode** mode
   * JDBC driver needs to set:
      * **protocolVersion=2** property
@@ -86,7 +87,7 @@ sudo apt-get install ruby ruby-dev
 # add yum source
 sudo yum install http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-redhat93-9.3-1.noarch.rpm
 # install PostgreSQL
-sudo yum install postgresql93-server postgresql93-contrib postgresql93-devel
+sudo yum install postgresql93-server postgresql93-contrib postgresql93-devel postgresql93-plpython
 # install other dependencies
 sudo yum install gcc make openssl-devel pcre-devel
 sudo yum install ruby ruby-devel
@@ -175,14 +176,14 @@ Please read [pgpool-II documentation](http://www.pgpool.net/docs/latest/pgpool-e
 Following parameters are unique to Prestogres:
 
 * **presto_server**: Default address:port of Presto server.
-* **presto_catalog**: Default catalog (connector) name of Presto such as `hive-cdh4`, `hive-hadoop1`, etc.
+* **presto_catalog**: Default catalog name of Presto such as `hive`, etc.
 * **presto_external_auth_prog**: Default path to an external authentication program used by `prestogres_external` authentication moethd. See following Authentication section for details.
 
 You can overwrite these parameters for each connecting users. See also following *pool_hba.conf* section.
 
 ### pool_hba.conf file
 
-By default configuration, Prestogres accepts all connections from localhost without password and rejects any other connections. You can change this behavior by updating **\<data_dir\>/pgpool2/pool_hba.conf** file.
+By default configuration, Prestogres accepts all connections from localhost without password and rejects any other connections. You can change this behavior by updating **\<data_dir\>/pgpool/pool_hba.conf** file.
 
 See [sample pool_hba.conf file](https://github.com/treasure-data/prestogres/blob/master/config/pool_hba.conf) for details. Basic syntax is:
 
@@ -196,7 +197,7 @@ host     all        all    0.0.0.0/0                     prestogres_external   p
 
 #### prestogres_md5 method
 
-This authentication method uses a password file **\<data_dir\>/pgpool2/pool_passwd** to authenticate an user. You can use `prestogres passwd` command to add an user to this file:
+This authentication method uses a password file **\<data_dir\>/pgpool/pool_passwd** to authenticate an user. You can use `prestogres passwd` command to add an user to this file:
 
 ```sh
 $ prestogres -D pgdata passwd myuser
@@ -206,7 +207,7 @@ password: (enter password here)
 In pool_hba.conf file, you can set following options to OPTIONS field:
 
 * **server**: Address:port of Presto server, which overwrites `presto_servers` parameter in pgpool.conf.
-* **catalog**: Catalog (connector) name of Presto, which overwrites `presto_catalog` parameter in pgpool.conf.
+* **catalog**: Catalog name of Presto, which overwrites `presto_catalog` parameter in pgpool.conf.
 * **schema**: Default schema name of Presto. By default, Prestogres uses the same name with the database name used to login to pgpool-II. Following `pg_database` parameter doesn't overwrite affect this parameter.
 * **user**: User name to run queries on Presto. By default, Prestogres uses the same user name used to login to pgpool-II. Following `pg_user` parameter doesn't overwrite affect this parameter.
 * **pg_database**: Overwrite database to connect to PostgreSQL. The value should be `postgres` in most of cases.

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/config/pool_hba.conf

@@ -60,25 +60,25 @@
 # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD OPTIONS
 
 # "local" is for Unix domain socket connections only
-local   all         all                               prestogres_trust     pg_database:postgres
+local   all         all                               prestogres_trust     pg_database:postgres,pg_user:pg
 
 # IPv4 local connections:
-host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres
+host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres,pg_user:pg
 
 
 # Examples
 # ----------------------------------
 #
 ## Trust all connection from localhost:
-#host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres
+#host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres,pg_user:pg
 #
 ## MD5 authorization using pool_passwd file:
-#host    all         all         0.0.0.0/0             prestogres_md5       pg_database:postgres
+#host    all         all         0.0.0.0/0             prestogres_md5       pg_database:postgres,pg_user:pg
 #
 ## MD5 authorization and overwrites presto_server and
 ## presto_catalog parameters in pgpool.config:
-#host    all         all         0.0.0.0/0             prestogres_md5       server:localhost:8190,catalog:hive
+#host    all         all         0.0.0.0/0             prestogres_md5       pg_database:postgres,pg_user:pg,server:localhost:8190,catalog:hive
 #
 ## Authorization using an external program:
-#host    all         all         0.0.0.0/0             prestogres_external  auth_prog:/path/to/prog
+#host    all         all         0.0.0.0/0             prestogres_external  pg_database:postgres,pg_user:pg,auth_prog:/path/to/prog
 #

data/pgpool2/pool_proto_modules.c

@@ -96,6 +96,30 @@ static int extract_ntuples(char *message);
 static POOL_STATUS close_standby_transactions(POOL_CONNECTION *frontend,
 											  POOL_CONNECTION_POOL *backend);
 
+#define SQL_SPACE_PATTERN "(?:(?:--[^\\n]*\\n)|\\s)*"
+#define SQL_REMOVE_BEGIN_AND_COMMIT_PATTERN \
+		"(?:\\A" SQL_SPACE_PATTERN "begin" SQL_SPACE_PATTERN "(?:;|" SQL_SPACE_PATTERN "\\z))?" SQL_SPACE_PATTERN \
+		"(" \
+			"(?:(?!commit" SQL_SPACE_PATTERN ";?" SQL_SPACE_PATTERN "\\z).)*" \
+		")"
+
+#define DO_NOTHING_SQL "RESET geqo;"
+
+static pool_regexp_context REMOVE_BEGIN_AND_COMMIT_REGEXP = {0};
+
+static int remove_begin_and_commit(char* contents)
+{
+	int len;
+	pool_regexp_extract(SQL_REMOVE_BEGIN_AND_COMMIT_PATTERN, &REMOVE_BEGIN_AND_COMMIT_REGEXP, contents, 1);
+	len = strlen(contents);
+	if (len == 0) {
+		strcpy(contents, DO_NOTHING_SQL);
+		len = strlen(contents);
+	}
+	pool_debug("prestogres rewrite statement: '%s'", contents);
+	return len + 1;
+}
+
 /*
  * Process Query('Q') message
  * Query messages include an SQL string.
@@ -146,6 +170,9 @@ POOL_STATUS SimpleQuery(POOL_CONNECTION *frontend,
 		pool_debug("statement2: %s", contents);
 	}
 
+	/* Prestogres removes BEGIN and COMMIT */
+	len = remove_begin_and_commit(contents);
+
 	/*
 	 * Fetch memory cache if possible
 	 */

data/pgpool2/pool_query_context.c

@@ -27,12 +27,12 @@
 #include "pool_query_context.h"
 #include "pool_select_walker.h"
 #include "parser/nodes.h"
+#include "pool_rewrite_query.h"
 
 #include <string.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <pcre.h>
 
 /*
  * Where to send query
@@ -415,7 +415,7 @@ static void rewrite_error_query(POOL_QUERY_CONTEXT* query_context, char *message
 	}
 
 	if (errcode == NULL) {
-		message = "XX000";   /* Internal Error */
+		errcode = "XX000";   /* Internal Error */
 	}
 
 	if (sizeof(rewrite_query_string_buffer) < strlen(message) + static_length) {
@@ -520,54 +520,16 @@ static void run_and_rewrite_system_catalog_query(POOL_SESSION_CONTEXT* session_c
 	do_replace_query(query_context, rewrite_query_string_buffer);
 }
 
-typedef struct {
-	const char* errptr;
-	int erroffset;
-	pcre* pattern;
-} regexp_context;
-
-static bool regexp_match(const char* regexp, regexp_context* context, const char* string)
-{
-	int ret;
-	int ovec[10];
-
-	if (context->errptr != NULL) {
-		return false;
-	}
-
-	if (context->pattern == NULL) {
-		pcre* pattern;
-		pattern = pcre_compile(regexp, PCRE_CASELESS | PCRE_NO_AUTO_CAPTURE | PCRE_UTF8,
-				&context->errptr, &context->erroffset, NULL);
-		if (pattern == NULL) {
-			pool_error("regexp_match: invalid regexp %s at %d", context->errptr, context->erroffset);
-			return false;
-		}
-		context->pattern = pattern;
-		context->errptr = NULL;
-
-		// TODO pcre_study?
-	}
-
-	ret = pcre_exec(context->pattern, NULL, string, strlen(string), 0, 0, ovec, sizeof(ovec));
-	if (ret < 0) {
-		// error. pattern didn't match in most of cases
-		return false;
-	}
-
-	return true;
-}
-
 /*
  * /\A(?!.*select).*\z/i
  */
 #define LIKELY_PARSE_ERROR "\\A(?!.*select).*\\z"
 
-static regexp_context LIKELY_PARSE_ERROR_REGEXP = {0};
+static pool_regexp_context LIKELY_PARSE_ERROR_REGEXP = {0};
 
 static bool match_likely_parse_error(const char* query)
 {
-	return regexp_match(LIKELY_PARSE_ERROR, &LIKELY_PARSE_ERROR_REGEXP, query);
+	return pool_regexp_match(LIKELY_PARSE_ERROR, &LIKELY_PARSE_ERROR_REGEXP, query);
 }
 
 /*
@@ -575,11 +537,11 @@ static bool match_likely_parse_error(const char* query)
  */
 #define AUTO_LIMIT_QUERY_PATTERN "\\A\\s*select\\s*\\*\\s*from\\s+((\"[^\\\\\"]*([\\\\\"][^\\\\\"]*)*\")|[a-zA-Z_][a-zA-Z0-9_]*)(\\.((\"[^\\\\\"]*([\\\\\"][^\\\\\"]*)*\")|[a-zA-Z_][a-zA-Z0-9_]*))?\\s*(;|\\z)"
 
-static regexp_context AUTO_LIMIT_REGEXP = {0};
+static pool_regexp_context AUTO_LIMIT_REGEXP = {0};
 
 static bool match_auto_limit_pattern(const char* query)
 {
-	return regexp_match(AUTO_LIMIT_QUERY_PATTERN, &AUTO_LIMIT_REGEXP, query);
+	return pool_regexp_match(AUTO_LIMIT_QUERY_PATTERN, &AUTO_LIMIT_REGEXP, query);
 }
 
 static void run_and_rewrite_presto_query(POOL_SESSION_CONTEXT* session_context, POOL_QUERY_CONTEXT* query_context)
@@ -798,10 +760,12 @@ void pool_where_to_send(POOL_QUERY_CONTEXT *query_context, char *query, Node *no
 				 *	transaction isolation level is not SERIALIZABLE)
 				 * we might be able to load balance.
 				 */
-				if (TSTATE(backend, PRIMARY_NODE_ID) == 'I' ||
-					(!pool_is_writing_transaction() &&
-					 !(MAJOR(backend) == PROTO_MAJOR_V3 && pool_is_failed_transaction()) &&
-					 pool_get_transaction_isolation() != POOL_SERIALIZABLE))
+				/*
+				 * Prestogres assumes that any transactions can not write data,
+				 * and runs queries as usual even if the transaction is failed or
+				 * SERIALIZABLE or writing transaction.
+				 */
+				if (1)
 				{
 					BackendInfo *bkinfo = pool_get_node_info(session_context->load_balance_node_id);
 

data/pgpool2/pool_rewrite_query.c

@@ -713,3 +713,77 @@ POOL_STATUS pool_do_parallel_query(POOL_CONNECTION *frontend,
 	*parallel = false;
 	return POOL_CONTINUE;
 }
+
+bool pool_regexp_match(const char* regexp, pool_regexp_context* context, const char* string)
+{
+	int ret;
+	int ovec[10];
+
+	if (context->errptr != NULL) {
+		return false;
+	}
+
+	if (context->pattern == NULL) {
+		pcre* pattern;
+		pattern = pcre_compile(regexp, PCRE_CASELESS | PCRE_NO_AUTO_CAPTURE | PCRE_UTF8,
+				&context->errptr, &context->erroffset, NULL);
+		if (pattern == NULL) {
+			pool_error("regexp_match: invalid regexp %s at %d", context->errptr, context->erroffset);
+			return false;
+		}
+		context->pattern = pattern;
+		context->errptr = NULL;
+
+		// TODO pcre_study?
+	}
+
+	ret = pcre_exec(context->pattern, NULL, string, strlen(string), 0, 0, ovec, sizeof(ovec));
+	if (ret < 0) {
+		// error. pattern didn't match in most of cases
+		return false;
+	}
+
+	return true;
+}
+
+bool pool_regexp_extract(const char* regexp, pool_regexp_context* context, char* string, int number)
+{
+	int ret;
+	int ovec[10];
+	const char* pos;
+
+	if (context->errptr != NULL) {
+		return false;
+	}
+
+	if (context->pattern == NULL) {
+		pcre* pattern;
+		pattern = pcre_compile(regexp, PCRE_CASELESS | PCRE_UTF8,
+				&context->errptr, &context->erroffset, NULL);
+		if (pattern == NULL) {
+			pool_error("regexp_match: invalid regexp %s at %d", context->errptr, context->erroffset);
+			return false;
+		}
+		context->pattern = pattern;
+		context->errptr = NULL;
+
+		// TODO pcre_study?
+	}
+
+	ret = pcre_exec(context->pattern, NULL, string, strlen(string), 0, 0, ovec, sizeof(ovec));
+	if (ret < 0) {
+		// error. pattern didn't match in most of cases
+		return false;
+	}
+
+	ret = pcre_get_substring(string, ovec, ret, number, &pos);
+	if (ret < 0) {
+		// number-th group does not match
+		return false;
+	}
+
+	strlcpy(string, pos, ret+1);
+	pcre_free_substring(pos);
+	return true;
+}
+

data/pgpool2/pool_rewrite_query.h

@@ -32,6 +32,8 @@
 #include "parser/pool_memory.h"
 #include "parser/pool_string.h"
 
+#include <pcre.h>
+
 /* return code set */
 #define INSERT_SQL_RESTRICTION 1 
 #define SELECT_INIT 2
@@ -188,5 +190,14 @@ POOL_STATUS pool_do_parallel_query(POOL_CONNECTION *frontend,
 								   POOL_CONNECTION_POOL *backend,
 								   Node *node, bool *parallel, char **string, int *len);
 
+typedef struct {
+	const char* errptr;
+	int erroffset;
+	pcre* pattern;
+} pool_regexp_context;
+
+bool pool_regexp_match(const char* regexp, pool_regexp_context* context, const char* string);
+bool pool_regexp_extract(const char* regexp, pool_regexp_context* context, char* string, int number);
+
 #endif	/* POOL_REWRITE_QUERY_H */
 

data/pgsql/prestogres.py

@@ -31,6 +31,21 @@ def _pg_table_type(presto_type):
         # assuming Presto and PostgreSQL use the same SQL standard name
         return presto_type
 
+# queries can include same column name twice but tables can't.
+def _rename_duplicated_column_names(column_names):
+    renamed = []
+    used_names = set()
+    for original_name in column_names:
+        name = original_name
+        while name in used_names:
+            name += "_"
+        if name != original_name:
+            plpy.warning("Result column %s is renamed to %s because the name appears twice in a query result" % \
+                    (plpy.quote_ident(original_name), plpy.quote_ident(name)))
+        used_names.add(name)
+        renamed.append(name)
+    return renamed
+
 # build CREATE TEMPORARY TABLE statement
 def _build_create_temp_table_sql(table_name, column_names, column_types):
     create_sql = ["create temporary table %s (\n  " % plpy.quote_ident(table_name)]
@@ -68,7 +83,7 @@ def _build_alter_table_holder_sql(schema_name, table_name, column_names, column_
     return ''.join(alter_sql)
 
 # build INSERT INTO statement and string format to build VALUES (..), ...
-def _build_insert_into_sql(table_name, column_names, column_types):
+def _build_insert_into_sql(table_name, column_names):
     # INSERT INTO table_name (column_name, column_name, ...)
     insert_sql = ["insert into %s (\n  " % plpy.quote_ident(table_name)]
 
@@ -83,32 +98,38 @@ def _build_insert_into_sql(table_name, column_names, column_types):
 
     insert_sql.append("\n) values\n")
 
-    # VALUES (${}::column_type, ${}::column_type, ...)
-    values_sql_format = ["("]
+    return ''.join(insert_sql)
+
+# create a prepared statement for batch INSERT
+def _plan_batch(insert_sql, column_types, batch_size):
+    index = 1  # PostgreSQL's place holder begins from 1
 
+    # append value list (...), (...), ... at the end of insert_sql
+    batch_isnert_sql = [insert_sql]
     first = True
-    for column_type in column_types:
+    for i in range(batch_size):
         if first:
             first = False
         else:
-            values_sql_format.append(",  ")
+            batch_isnert_sql.append(", ")
 
-        values_sql_format.append("${}::")
-        values_sql_format.append(column_type)
+        # ($1::column_type, $2::column_type, ...)
+        batch_isnert_sql.append("(")
+        value_first = True
+        for column_type in column_types:
+            if value_first:
+                value_first = False
+            else:
+                batch_isnert_sql.append(", ")
 
-    values_sql_format.append(")")
+            batch_isnert_sql.append("$%s::%s" % (index, column_type))
+            index += 1
+        batch_isnert_sql.append(")")
 
-    return (''.join(insert_sql), ''.join(values_sql_format))
-
-# create a prepared statement for batch INSERT
-def _plan_batch(insert_sql, values_sql_format, column_types, batch_size):
-    # format string 'values ($1, $2), ($3, $4) ...'
-    values_sql = (", ".join([values_sql_format] * batch_size)).format(*range(1, batch_size * len(column_types) + 1))
-    batch_insert_sql = insert_sql + values_sql
-    return plpy.prepare(batch_insert_sql, column_types * batch_size)
+    return plpy.prepare(''.join(batch_isnert_sql), column_types * batch_size)
 
 # run batch INSERT
-def _batch_insert(insert_sql, values_sql_format, batch_size, column_types, rows):
+def _batch_insert(insert_sql, batch_size, column_types, rows):
     full_batch_plan = None
 
     batch = []
@@ -117,12 +138,12 @@ def _batch_insert(insert_sql, values_sql_format, batch_size, column_types, rows)
         batch_len = len(batch)
         if batch_len >= batch_size:
             if full_batch_plan is None:
-                full_batch_plan = _plan_batch(insert_sql, values_sql_format, column_types, batch_len)
+                full_batch_plan = _plan_batch(insert_sql, column_types, batch_len)
             plpy.execute(full_batch_plan, [item for sublist in batch for item in sublist])
             del batch[:]
 
     if batch:
-        plan = _plan_batch(insert_sql, values_sql_format, column_types, len(batch))
+        plan = _plan_batch(insert_sql, column_types, len(batch))
         plpy.execute(plan, [item for sublist in batch for item in sublist])
 
 class SchemaCache(object):
@@ -192,15 +213,16 @@ def run_presto_as_temp_table(server, user, catalog, schema, result_table, query)
                 column_types.append(_pg_result_type(column.type))
 
             # build SQL
+            column_names = _rename_duplicated_column_names(column_names)
             create_sql = _build_create_temp_table_sql(result_table, column_names, column_types)
-            insert_sql, values_sql_format = _build_insert_into_sql(result_table, column_names, column_types)
+            insert_sql = _build_insert_into_sql(result_table, column_names)
 
             # run CREATE TABLE
             plpy.execute("drop table if exists " + plpy.quote_ident(result_table))
             plpy.execute(create_sql)
 
             # run INSERT
-            _batch_insert(insert_sql, values_sql_format, 10, column_types, q.results())
+            _batch_insert(insert_sql, 10, column_types, q.results())
         finally:
             q.close()
 
@@ -346,6 +368,10 @@ def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table
                 for row in plpy.cursor(sql):
                     plpy.execute("drop schema %s" % plpy.quote_ident(row["schema_name"]))
 
+                # update pg_database
+                plan = plpy.prepare("update pg_database set datname=$1 where datname=current_database()", ['name'])
+                plpy.execute(plan, [schema])
+
                 # run the actual query and save result
                 metadata = plpy.execute(query)
                 column_names = metadata.colnames()
@@ -363,13 +389,14 @@ def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table
                 # rollback subtransaction
                 subxact.exit("rollback subtransaction", None, None)
 
+        column_names = _rename_duplicated_column_names(column_names)
         create_sql = _build_create_temp_table_sql(result_table, column_names, column_types)
-        insert_sql, values_sql_format = _build_insert_into_sql(result_table, column_names, column_types)
+        insert_sql = _build_insert_into_sql(result_table, column_names)
 
         # run CREATE TABLE and INSERT
         plpy.execute("drop table if exists " + plpy.quote_ident(result_table))
         plpy.execute(create_sql)
-        _batch_insert(insert_sql, values_sql_format, 10, column_types, result)
+        _batch_insert(insert_sql, 10, column_types, result)
 
     except (plpy.SPIError, presto_client.PrestoException) as e:
         # Set __module__ = "__module__" to generate pretty messages.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prestogres
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -484,3 +484,4 @@ signing_key:
 specification_version: 4
 summary: Presto PostgreSQL protocol gateway
 test_files: []
+has_rdoc: false