prestogres 0.4.7 → 0.4.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFiNzUyZWQwMmI0MjE3YWNmMDI3OWJiYTAyODUzY2RlNTdmZGM1Ng==
+    MDM4ZjYxNWJhNDE5YjBlOGViYTlmNmEzZjRiOGMxNzMzNjM4ZjY2OA==
   data.tar.gz: !binary |-
-    ZjNlMDg4Y2YzNzc1Yzc4NDM3MmQzNDI2NWI1NmMwNzU4Zjg2MWI4NQ==
+    OTNjYWU2MGE3ZDkxZmI0YTZmZDA3ZWQ0NGU4YTA1NzlmZjg5OGNlOA==
 SHA512:
   metadata.gz: !binary |-
-    YjExMTk2NmFkMTM0M2UwZjNjZWJiOGUyNjY2MjQ3MTU4YmIwNGI1ZWNiNWE5
-    NTc1ZjU4MzhkNjNmOTFlY2I5Yjg4OTQ5OGY5NDA2ZGQ0OTBhZjdhMmYwNzdl
-    MWRhZjE4N2M1YzI4MDUyNzg2NzAxZTExNTNhMGEyYWI3YjZkNjc=
+    OGFmNDhjMjQwNjljMzBhZGRmZWVjNThjODExY2MxNjM0MzY1M2MzZDMyMDFl
+    NmE1NWE1MjIzMDQ0ZmFjZjE0NDE0MTdhOWVkM2RjYTFkMmIzN2JkOTU5NDc0
+    ZmI2NWQ1NDJhZWIwZTExNDUzYTUyNzVjOTkyMGM0N2E0YWYxZGY=
   data.tar.gz: !binary |-
-    OWExMzcyNjE2YzRmODI4MzhiNTU4YjEyNmUxMjc0MWE3NGI3MjhkYTU5OGM0
-    MDczMzA1NmE4YWY4Mjk4YTJlZjQxZWQ5N2FhOWVjMmM5NjFjODM4ZDYwN2Yw
-    N2Y1ZDljOGQ1MmJlNzVmN2Q0NjcwNmRmZjEzNzgzYmQ5MDY0YzQ=
+    YmIzYjE0OGNiMzQzYTI2ZGZkNGFiNTRmYzJhMDNhNzAwMDlhYjZmNjBkZmU3
+    MTJjODQxZTYxZjJmNTkwMDdkOTFhYWM5ZTg1YTdiNGRkYTllYTE1Zjc4ZjEz
+    ZjlmMGMzNTllYjlmYjQ0N2U5OWEzMjM5OTk5ZGZkNjI4NWY3ZmY=

data/ChangeLog

@@ -1,4 +1,18 @@
 
+2014-07-18 version 0.4.8:
+
+You need to re-initialize PostgreSQL data directly when you upgrade.
+
+* Sort table and schema names to preserve oid even if presto connectors don't
+  gurantee order
+* System catalog queries create user and switches role to emulate login user
+  name
+* System catalog queries update pg_database to be consistent with login
+  databae name
+* Added support for information_schema
+* Added special type conversion rules to support information_schema
+
+
 2014-06-26 version 0.4.7:
 
 * Fixed a problem where multi-line queries don't run correctly

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/pgpool2/child.c

@@ -296,7 +296,7 @@ void do_child(int unix_fd, int inet_fd)
 		}
 
 		/* this should run before ClientAuthentication */
-		pool_prestogres_set_defaults(sp);
+		pool_prestogres_init_login(sp);
 
 		if (pool_config->enable_pool_hba)
 		{
@@ -423,6 +423,9 @@ void do_child(int unix_fd, int inet_fd)
 		/* Mark this connection pool is connected from frontend */
 		pool_coninfo_set_frontend_connected(pool_get_process_context()->proc_id, pool_pool_index());
 
+		///* Set initial search_path */
+		//prestogres_set_initial_search_path(backend);
+
 		/* query process loop */
 		for (;;)
 		{

data/pgpool2/pool.h

@@ -648,10 +648,12 @@ extern const char* presto_user;
 extern const char* presto_catalog;
 extern const char* presto_schema;
 extern const char* presto_external_auth_prog;
+extern const char* pool_user;
+extern const char* pool_database;
 
 int send_md5auth_request(POOL_CONNECTION *frontend, int protoMajor, char *salt);
 int read_password_packet(POOL_CONNECTION *frontend, int protoMajor, 	char *password, int *pwdSize);
 
-void pool_prestogres_set_defaults(StartupPacket *sp);
+void pool_prestogres_init_login(StartupPacket *sp);
 
 #endif /* POOL_H */

data/pgpool2/pool_hba.c

@@ -74,6 +74,8 @@ const char* presto_user = NULL;
 const char* presto_catalog = NULL;
 const char* presto_schema = NULL;
 const char* presto_external_auth_prog = NULL;
+const char* pool_user = NULL;
+const char* pool_database = 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);
@@ -1727,23 +1729,25 @@ static POOL_STATUS pool_prestogres_hba_auth_external(POOL_CONNECTION *frontend)
 	return POOL_CONTINUE;
 }
 
-void pool_prestogres_set_defaults(StartupPacket *sp)
+void pool_prestogres_init_login(StartupPacket *sp)
 {
+    pool_user = strdup(sp->user);
+    pool_database = strdup(sp->database);
     if (presto_server == NULL) {
         presto_server = pool_config->presto_server;
     }
     if (presto_user == NULL) {
-        presto_user = strdup(sp->user);
+        presto_user = pool_user;
     }
     if (presto_catalog == NULL) {
         presto_catalog = pool_config->presto_catalog;
     }
     if (presto_schema == NULL) {
-        presto_schema = strdup(sp->database);
+        presto_schema = pool_database;
     }
-    pool_debug("pool_prestogres_set_defaults: presto_server: %s", presto_server);
-    pool_debug("pool_prestogres_set_defaults: presto_user: %s", presto_user);
-    pool_debug("pool_prestogres_set_defaults: presto_catalog: %s", presto_catalog);
-    pool_debug("pool_prestogres_set_defaults: presto_schema: %s", presto_schema);
+    pool_debug("pool_prestogres_init_login: presto_server: %s", presto_server);
+    pool_debug("pool_prestogres_init_login: presto_user: %s", presto_user);
+    pool_debug("pool_prestogres_init_login: presto_catalog: %s", presto_catalog);
+    pool_debug("pool_prestogres_init_login: presto_schema: %s", presto_schema);
 }
 

data/pgpool2/pool_query_context.c

@@ -482,6 +482,10 @@ static void run_and_rewrite_system_catalog_query(POOL_SESSION_CONTEXT* session_c
 	buffer = strcpy_capped(buffer, bufend - buffer, "', E'");
 	buffer = strcpy_capped_escaped(buffer, bufend - buffer, presto_schema, "'\\");
 	buffer = strcpy_capped(buffer, bufend - buffer, "', E'");
+	buffer = strcpy_capped_escaped(buffer, bufend - buffer, pool_user, "'\\");
+	buffer = strcpy_capped(buffer, bufend - buffer, "', E'");
+	buffer = strcpy_capped_escaped(buffer, bufend - buffer, pool_database, "'\\");
+	buffer = strcpy_capped(buffer, bufend - buffer, "', E'");
 	buffer = strcpy_capped_escaped(buffer, bufend - buffer, PRESTO_RESULT_TABLE_NAME, "'\\");
 	buffer = strcpy_capped(buffer, bufend - buffer, "', E'");
 	buffer = strcpy_capped_escaped(buffer, bufend - buffer, query_context->original_query, "'\\");
@@ -628,6 +632,32 @@ static void run_and_rewrite_presto_query(POOL_SESSION_CONTEXT* session_context,
 	do_replace_query(query_context, rewrite_query_string_buffer);
 }
 
+//void prestogres_set_initial_search_path(POOL_CONNECTION_POOL *backend)
+//{
+//	char *buffer, *bufend;
+//	POOL_STATUS status;
+//	POOL_SELECT_RESULT *res;
+//
+//	buffer = rewrite_query_string_buffer;
+//	bufend = buffer + sizeof(rewrite_query_string_buffer);
+//
+//	buffer = strcpy_capped(buffer, bufend - buffer, "set search_path to E'");
+//	buffer = strcpy_capped_escaped(buffer, bufend - buffer, presto_schema, "'\\");
+//	buffer = strcpy_capped(buffer, bufend - buffer, "'");
+//
+//	if (buffer == NULL) {
+//		pool_error("prestogres_set_initial_search_path: failed to build a query");
+//		return;
+//	}
+//
+//	status = do_query(MASTER(backend), rewrite_query_string_buffer, &res, MAJOR(backend));
+//	free_select_result(res);
+//
+//	if (status != POOL_CONTINUE) {
+//		pool_error("prestogres_set_initial_search_path: SET command failed");
+//	}
+//}
+
 /*
  * Decide where to send queries(thus expecting response)
  */

data/pgpool2/pool_select_walker.c

@@ -323,6 +323,15 @@ system_catalog_walker(Node *node, void *context)
 			ctx->has_system_catalog = true;
 			return false;
 		}
+
+		if (rgv->schemaname != NULL && strcmp(rgv->schemaname, "information_schema") == 0)
+		{
+			/* This could cause false-negative match. If the client puts information_schema
+			 * to search_path, and it doesn't explicitly specify schem name, here can't match
+			 */
+			ctx->has_system_catalog = true;
+			return false;
+		}
 	}
 	return raw_expression_tree_walker(node, system_catalog_walker, context);
 }

data/pgpool2/pool_session_context.h

@@ -195,6 +195,8 @@ 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 prestogres_set_initial_search_path(POOL_CONNECTION_POOL *backend);
+
 #ifdef NOT_USED
 extern void pool_add_prep_where(char *name, bool *map);
 extern bool *pool_get_prep_where(char *name);

data/pgsql/prestogres.py

@@ -176,10 +176,28 @@ def _get_session_time_zone():
     rows = plpy.execute("show timezone")
     return rows[0].values()[0]
 
+def _get_session_search_path_array():
+    rows = plpy.execute("select ('{' || current_setting('search_path') || '}')::text[]")
+    return rows[0].values()[0]
+
 QueryResult = namedtuple("QueryResult", ("column_names", "column_types", "result"))
 
 OidToTypeNameMapping = {}
 
+# information_schema on PostgreSQL have some special column types where
+# CREATE TABLE can't use the types (although SELECT returns the types).
+def _pg_convert_infoschema_type(infoschema_type):
+    if infoschema_type == "sql_identifier":
+        return "name"
+    if infoschema_type == "cardinal_number":
+        return "int"
+    elif infoschema_type == "character_data":
+        return "name"
+    elif infoschema_type == "yes_or_no":
+        return "text"
+    else:
+        return infoschema_type
+
 def _load_oid_to_type_name_mapping(oids):
     oids = filter(lambda oid: oid not in OidToTypeNameMapping, oids)
     if oids:
@@ -187,7 +205,8 @@ def _load_oid_to_type_name_mapping(oids):
                " from pg_catalog.pg_type" \
                " where oid in (%s)") % (", ".join(map(str, oids)))
         for row in plpy.execute(sql):
-            OidToTypeNameMapping[int(row["oid"])] = row["typname"]
+            type_name = _pg_convert_infoschema_type(row["typname"])
+            OidToTypeNameMapping[int(row["oid"])] = type_name
 
     return OidToTypeNameMapping
 
@@ -197,6 +216,11 @@ SchemaCacheEntry = SchemaCache()
 
 def run_presto_as_temp_table(server, user, catalog, schema, result_table, query):
     try:
+        search_path = _get_session_search_path_array()
+        if search_path != ['$user', 'public'] and len(search_path) > 0:
+            # search_path is changed explicitly. Use the first schema
+            schema = search_path[0]
+
         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)
@@ -234,7 +258,7 @@ def run_presto_as_temp_table(server, user, catalog, schema, result_table, query)
         e.__class__.__module__ = "__main__"
         raise
 
-def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table, query):
+def run_system_catalog_as_temp_table(server, user, catalog, schema, login_user, login_database, result_table, query):
     try:
         client = presto_client.Client(server=server, user=user, catalog=catalog, schema=schema, time_zone=_get_session_time_zone())
 
@@ -288,16 +312,25 @@ def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table
             statements = []
             schema_names = []
 
+            # create a restricted user using the same name with the login user name to pgpool2
+            statements.append(
+                    "do $$ begin if not exists (select * from pg_catalog.pg_roles where rolname=%s) then create role %s with login; end if; end $$" % \
+                    (plpy.quote_literal(login_user), plpy.quote_ident(login_user)))
+
+            # grant access on the all table holders to the restricted user
+            statements.append("grant select on all tables in schema prestogres_catalog to %s" % \
+                    plpy.quote_ident(login_user))
+
             table_holder_id = 0
 
-            for schema_name, tables in schemas.items():
+            for schema_name, tables in sorted(schemas.items(), key=lambda (k,v): k):
                 if schema_name == "sys" or schema_name == "information_schema":
                     # skip system schemas
                     continue
 
                 schema_names.append(schema_name)
 
-                for table_name, columns in tables.items():
+                for table_name, columns in sorted(tables.items(), key=lambda (k,v): k):
                     # table schema
                     column_names = []
                     column_types = []
@@ -369,8 +402,11 @@ def run_system_catalog_as_temp_table(server, user, catalog, schema, result_table
                     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])
+                plpy.execute("update pg_database set datname=%s where datname=current_database()" % \
+                        plpy.quote_literal(schema_name))
+
+                # switch to the restricted role
+                plpy.execute("set role to %s" % plpy.quote_ident(login_user))
 
                 # run the actual query and save result
                 metadata = plpy.execute(query)

data/pgsql/setup.sql

@@ -6,27 +6,23 @@ drop schema if exists prestogres_catalog cascade;
 create schema prestogres_catalog;
 
 create or replace function prestogres_catalog.run_presto_as_temp_table(
-    "server" text,
-    "user" text,
-    "catalog" text,
-    "schema" text,
-    "table_name" text,
-    "query" text)
+    "server" text, "user" text, "catalog" text, "schema" text,
+    "result_table" text, "query" text)
 returns void as $$
 import prestogres
-prestogres.run_presto_as_temp_table(server, user, catalog, schema, table_name, query)
+prestogres.run_presto_as_temp_table(
+    server, user, catalog, schema, result_table, query)
 $$ language plpythonu;
 
 create or replace function prestogres_catalog.run_system_catalog_as_temp_table(
-    "server" text,
-    "user" text,
-    "catalog" text,
-    "schema" text,
-    "table_name" text,
-    "query" text)
+    "server" text, "user" text, "catalog" text, "schema" text,
+    "login_user" text, "login_database" text,
+    "result_table" text, "query" text)
 returns void as $$
 import prestogres
-prestogres.run_system_catalog_as_temp_table(server, user, catalog, schema, table_name, query)
+prestogres.run_system_catalog_as_temp_table(
+    server, user, catalog, schema, login_user, login_database,
+    result_table, query)
 $$ language plpythonu;
 
 create or replace function prestogres_catalog.create_schema_holders("count" int)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prestogres
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler