prestogres 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM3MmY0MDI2YWZiOGZmZWM4MTNkZmUyMWIyMDU4YmE5YzdkZjEwYw==
+    NjJjMjIxNzdkNjI5MWVlZjJkNmUzNTUyNWMxMmJmZWZhZmIwZjRkMQ==
   data.tar.gz: !binary |-
-    YmJhODI5MWRhMTkzOGZiMWNkNWNiYmRmOTgxZjI3OGE3YjUwYmI4MQ==
+    MmY0NDlkZjM4N2ZlODg3MjFmNGNiNzcyYmUyMTk2NmQ3NjcxYTlhNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTZkZWM4MmYwYzA0MTA5ZjA1NWFmMjQ1NTY4ODVlYjM2MjVmMmVlY2ZmMTNj
-    MDY5ZmVmZTZjYmRiMzA3NzFhNjAyNzA5Y2Y4YzdjMjA1Yzk0NDMyMjU3ODVl
-    ZGI0NzQ0ODc5NTQ2YzNkN2RhZjljOWJlYTg3MmY3MmYyMjliMDA=
+    Y2YyOGIwZjVjNDUwNjFhMzViMjdkYTI5YWIxODhiZTJhZDM2ODA0NjNhNTE1
+    NTg5YWYzMzE5N2U1ODI2ZTYxOGFjODRmOTQ3OTQ5ZGI0Y2U5YmRmZjhmYWI2
+    ZTI4Nzk5NDU1MmI5NDc0ZDgwZmJmNjcxYWVhOThlNmM2MzBhMWE=
   data.tar.gz: !binary |-
-    YjkzMGUzYTg4NjZjOTYxNjYwNDI3NmU2ZDRiMWUxYTJlZTYxZTM2MzQwNjhh
-    NjYwMDExMWE1ZGYzODRmYWY1ZDlkZTc3OWI3MWU5N2Q0NDNlMzAzMjM4Y2Uy
-    OTE1MGUxN2ZiZGYxZTJlZDAxMDdlODYyNmZjYzg0OWY0MTUwMTE=
+    YzRkOWQ5NjFiNjNlYzg1Y2E5NmQ1ZjE4NzdmYmJhODNjZjVmMTgyMWU0ZjFh
+    ZmY0YWY0ZmZiZmE0OGM1NzY1YjJmZjMzMDlhZmY2MTc5NzEzMDcwNzQ0YzM1
+    OGM4MDgwZWNkNzJjMjFlN2ZmY2Q4NmRjZTQwMzkwMTlhODBjYTM=

data/ChangeLog

@@ -1,4 +1,11 @@
 
+2014-05-12 version 0.4.4:
+
+* Send session variable 'timezone' to Presto using X-Presto-Time-Zone HTTP
+  header introduced by Presto 0.66 so that Presto uses the same time zone
+  setting with PostgreSQL.
+
+
 2014-04-22 version 0.4.3:
 
 * Updated default parameters related to connections so that pgpool-II can

data/README.md

@@ -36,7 +36,7 @@ Prestogres also offers password-based authentication and SSL.
 ## How it works?
 
 Prestogres uses modified **[pgpool-II](http://www.pgpool.net/)** to rewrite queries before sending them to PostgreSQL.
-pgpool-II is originally an open-source middleware to provide connection pool and other features to PostgreSQL. For regular SQL query, patched pgpool-II wraps it in **run_presto_astemp_table(..., 'SELECT ... FROM ...')** function. This function sends the query to Presto:
+pgpool-II is originally an open-source middleware to provide connection pool and other features to PostgreSQL. For regular SQL query, patched pgpool-II wraps it in **run_presto_as_temp_table(..., 'SELECT ... FROM ...')** function. This function sends the query to Presto:
 
 ![Regular SQL](https://gist.github.com/frsyuki/9012980/raw/2782f51cd3c708254ac64c4c30b7bff0e7894640/figure1.png)
 
@@ -188,14 +188,12 @@ See [sample pool_hba.conf file](https://github.com/treasure-data/prestogres/blob
 
 ```conf
 # TYPE   DATABASE   USER   CIDR-ADDRESS                  METHOD                OPTIONS
-host     postgres   pg     127.0.0.1/32                  trust
-host     postgres   pg     127.0.0.1/32,192.168.0.0/16   prestogres_md5
-host     altdb      pg     0.0.0.0/0                     prestogres_md5        server:localhost:8190,pg_database:postgres
-host     all        all    0.0.0.0/0                     prestogres_external   auth_prog:/opt/prestogres/auth.py,pg_database:postgres,pg_user:pg
+host     postgres   pg     127.0.0.1/32                  trust                 pg_database:postgres,pg_user:pg
+host     postgres   pg     127.0.0.1/32,192.168.0.0/16   prestogres_md5        pg_database:postgres,pg_user:pg
+host     altdb      pg     0.0.0.0/0                     prestogres_md5        pg_database:postgres,pg_user:pg,server:localhost:8190,
+host     all        all    0.0.0.0/0                     prestogres_external   pg_database:postgres,pg_user:pg,auth_prog:/opt/prestogres/auth.py
 ```
 
-See also *Creating database* section.
-
 #### 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:
@@ -211,13 +209,13 @@ In pool_hba.conf file, you can set following options to OPTIONS field:
 * **catalog**: Catalog (connector) 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.
-* **pg_user**: Overwrite user name to connect to PostgreSQL.
+* **pg_database**: Overwrite database to connect to PostgreSQL. The value should be `postgres` in most of cases.
+* **pg_user**: Overwrite user name to connect to PostgreSQL. This value should be `pg` in most of cases.
 
 
 #### prestogres_external method
 
-This authentication method uses an external file to authentication an user.
+This authentication method uses an external program to authentication an user.
 
 - Note: This method is still experimental (because performance is slow). Interface could be changed.
 - Note: This method requires clients to send password in clear text. It's recommended to enable SSL in pgpool.conf.
@@ -248,24 +246,6 @@ See *pgool.conf file* section for available parameters.
 
 If you want to reject this connection, the program exists with non-0 status code.
 
-### Creating database on PostgreSQL
-
-Prestogres setups a database named *postgres* on PostgreSQL by default. But you may want to create other databases
-to take advantage of above authentication mechanism.
-
-To create new databases:
-
-1. Create a new PostgreSQL database using `createdb` command. Port number is **6432** because you login to PostgreSQL directly:
-```
-$ createdb -h localhost -p 6432 -U pg newdb
-```
-
-2. Initialize the database using statements shown by `prestogres show_init_sql` command:
-```
-$ prestogres show_init_sql | psql -h localhost -p 6432 -U pg newdb
-```
-
-
 ### prestogres command
 
 Usage of `prestogres` command:

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/pgpool2/pool_query_context.c

@@ -410,6 +410,14 @@ static void rewrite_error_query(POOL_QUERY_CONTEXT* query_context, char *message
 	/* 20 is for escape characters */
 	const size_t static_length = strlen("do $$ begin raise exception '%', E'' using errcode = E'XXXXX'; end $$ language plpgsql") + 20;
 
+	if (message == NULL) {
+		message = "Unknown exception";
+	}
+
+	if (errcode == NULL) {
+		message = "XX000";   /* Internal Error */
+	}
+
 	if (sizeof(rewrite_query_string_buffer) < strlen(message) + static_length) {
 		message[sizeof(rewrite_query_string_buffer) - static_length - 3] = '.';
 		message[sizeof(rewrite_query_string_buffer) - static_length - 2] = '.';
@@ -453,10 +461,12 @@ static void run_and_rewrite_system_catalog_query(POOL_SESSION_CONTEXT* session_c
 			rewrite_query_string_buffer, &res, MAJOR(backend), &errmsg, &errcode);
 	free_select_result(res);
 
-	if (errmsg != NULL) {
+	if (errmsg != NULL || errcode != NULL) {
 		rewrite_error_query(query_context, errmsg, errcode);
+		return;
 	} else if (status != POOL_CONTINUE) {
 		rewrite_error_query_static(query_context, "Unknown execution error", NULL);
+		return;
 	}
 
 	/* build run_system_catalog_as_temp_table query */
@@ -487,10 +497,12 @@ static void run_and_rewrite_system_catalog_query(POOL_SESSION_CONTEXT* session_c
 			rewrite_query_string_buffer, &res, MAJOR(backend), &errmsg, &errcode);
 	free_select_result(res);
 
-	if (errmsg != NULL) {
+	if (errmsg != NULL || errcode != NULL) {
 		rewrite_error_query(query_context, errmsg, errcode);
+		return;
 	} else if (status != POOL_CONTINUE) {
 		rewrite_error_query_static(query_context, "Unknown execution error", NULL);
+		return;
 	}
 
 	/* rewrite query */
@@ -631,7 +643,7 @@ static void run_and_rewrite_presto_query(POOL_SESSION_CONTEXT* session_context,
 			rewrite_query_string_buffer, &res, MAJOR(backend), &errmsg, &errcode);
 	free_select_result(res);
 
-	if (errmsg != NULL) {
+	if (errmsg != NULL || errcode != NULL) {
 		rewrite_error_query(query_context, errmsg, errcode);
 		return;
 	} else if (status != POOL_CONTINUE) {
@@ -663,7 +675,7 @@ void pool_where_to_send(POOL_QUERY_CONTEXT *query_context, char *query, Node *no
 	POOL_CONNECTION_POOL *backend;
 	int i;
 
-	const char* static_error_message;
+	const char* static_error_message = "";
 	enum {
 		REWRITE_CLEAR,
 		REWRITE_SYSTEM_CATALOG,

data/pgsql/presto_client.py

@@ -159,6 +159,8 @@ class PrestoHeaders(object):
     PRESTO_SOURCE = "X-Presto-Source"
     PRESTO_CATALOG = "X-Presto-Catalog"
     PRESTO_SCHEMA = "X-Presto-Schema"
+    PRESTO_TIME_ZONE = "X-Presto-Time-Zone"
+    PRESTO_LANGUAGE = "X-Presto-Language"
 
     PRESTO_CURRENT_STATE = "X-Presto-Current-State"
     PRESTO_MAX_WAIT = "X-Presto-Max-Wait"
@@ -191,6 +193,10 @@ class StatementClient(object):
             headers[PrestoHeaders.PRESTO_CATALOG] = self.options["catalog"]
         if self.options.get("schema") is not None:
             headers[PrestoHeaders.PRESTO_SCHEMA] = self.options["schema"]
+        if self.options.get("time_zone") is not None:
+            headers[PrestoHeaders.PRESTO_TIME_ZONE] = self.options["time_zone"]
+        if self.options.get("language") is not None:
+            headers[PrestoHeaders.PRESTO_LANGUAGE] = self.options["language"]
 
         self.http_client.request("POST", "/v1/statement", self.query, headers)
         response = self.http_client.getresponse()
@@ -273,8 +279,8 @@ class Query(object):
         self.client = client
 
     def _wait_for_data(self):
-        while self.client.has_next and self.client.results.data is None:
-            self.client.advance()
+        while self.client.results.data is None and self.client.advance():
+            pass
 
     def columns(self):
         self._wait_for_data()
@@ -300,10 +306,9 @@ class Query(object):
             for row in client.results.data:
                 yield row
 
-            if not self.client.has_next:
+            if not client.advance():
                 break
 
-            client.advance()
             if client.results.data is None:
                 break
 

data/pgsql/prestogres.py

@@ -149,6 +149,10 @@ class SchemaCache(object):
         self.expire_time = expire_time
         self.query_cache = {}
 
+def _get_session_time_zone():
+    rows = plpy.execute("show timezone")
+    return rows[0].values()[0]
+
 QueryResult = namedtuple("QueryResult", ("column_names", "column_types", "result"))
 
 OidToTypeNameMapping = {}
@@ -170,7 +174,7 @@ SchemaCacheEntry = SchemaCache()
 
 def run_presto_as_temp_table(server, user, catalog, schema, result_table, query):
     try:
-        client = presto_client.Client(server=server, user=user, catalog=catalog, schema=schema)
+        client = presto_client.Client(server=server, user=user, catalog=catalog, schema=schema, time_zone=_get_session_time_zone())
 
         create_sql = "create temporary table %s (\n  " % plpy.quote_ident(result_table)
         insert_sql = "insert into %s (\n  " % plpy.quote_ident(result_table)
@@ -208,7 +212,7 @@ def run_presto_as_temp_table(server, user, catalog, schema, result_table, query)
 
 def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table, query):
     try:
-        client = presto_client.Client(server=server, user=user, catalog=catalog, schema=schema)
+        client = presto_client.Client(server=server, user=user, catalog=catalog, schema=schema, time_zone=_get_session_time_zone())
 
         # create SQL statements which put data to system catalogs
         if SchemaCacheEntry.is_cached(server, user, catalog, schema, time.time()):

metadata

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