prestogres 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjJjMjIxNzdkNjI5MWVlZjJkNmUzNTUyNWMxMmJmZWZhZmIwZjRkMQ==
+    NjQ4NzllNzI0M2I1YTJhZTcyODIzOTlkZDY0YjcyMjI2MWM4MmUxYw==
   data.tar.gz: !binary |-
-    MmY0NDlkZjM4N2ZlODg3MjFmNGNiNzcyYmUyMTk2NmQ3NjcxYTlhNQ==
+    ODEzZjQzNGE5YTBmOTcxNDhlODlhMmFlNjFmMDJiOTBiMTE1YzZlYQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2YyOGIwZjVjNDUwNjFhMzViMjdkYTI5YWIxODhiZTJhZDM2ODA0NjNhNTE1
-    NTg5YWYzMzE5N2U1ODI2ZTYxOGFjODRmOTQ3OTQ5ZGI0Y2U5YmRmZjhmYWI2
-    ZTI4Nzk5NDU1MmI5NDc0ZDgwZmJmNjcxYWVhOThlNmM2MzBhMWE=
+    OGQwY2I0MDI5NTU3OGFmNzgzZTExM2NhZGNmYjY3YTkzOWU5MDQzM2UzYjZl
+    YWE1MTkzOGM1Y2U5MWNhMzhhOGUxN2I4NTA2Njk0YjIzOTdkOTlkNDdmYjM2
+    MTAwMTJjMjQ3ZmFiOWRiMjQ5OTVhYzY0YzkyMWU2YjU2OTUwOTQ=
   data.tar.gz: !binary |-
-    YzRkOWQ5NjFiNjNlYzg1Y2E5NmQ1ZjE4NzdmYmJhODNjZjVmMTgyMWU0ZjFh
-    ZmY0YWY0ZmZiZmE0OGM1NzY1YjJmZjMzMDlhZmY2MTc5NzEzMDcwNzQ0YzM1
-    OGM4MDgwZWNkNzJjMjFlN2ZmY2Q4NmRjZTQwMzkwMTlhODBjYTM=
+    ZWVkOWM1MmRkNWU5NjA4ZjZhZTVhYmJlNGZmNmM4N2IzMGMxNzBhYjJkMjNk
+    MzJhMGYwZDllMTJhODA4Y2VjOGY2YzJlYzg2YWRjNjkzMTdkNzMyMjMwYjEy
+    MmVhMTc1MGEzYjM0NWFiYmU1MTQyMDY2MGI2YjhiNWNhOWYxNWY=

data/ChangeLog

@@ -1,4 +1,14 @@
 
+2014-06-11 version 0.4.5:
+
+* Added prestogres_trust auth method
+* Added support for VARBINARY type introduced by Presto 0.69 by converting it
+  to bytea type
+* Added support for date, time and timestamp types with and without time zone
+* Getting table metadata ignores schema, table and column names longer than 63
+  (NAMEDATALEN - 1) characters which cause an error in PostgreSQL
+
+
 2014-05-12 version 0.4.4:
 
 * Send session variable 'timezone' to Presto using X-Presto-Time-Zone HTTP

data/README.md

@@ -188,7 +188,7 @@ 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                 pg_database:postgres,pg_user:pg
+host     postgres   pg     127.0.0.1/32                  prestogres_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

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/config/pgpool.conf

@@ -39,20 +39,17 @@ socket_dir = '<%= @config[:unix_socket_directory] %>'
 
 # - Presto Settings -
 presto_server = 'localhost:8080'
-                                   # Address of Presto server.
-                                   # You can overwrite this parameter depending
-                                   # on user, database, or client address using
-                                   # pool_hba.conf.
-presto_catalog = 'native'
-                                   # Catalog name of Presto.
-                                   # You can overwrite this parameter depending
-                                   # on user, database, or client address using
-                                   # pool_hba.conf.
+                                   # Address of the Presto server.
+                                   # You can overwrite this parameter per user,
+                                   # database, or client address in pool_hba.conf.
+presto_catalog = 'tpch'
+                                   # Catalog name of Presto to query.
+                                   # You can overwrite this parameter per user,
+                                   # database, or client address in pool_hba.conf.
 presto_schema = 'default'
                                    # Default schema name of Presto.
-                                   # You can overwrite this parameter depending
-                                   # on user, database, or client address using
-                                   # pool_hba.conf.
+                                   # You can overwrite this parameter per user,
+                                   # database, or client address in pool_hba.conf.
 
 # - pgpool Communication Manager Connection Settings -
 

data/config/pool_hba.conf

@@ -60,20 +60,20 @@
 # TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD OPTIONS
 
 # "local" is for Unix domain socket connections only
-local   all         all                               trust
+local   all         all                               prestogres_trust     pg_database:postgres
 
 # IPv4 local connections:
-host    all         all         127.0.0.1/32          trust
+host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres
 
 
 # Examples
 # ----------------------------------
 #
 ## Trust all connection from localhost:
-#host    all         all         127.0.0.1/32          trust
+#host    all         all         127.0.0.1/32          prestogres_trust     pg_database:postgres
 #
 ## MD5 authorization using pool_passwd file:
-#host    all         all         0.0.0.0/0             prestogres_md5
+#host    all         all         0.0.0.0/0             prestogres_md5       pg_database:postgres
 #
 ## MD5 authorization and overwrites presto_server and
 ## presto_catalog parameters in pgpool.config:

data/pgpool2/pool_hba.c

@@ -77,6 +77,7 @@ const char* presto_external_auth_prog = NULL;
 
 static bool prestogres_hba_set_session_info(POOL_CONNECTION *frontend, const char* key, const char* value);
 static void prestogres_hba_parse_arg(POOL_CONNECTION *frontend, const char* arg);
+static POOL_STATUS pool_prestogres_hba_auth_trust(POOL_CONNECTION *frontend);
 static POOL_STATUS pool_prestogres_hba_auth_md5(POOL_CONNECTION *frontend);
 static POOL_STATUS pool_prestogres_hba_auth_external(POOL_CONNECTION *frontend);
 
@@ -252,6 +253,9 @@ void ClientAuthentication(POOL_CONNECTION *frontend)
 			status = CheckPAMAuth(frontend, frontend->username, "");
 			break;
 #endif /* USE_PAM */
+		case uaPrestogresTrust:
+			status = pool_prestogres_hba_auth_trust(frontend);
+			break;
 		case uaPrestogresMD5:
 			status = pool_prestogres_hba_auth_md5(frontend);
 			break;
@@ -430,6 +434,11 @@ static void auth_failed(POOL_CONNECTION *frontend)
 					 frontend->username);
 			break;
 #endif /* USE_PAM */
+		case uaPrestogresTrust:
+			snprintf(errmessage, messagelen,
+					 "\"trust\" authentication with pgpool failed for user \"%s\"",
+					 frontend->username);
+			break;
 		case uaPrestogresMD5:
 			snprintf(errmessage, messagelen,
 					 "\"MD5\" authentication with pgpool failed for user \"%s\"",
@@ -840,6 +849,8 @@ static void parse_hba_auth(ListCell **line_item, UserAuth *userauth_p,
 	else if (strcmp(token, "pam") == 0)
 		*userauth_p = uaPAM;
 #endif /* USE_PAM */
+	else if (strcmp(token, "prestogres_trust") == 0)
+		*userauth_p = uaPrestogresTrust;
 	else if (strcmp(token, "prestogres_md5") == 0)
 		*userauth_p = uaPrestogresMD5;
 	else if (strcmp(token, "prestogres_external") == 0)
@@ -1551,6 +1562,13 @@ static void prestogres_hba_parse_arg(POOL_CONNECTION *frontend, const char* arg)
 	}
 }
 
+static POOL_STATUS pool_prestogres_hba_auth_trust(POOL_CONNECTION *frontend)
+{
+	prestogres_hba_parse_arg(frontend, frontend->auth_arg);
+
+	return POOL_CONTINUE;
+}
+
 static POOL_STATUS pool_prestogres_hba_auth_md5(POOL_CONNECTION *frontend)
 {
 	char *pool_passwd = NULL;

data/pgpool2/pool_type.h

@@ -152,6 +152,7 @@ typedef enum UserAuth
 #ifdef USE_PAM
 	,uaPAM
 #endif /* USE_PAM */
+	,uaPrestogresTrust
 	,uaPrestogresMD5
 	,uaPrestogresExternal
 }

data/pgsql/prestogres.py

@@ -3,31 +3,33 @@ import presto_client
 from collections import namedtuple
 import time
 
-# convert Presto query result type to PostgreSQL type
+# Maximum length for identifiers (e.g. table names, column names, function names)
+# defined in pg_config_manual.h
+PG_NAMEDATALEN = 64
+
+# convert Presto query result field types to PostgreSQL types
 def _pg_result_type(presto_type):
     if presto_type == "varchar":
         return "varchar(255)"
-    elif presto_type == "bigint":
-        return "bigint"
-    elif presto_type == "boolean":
-        return "boolean"
+    if presto_type == "varbinary":
+        return "bytea"
     elif presto_type == "double":
         return "double precision"
     else:
-        raise Exception, "unknown result column type: " + plpy.quote_ident(presto_type)
+        # assuming Presto and PostgreSQL use the same SQL standard name
+        return presto_type
 
-# convert Presto type to PostgreSQL type
+# convert Presto table column types to PostgreSQL types
 def _pg_table_type(presto_type):
     if presto_type == "varchar":
         return "varchar(255)"
-    elif presto_type == "bigint":
-        return "bigint"
-    elif presto_type == "boolean":
-        return "boolean"
+    if presto_type == "varbinary":
+        return "bytea"
     elif presto_type == "double":
         return "double precision"
     else:
-        raise Exception("unknown table column type: " + plpy.quote_ident(presto_type))
+        # assuming Presto and PostgreSQL use the same SQL standard name
+        return presto_type
 
 # build CREATE TEMPORARY TABLE statement
 def _build_create_temp_table_sql(table_name, column_names, column_types):
@@ -238,8 +240,26 @@ def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table
                 is_nullable = row[3]
                 column_type = row[4]
 
+                if len(schema_name) > PG_NAMEDATALEN - 1:
+                    plpy.warning("Schema %s is skipped because its name is longer than %d characters" % \
+                            (plpy.quote_ident(schema_name), PG_NAMEDATALEN - 1))
+                    continue
+
                 tables = schemas.setdefault(schema_name, {})
+
+                if len(table_name) > PG_NAMEDATALEN - 1:
+                    plpy.warning("Table %s.%s is skipped because its name is longer than %d characters" % \
+                            (plpy.quote_ident(schema_name), plpy.quote_ident(table_name), PG_NAMEDATALEN - 1))
+                    continue
+
                 columns = tables.setdefault(table_name, [])
+
+                if len(column_name) > PG_NAMEDATALEN - 1:
+                    plpy.warning("Column %s.%s.%s is skipped because its name is longer than %d characters" % \
+                            (plpy.quote_ident(schema_name), plpy.quote_ident(table_name), \
+                             plpy.quote_ident(column_name), PG_NAMEDATALEN - 1))
+                    continue
+
                 columns.append(Column(column_name, column_type, is_nullable))
 
             # generate SQL statements

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prestogres
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler