prestogres 0.4.0 → 0.4.1

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2014-03-05 version 0.4.1:
+
+* Send queries to Presto if they include Presto's SQL syntax extension
+* Fixed build scripts
+
+
 2014-03-05 version 0.4.0:
 
 * Preserve OID of tables when clients SELECT from system catalogs

data/README.md

@@ -19,8 +19,10 @@ Prestogres also offers password-based authentication and SSL.
 * [How it works?](#how-it-works)
 * [Limitation](#limitation)
 * [Installation](#installation)
+  * [1. Install PostgreSQL >= 9.3](#1-install-postgresql--93)
+  * [2. Install Prestogres](#2-install-prestogres)
 * [Running servers](#running-servers)
-  * [Mac OS X](#mac-os-x)
+  * [Setting shmem max parameter](#setting-shmem-max-parameter)
 * [Configuration](#configuration)
   * [pgpool.conf file](#pgpoolconf-file)
   * [pool_hba.conf file](#pool_hbaconf-file)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bin/prestogres

@@ -174,6 +174,9 @@ when :setup
 
   # 2. postgres -D postgres_dir -c listen_addresses=
   # start postgres without listening on TCP
+  pgsql_dir = File.expand_path File.join(File.dirname(__FILE__), "..", "pgsql")
+  ENV['PYTHONPATH'] = [pgsql_dir, ENV['PYTHONPATH']].compact.join(':')
+
   postgres_cmd = "postgres -D #{se(postgres_dir)} -c listen_addresses="
   puts "setup> #{postgres_cmd}"
   pid = spawn postgres_cmd
@@ -185,11 +188,11 @@ when :setup
     puts "initializing database..."
     sleep 8
 
-    psql_cmd = "psql -h #{se(@config[:unix_socket_directory])} -p #{@config[:backend_port]} -U pg postgres"
+    psql_cmd = "psql -h #{se(@config[:unix_socket_directory])} -p #{@config[:backend_port]} -U pg postgres --set ON_ERROR_STOP=1"
     setup_cmd "#{psql_cmd} < #{se(setup_sql_path)}"
   ensure
     # 4. shutdown postgres
-    Process.kill(:SIGQUIT, pid)
+    Process.kill(:SIGTERM, pid)
   end
   Process.waitpid(pid)
 

data/pgpool2/pool_query_context.c

@@ -717,6 +717,19 @@ void pool_where_to_send(POOL_QUERY_CONTEXT *query_context, char *query, Node *no
 
 		pool_debug("send_to_where: %d query: %s", dest, query);
 
+		/*
+		 * If failed to parse the query, run it on Presto because
+		 * it may include Presto's SQL syntax extensions.
+		 */
+		if (query_context->is_parse_error)
+		{
+			pool_debug("prestogres: send_to_where: parse-error");
+			pool_set_node_to_be_sent(query_context,
+					session_context->load_balance_node_id);
+			rewrite_mode = REWRITE_PRESTO;
+		}
+		else
+
 		/* Should be sent to primary only? */
 		if (dest == POOL_PRIMARY)
 		{
@@ -850,17 +863,6 @@ void pool_where_to_send(POOL_QUERY_CONTEXT *query_context, char *query, Node *no
 					static_error_message = "invalid session state";
 				}
 			}
-			else if (query_context->is_parse_error)
-			{
-				/*
-				 * If failed to parse the query, run it on Presto because
-				 * it may include Presto's SQL syntax extensions.
-				 */
-				pool_debug("prestogres: send_to_where: parse-error");
-				pool_set_node_to_be_sent(query_context,
-						session_context->load_balance_node_id);
-				rewrite_mode = REWRITE_PRESTO;
-			}
 			else
 			{
 				/* Send to the primary only */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prestogres
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors: